chore: github workflows

# Conflicts:
#	others/powerjob-mysql.sql
#	pom.xml
#	powerjob-client/pom.xml
#	powerjob-common/pom.xml
#	powerjob-official-processors/pom.xml
#	powerjob-remote/pom.xml
#	powerjob-remote/powerjob-remote-benchmark/pom.xml
#	powerjob-remote/powerjob-remote-framework/pom.xml
#	powerjob-remote/powerjob-remote-impl-akka/pom.xml
#	powerjob-remote/powerjob-remote-impl-http/pom.xml
#	powerjob-server/pom.xml
#	powerjob-server/powerjob-server-common/pom.xml
#	powerjob-server/powerjob-server-core/pom.xml
#	powerjob-server/powerjob-server-extension/pom.xml
#	powerjob-server/powerjob-server-migrate/pom.xml
#	powerjob-server/powerjob-server-monitor/pom.xml
#	powerjob-server/powerjob-server-persistence/pom.xml
#	powerjob-server/powerjob-server-remote/pom.xml
#	powerjob-server/powerjob-server-starter/pom.xml
#	powerjob-server/powerjob-server-starter/src/main/resources/static/index.html
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/1.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/10.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/11.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/2.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/3.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/4.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/5.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/6.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/7.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/8.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/9.js
#	powerjob-server/powerjob-server-starter/src/main/resources/static/js/app.js
#	powerjob-worker-agent/pom.xml
#	powerjob-worker-samples/pom.xml
#	powerjob-worker-spring-boot-starter/pom.xml
#	powerjob-worker/pom.xml

.github/workflows/docker-image.yml

@@ -1,30 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am && /bin/cp -rf powerjob-server/target/*.jar powerjob-server/docker/powerjob-server.jar && /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar
-    - uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: tjqq/powerjob-server
-        tags: latest
-        path: powerjob-server/docker/
-    - uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: tjqq/powerjob-agent
-        tags: latest
-        path: powerjob-worker-agent/

.github/workflows/docker_publish.yml

@@ -0,0 +1,68 @@
+name: build_docker
+
+on:
+  push:
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build_docker:
+    name: Build docker
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build Maven Project
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name: Publish package
+        run: mvn clean package -Pdev -DskipTests -U -e && /bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar && /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar && /bin/cp -rf powerjob-worker-samples/target/*.jar powerjob-worker-samples/powerjob-worker-samples.jar
+
+      # Login
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build And Push [powerjob-server]
+        uses: docker/build-push-action@v6
+        with:
+          context: powerjob-server/docker/
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            tjqq/powerjob-server:latest
+            powerjob/powerjob-server:latest
+            tjqq/powerjob-server:${{ github.ref_name }}
+            powerjob/powerjob-server:${{ github.ref_name }}
+
+      - name: Build And Push [powerjob-agent]
+        uses: docker/build-push-action@v6
+        with:
+          context: powerjob-worker-agent/
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            tjqq/powerjob-agent:latest
+            powerjob/powerjob-agent:latest
+            tjqq/powerjob-agent:${{ github.ref_name }}
+            powerjob/powerjob-agent:${{ github.ref_name }}
+
+      - name: Build And Push [powerjob-worker-samples]
+        uses: docker/build-push-action@v6
+        with:
+          context: powerjob-worker-samples/
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            tjqq/powerjob-worker-samples:latest
+            powerjob/powerjob-worker-samples:latest
+            tjqq/powerjob-worker-samples:${{ github.ref_name }}
+            powerjob/powerjob-worker-samples:${{ github.ref_name }}

.github/workflows/maven.yml

@@ -1,38 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B clean package -Pdev -DskipTests --file pom.xml
-    - name: upload build result
-      run: mkdir staging && cp powerjob-server/target/*.jar staging/powerjob-server.jar && cp powerjob-client/target/*.jar staging/powerjob-client.jar && cp powerjob-worker-agent/target/*.jar staging/powerjob-agent.jar
-    - uses: actions/upload-artifact@v1
-      with:
-        name: powerjob-server.jar
-        path: staging/powerjob-server.jar
-    - uses: actions/upload-artifact@v1
-      with:
-        name: powerjob-client.jar
-        path: staging/powerjob-client.jar
-    - uses: actions/upload-artifact@v1
-      with:
-        name: powerjob-agent.jar
-        path: staging/powerjob-agent.jar

.github/workflows/maven_build.yml

@@ -0,0 +1,28 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://docs.github.com/zh/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - run: mvn -B clean package -Pdev -DskipTests --file pom.xml
+      - run: mkdir staging && cp powerjob-server/powerjob-server-starter/target/*.jar staging/powerjob-server.jar && cp powerjob-client/target/*.jar staging/powerjob-client.jar && cp powerjob-worker-agent/target/*.jar staging/powerjob-agent.jar && cp powerjob-worker-spring-boot-starter/target/*.jar staging/powerjob-worker-spring-boot-starter.jar
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Package
+          path: staging
+

.github/workflows/maven_publish.yml

@@ -0,0 +1,22 @@
+name: Publish package to the Maven Central Repository
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+      - name: Publish package
+        run: mvn --batch-mode clean deploy -pl powerjob-worker,powerjob-client,powerjob-worker-spring-boot-starter,powerjob-official-processors,powerjob-worker-agent -DskipTests -Prelease -am
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.gitignore

@@ -41,4 +41,5 @@ build/
 .trc
 */.phd
 */.txt
-*/.trc
+*/.trc
+powerjob-data/

README.md

@@ -1,12 +1,16 @@
 # English | [简体中文](./README_zhCN.md)
 
+<p align="center">
+🏮PowerJob 全体成员祝大家龙年腾飞，新的一年身体健康，万事如意，阖家欢乐，幸福安康！🏮
+</p>
+
 <p align="center">
 <img src="https://raw.githubusercontent.com/KFCFans/PowerJob/master/others/images/logo.png" alt="PowerJob" title="PowerJob" width="557"/>
 </p>
 
 <p align="center">
 <a href="https://github.com/PowerJob/PowerJob/actions"><img src="https://github.com/PowerJob/PowerJob/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master" alt="actions"></a>
-<a href="https://search.maven.org/search?q=tech.powerjob"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/tech.powerjob/powerjob-worker"></a>
+<a href="https://central.sonatype.com/search?smo=true&q=powerjob-worker&namespace=tech.powerjob"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/tech.powerjob/powerjob-worker"></a>
 <a href="https://github.com/PowerJob/PowerJob/releases"><img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/kfcfans/powerjob?color=%23E59866"></a>
 <a href="https://github.com/PowerJob/PowerJob/blob/master/LICENSE"><img src="https://img.shields.io/github/license/KFCFans/PowerJob" alt="LICENSE"></a>
 </p>

README_zhCN.md

@@ -1,5 +1,9 @@
 # [English](./README.md) | 简体中文
 
+<p align="center">
+🏮PowerJob 全体成员祝大家龙年腾飞，新的一年身体健康，万事如意，阖家欢乐，幸福安康！🏮
+</p>
+
 <p align="center">
 <img src="https://raw.githubusercontent.com/KFCFans/PowerJob/master/others/images/logo.png" alt="PowerJob" title="PowerJob" width="557"/>
 </p>
@@ -20,7 +24,7 @@ PowerJob（原OhMyScheduler）是全新一代分布式调度与计算框架，
 * DAG工作流支持：支持在线配置任务依赖关系，可视化得对任务进行编排，同时还支持上下游任务间的数据传递
 * 执行器支持广泛：支持Spring Bean、内置/外置Java类、Shell、Python等处理器，应用范围广。
 * 运维便捷：支持在线日志功能，执行器产生的日志可以在前端控制台页面实时显示，降低debug成本，极大地提高开发效率。
-* 依赖精简：最小仅依赖关系型数据库（MySQL/Oracle/MS SQLServer...），扩展依赖为MongoDB（用于存储庞大的在线日志）。
+* 依赖精简：最小仅依赖关系型数据库（MySQL/Oracle/MS SQLServer...）。
 * 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。
 * 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。
 
@@ -34,8 +38,7 @@ PowerJob（原OhMyScheduler）是全新一代分布式调度与计算框架，
 PowerJob 的设计目标为企业级的分布式任务调度平台，即成为公司内部的**任务调度中间件**。整个公司统一部署调度中心 powerjob-server，旗下所有业务线应用只需要依赖 `powerjob-worker` 即可接入调度中心获取任务调度与分布式计算能力。
 
 ### 在线试用
-* 试用地址：[try.powerjob.tech](http://try.powerjob.tech/#/welcome?appName=powerjob-agent-test&password=123)
-* [建议先阅读使用教程了解 PowerJob 的概念和基本用法](https://www.yuque.com/powerjob/guidence/trial)
+* [点击查看试用说明和教程](https://www.yuque.com/powerjob/guidence/trial)
 
 ### 同类产品对比
 |                | QuartZ                   | xxl-job                                  | SchedulerX 2.0                                    | PowerJob                                                |
@@ -70,4 +73,6 @@ PowerJob 的设计目标为企业级的分布式任务调度平台，即成为
 * 欢迎共同参与本项目的贡献，PR和Issue都大大滴欢迎（求求了）～
 * 觉得还不错的话，可以点个Star支持一下哦～ =￣ω￣=
 * 联系方式@KFCFans -> `tengjiqi@gmail.com`
-* 用户交流QQ群：487453839
+* 用户交流QQ群（因广告信息泛滥，加群需要验证，请认真填写申请原因）：
+  * 一群（已满）：487453839
+  * 二群：834937813

SECURITY.md

@@ -0,0 +1,4 @@
+# Security notices relating to PowerJob
+
+Please disclose any security issues or vulnerabilities found through [Tidelift's coordinated disclosure system](https://tidelift.com/security) or to the maintainers privately(tengjiqi@gmail.com).
+

docker-compose.yml

@@ -0,0 +1,54 @@
+# 使用说明 V4.3.1
+# 1. PowerJob 根目录执行：docker-compose up
+# 2. 静静等待服务启动。
+
+version: '3'
+services:
+  powerjob-mysql:
+    environment:
+      MYSQL_ROOT_HOST: "%"
+      MYSQL_ROOT_PASSWORD: No1Bug2Please3!
+    restart: always
+    container_name: powerjob-mysql
+    image: powerjob/powerjob-mysql:latest
+    ports:
+      - "3307:3306"
+    volumes:
+      - ./powerjob-data/powerjob-mysql:/var/lib/mysql
+    command: --lower_case_table_names=1
+
+  powerjob-server:
+    container_name: powerjob-server
+    image: powerjob/powerjob-server:latest
+    restart: always
+    depends_on:
+      - powerjob-mysql
+    environment:
+      JVMOPTIONS: "-Xmx512m"
+      PARAMS: "--oms.mongodb.enable=false --spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"
+    ports:
+      - "7700:7700"
+      - "10086:10086"
+      - "10010:10010"
+    volumes:
+      - ./powerjob-data/powerjob-server:/root/powerjob/server/
+
+  powerjob-worker-samples:
+    container_name: powerjob-worker-samples
+    image: powerjob/powerjob-worker-samples:latest
+    restart: always
+    depends_on:
+      - powerjob-mysql
+      - powerjob-server
+#    environment:
+#      PARAMS: "--powerjob.worker.server-address=powerjob-server:7700"
+    ports:
+      - "8081:8081"
+      - "27777:27777"
+    volumes:
+      - ./powerjob-data/powerjob-worker-samples:/root/powerjob/worker
+      - ./others/script/wait-for-it.sh:/wait-for-it.sh
+    entrypoint:
+      - "sh"
+      - "-c"
+      - "chmod +x wait-for-it.sh && ./wait-for-it.sh powerjob-server:7700 --strict -- java -Xmx512m -jar /powerjob-worker-samples.jar --powerjob.worker.server-address=powerjob-server:7700"

others/Dockerfile

@@ -0,0 +1,11 @@
+FROM mysql/mysql-server:8.0.30
+
+MAINTAINER dudiao(idudaio@163.com)
+
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+COPY sql/01schema.sql /docker-entrypoint-initdb.d
+
+COPY sql/02worker-samples.sql /docker-entrypoint-initdb.d

others/dev/build_test_env.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# 构建 PowerJob 测试环境
+
+echo "================== 关闭全部服务 =================="
+docker-compose down
+echo "================== 构建 jar =================="
+cd `dirname $0`/../.. || exit
+# mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am
+# -U：强制检查snapshot库 -pl：指定需要构建的模块，多模块逗号分割 -am：同时构建依赖模块，一般与pl连用 -Pxxx：指定使用的配置文件
+mvn clean package -Pdev -DskipTests
+echo "================== 拷贝 jar =================="
+/bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar
+/bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar
+ls -l powerjob-server/docker/powerjob-server.jar
+ls -l powerjob-worker-agent/powerjob-agent.jar
+
+cd others/dev
+docker-compose build
+docker-compose --compatibility up

others/dev/docker-compose.yml

@@ -0,0 +1,109 @@
+# 构建 PowerJob 测试环境
+
+version: '3.7'
+services:
+  powerjob-mysql:
+    build:
+      context: ../
+    environment:
+      MYSQL_ROOT_HOST: "%"
+      MYSQL_ROOT_PASSWORD: No1Bug2Please3!
+    deploy:
+      resources:
+        limits:
+          memory: 768M
+    restart: always
+    container_name: powerjob-mysql
+    image: powerjob/powerjob-mysql:test_env
+    ports:
+      - "3309:3306"
+    volumes:
+      - ~/powerjob-data/powerjob-mysql:/var/lib/mysql
+    command: --lower_case_table_names=1
+#  powerjob-mongodb:
+#    image: mongo:latest
+#    container_name: powerjob-mongodb
+#    restart: always
+#    deploy:
+#      resources:
+#        limits:
+#          memory: 256M
+#    environment:
+#      MONGO_INITDB_ROOT_USERNAME: "root"
+#      MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!"
+#      MONGO_INITDB_DATABASE: "powerjob_daily"
+#    ports:
+#      - "27017:27017"
+#    volumes:
+#      - ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+#      - ~/powerjob-data/powerjob-mongodb:/data/db
+  powerjob-server:
+    build:
+      context: ../../powerjob-server/docker
+    deploy:
+      resources:
+        limits:
+          memory: 896M
+    container_name: powerjob-server
+    image: powerjob/powerjob-server:test_env
+    restart: always
+    depends_on:
+      - powerjob-mysql
+#      - powerjob-mongodb
+    environment:
+      PARAMS: "--spring.profiles.active=daily --spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai --oms.storage.dfs.mysql_series.url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"
+      JVMOPTIONS: "-server -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/powerjob/server/gc.log"
+    ports:
+      - "7700:7700"
+      - "10086:10086"
+      - "10010:10010"
+    volumes:
+      - ~/powerjob-data/powerjob-server:/root/powerjob/server/
+      - ~/.m2:/root/.m2
+
+  powerjob-worker-agent:
+    build:
+      context: ../../powerjob-worker-agent
+    deploy:
+      resources:
+        limits:
+          memory: 384M
+    container_name: powerjob-worker-agent
+    image: powerjob/powerjob-worker-agent:test_env
+    restart: always
+    depends_on:
+      - powerjob-mysql
+      - powerjob-server
+    ports:
+      - "5002:5005"
+      - "10002:10000"
+      - "27777:27777"
+    volumes:
+      - ~/powerjob-data/powerjob-worker-agent:/root
+    entrypoint:
+      - "sh"
+      - "-c"
+      - "./wait-for-it.sh powerjob-server:7700 --strict -- java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/gc.log -jar /powerjob-agent.jar --app powerjob-worker-samples --server powerjob-server:7700"
+
+  powerjob-worker-agent2:
+    deploy:
+      resources:
+        limits:
+          memory: 384M
+    container_name: powerjob-worker-agent2
+    image: powerjob/powerjob-worker-agent:test_env
+    restart: always
+    depends_on:
+      - powerjob-mysql
+      - powerjob-server
+    ports:
+      - "5003:5005"
+      - "10003:10000"
+      - "27778:27777"
+    volumes:
+      - ~/powerjob-data/powerjob-worker-agent2:/root
+    entrypoint:
+      - "sh"
+      - "-c"
+      - "./wait-for-it.sh powerjob-server:7700 --strict -- java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/gc.log -jar /powerjob-agent.jar --app powerjob-worker-samples --server powerjob-server:7700"
+

others/dev/publish_docker.sh

@@ -33,11 +33,19 @@ read -r -p "是否重新构建镜像（y/n）:" rebuild
 if [ "$rebuild" = "y" ] || [  "$rebuild" = "Y" ]; then
   echo "================== 删除旧镜像 =================="
   docker rmi -f tjqq/powerjob-server:$version
+  docker rmi -f powerjob/powerjob-server:$version
   docker rmi -f tjqq/powerjob-agent:$version
+  docker rmi -f powerjob/powerjob-agent:$version
+  docker rmi -f powerjob/powerjob-mysql:$version
+  docker rmi -f powerjob/powerjob-worker-samples:$version
   echo "================== 构建 powerjob-server 镜像 =================="
   docker build -t tjqq/powerjob-server:$version powerjob-server/docker/. || exit
   echo "================== 构建 powerjob-agent 镜像 =================="
   docker build -t tjqq/powerjob-agent:$version powerjob-worker-agent/. || exit
+  echo "================== 构建 powerjob-mysql 镜像 =================="
+  docker build -t powerjob/powerjob-mysql:$version others/. || exit
+  echo "================== 构建 powerjob-worker-samples 镜像 =================="
+  docker build -t powerjob/powerjob-worker-samples:$version powerjob-worker-samples/. || exit
 
   read -r -p "是否正式发布该镜像（y/n）:" needrelease
   if [ "$needrelease" = "y" ] || [  "$needrelease" = "Y" ]; then
@@ -47,6 +55,25 @@ if [ "$rebuild" = "y" ] || [  "$rebuild" = "Y" ]; then
       docker push tjqq/powerjob-server:$version
       echo "================== 正在推送 agent 镜像到中央仓库 =================="
       docker push tjqq/powerjob-agent:$version
+      echo "================== 正在推送 powerjob-mysql 镜像到中央仓库 =================="
+      docker push powerjob/powerjob-mysql:$version
+      echo "================== 正在推送 samples 镜像到中央仓库 =================="
+      docker push powerjob/powerjob-worker-samples:$version
+      echo "================== 双写推送 =================="
+      docker tag tjqq/powerjob-server:$version powerjob/powerjob-server:$version
+      docker push powerjob/powerjob-server:$version
+      docker tag tjqq/powerjob-agent:$version powerjob/powerjob-agent:$version
+      docker push powerjob/powerjob-agent:$version
+      echo "================== 更新 LATEST 版本 =================="
+      docker tag powerjob/powerjob-server:$version powerjob/powerjob-server:latest
+      docker push powerjob/powerjob-server:latest
+      docker tag powerjob/powerjob-agent:$version powerjob/powerjob-agent:latest
+      docker push powerjob/powerjob-agent:latest
+      docker tag powerjob/powerjob-mysql:$version powerjob/powerjob-mysql:latest
+      docker push powerjob/powerjob-mysql:latest
+      docker tag powerjob/powerjob-worker-samples:$version powerjob/powerjob-worker-samples:latest
+      docker push powerjob/powerjob-worker-samples:latest
+      echo "================== Docker 推送完毕 =================="
     fi
   fi
 fi
@@ -63,7 +90,7 @@ if [ "$startup" = "y" ] || [  "$startup" = "Y" ]; then
   echo "================== 准备启动 powerjob-server =================="
   docker run -d \
          --name powerjob-server \
-         -p 7700:7700 -p 10086:10086 -p 5001:5005 -p 10001:10000 \
+         -p 7700:7700 -p 10086:10086 -p 10010:10010 -p 5001:5005 -p 10001:10000 \
          -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
          -e PARAMS="--spring.profiles.active=pre" \
          -e TZ="Asia/Shanghai" \

others/dev/publish_docker_apple_silicon.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+echo "A docker image release script for the Apple Silicon device."
+# -p：允许后面跟一个字符串作为提示 -r：保证读入的是原始内容，不会发生任何转义
+read -r -p "请输入Dockedr镜像版本:" version
+echo "即将构建的 server 镜像：powerjob-server:$version"
+echo "即将构建的 agent 镜像：powerjob-agent:$version"
+read -r -p "任意键继续:"
+
+# 一键部署脚本，请勿挪动脚本
+cd `dirname $0`/../.. || exit
+
+read -r -p "是否进行maven构建（y/n）:" needmvn
+if [ "$needmvn" = "y" ] || [  "$needmvn" = "Y" ]; then
+  echo "================== 构建 jar =================="
+  # mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am
+  # -U：强制检查snapshot库 -pl：指定需要构建的模块，多模块逗号分割 -am：同时构建依赖模块，一般与pl连用 -Pxxx：指定使用的配置文件
+  mvn clean package -Pdev -DskipTests -U -e
+  echo "================== 拷贝 jar =================="
+  /bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar
+  /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar
+  ls -l powerjob-server/docker/powerjob-server.jar
+  ls -l powerjob-worker-agent/powerjob-agent.jar
+fi
+
+echo "================== 关闭老应用 =================="
+docker stop powerjob-server
+docker stop powerjob-agent
+docker stop powerjob-agent2
+echo "================== 删除老容器 =================="
+docker container rm powerjob-server
+docker container rm powerjob-agent
+docker container rm powerjob-agent2
+read -r -p "是否构建并发布镜像（y/n）:" rebuild
+if [ "$rebuild" = "y" ] || [  "$rebuild" = "Y" ]; then
+  echo "================== 删除旧镜像 =================="
+  docker rmi -f tjqq/powerjob-server:$version
+  docker rmi -f powerjob/powerjob-server:$version
+  docker rmi -f tjqq/powerjob-agent:$version
+  docker rmi -f powerjob/powerjob-agent:$version
+  docker rmi -f powerjob/powerjob-mysql:$version
+  docker rmi -f powerjob/powerjob-worker-samples:$version
+  echo "================== 构建 powerjob-server 镜像(tjqq) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-server:$version powerjob-server/docker/. --push || exit
+  echo "================== 构建 powerjob-server 镜像(powerjob) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-server:$version powerjob-server/docker/. --push || exit
+  echo "================== 构建 powerjob-agent 镜像(tjqq) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-agent:$version powerjob-worker-agent/. --push|| exit
+  echo "================== 构建 powerjob-agent 镜像(powerjob) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-agent:$version powerjob-worker-agent/. --push|| exit
+  echo "================== 构建 powerjob-mysql 镜像 =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-mysql:$version others/. --push|| exit
+  echo "================== 构建 powerjob-worker-samples 镜像 =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-worker-samples:$version powerjob-worker-samples/. --push|| exit
+fi
+
+read -r -p "是否推送LATEST（y/n）:" push_latest
+if [ "$push_latest" = "y" ] || [  "$push_latest" = "Y" ]; then
+
+  echo "==================  powerjob-server LATEST (tjqq) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-server:latest powerjob-server/docker/. --push || exit
+  echo "==================  powerjob-server LATEST (powerjob) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-server:latest powerjob-server/docker/. --push || exit
+  echo "==================  powerjob-agent LATEST (tjqq) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-agent:latest powerjob-worker-agent/. --push|| exit
+  echo "==================  powerjob-agent LATEST (powerjob) =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-agent:latest powerjob-worker-agent/. --push|| exit
+  echo "==================  powerjob-mysql LATEST =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-mysql:latest others/. --push|| exit
+  echo "==================  powerjob-worker-samples LATEST =================="
+  docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-worker-samples:latest powerjob-worker-samples/. --push|| exit
+fi

others/dev/testenv/init_mongodb.js

@@ -0,0 +1,12 @@
+db.createUser(
+    {
+        user: "zqq",
+        pwd: "No1Bug2Please3!",
+        roles: [
+            {
+                role: "readWrite",
+                db: "powerjob_daily"
+            }
+        ]
+    }
+);

others/powerjob-mysql.sql

@@ -1,17 +1,22 @@
+/*
+官方 SQL 仅基于特定版本（MySQL8）导出，不一定兼容其他数据库，也不一定兼容其他版本。此 SQL 仅供参考。
+如果您的数据库无法使用此 SQL，建议使用 SpringDataJPA 自带的建表能力，先在开发环境直连测试库自动建表，然后自行导出相关的 SQL 即可。
+ */
+
 /*
  Navicat Premium Data Transfer
 
  Source Server         : Local@3306
  Source Server Type    : MySQL
- Source Server Version : 80021
+ Source Server Version : 80300 (8.3.0)
  Source Host           : localhost:3306
- Source Schema         : powerjob-daily
+ Source Schema         : powerjob5
 
  Target Server Type    : MySQL
- Target Server Version : 80021
+ Target Server Version : 80300 (8.3.0)
  File Encoding         : 65001
 
- Date: 14/03/2021 19:54:37
+ Date: 11/08/2024 23:23:30
 */
 
 SET NAMES utf8mb4;
@@ -24,12 +29,18 @@ DROP TABLE IF EXISTS `app_info`;
 CREATE TABLE `app_info` (
                             `id` bigint NOT NULL AUTO_INCREMENT,
                             `app_name` varchar(255) DEFAULT NULL,
+                            `creator` bigint DEFAULT NULL,
                             `current_server` varchar(255) DEFAULT NULL,
+                            `extra` varchar(255) DEFAULT NULL,
                             `gmt_create` datetime(6) DEFAULT NULL,
                             `gmt_modified` datetime(6) DEFAULT NULL,
+                            `modifier` bigint DEFAULT NULL,
+                            `namespace_id` bigint DEFAULT NULL,
                             `password` varchar(255) DEFAULT NULL,
+                            `tags` varchar(255) DEFAULT NULL,
+                            `title` varchar(255) DEFAULT NULL,
                             PRIMARY KEY (`id`),
-                            UNIQUE KEY `appNameUK` (`app_name`)
+                            UNIQUE KEY `uidx01_app_info` (`app_name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -48,7 +59,7 @@ CREATE TABLE `container_info` (
                                   `status` int DEFAULT NULL,
                                   `version` varchar(255) DEFAULT NULL,
                                   PRIMARY KEY (`id`),
-                                  KEY `IDX8hixyaktlnwil2w9up6b0p898` (`app_id`)
+                                  KEY `idx01_container_info` (`app_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -75,9 +86,9 @@ CREATE TABLE `instance_info` (
                                  `type` int DEFAULT NULL,
                                  `wf_instance_id` bigint DEFAULT NULL,
                                  PRIMARY KEY (`id`),
-                                 KEY `IDX5b1nhpe5je7gc5s1ur200njr7` (`job_id`),
-                                 KEY `IDXjnji5lrr195kswk6f7mfhinrs` (`app_id`),
-                                 KEY `IDXa98hq3yu0l863wuotdjl7noum` (`instance_id`)
+                                 KEY `idx01_instance_info` (`job_id`,`status`),
+                                 KEY `idx02_instance_info` (`app_id`,`status`),
+                                 KEY `idx03_instance_info` (`instance_id`,`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -86,10 +97,13 @@ CREATE TABLE `instance_info` (
 DROP TABLE IF EXISTS `job_info`;
 CREATE TABLE `job_info` (
                             `id` bigint NOT NULL AUTO_INCREMENT,
+                            `advanced_runtime_config` varchar(255) DEFAULT NULL,
+                            `alarm_config` varchar(255) DEFAULT NULL,
                             `app_id` bigint DEFAULT NULL,
                             `concurrency` int DEFAULT NULL,
                             `designated_workers` varchar(255) DEFAULT NULL,
                             `dispatch_strategy` int DEFAULT NULL,
+                            `dispatch_strategy_config` varchar(255) DEFAULT NULL,
                             `execute_type` int DEFAULT NULL,
                             `extra` varchar(255) DEFAULT NULL,
                             `gmt_create` datetime(6) DEFAULT NULL,
@@ -100,6 +114,7 @@ CREATE TABLE `job_info` (
                             `job_name` varchar(255) DEFAULT NULL,
                             `job_params` longtext,
                             `lifecycle` varchar(255) DEFAULT NULL,
+                            `log_config` varchar(255) DEFAULT NULL,
                             `max_instance_num` int DEFAULT NULL,
                             `max_worker_count` int DEFAULT NULL,
                             `min_cpu_cores` double NOT NULL,
@@ -110,13 +125,35 @@ CREATE TABLE `job_info` (
                             `processor_info` varchar(255) DEFAULT NULL,
                             `processor_type` int DEFAULT NULL,
                             `status` int DEFAULT NULL,
+                            `tag` varchar(255) DEFAULT NULL,
                             `task_retry_num` int DEFAULT NULL,
                             `time_expression` varchar(255) DEFAULT NULL,
                             `time_expression_type` int DEFAULT NULL,
                             PRIMARY KEY (`id`),
-                            KEY `IDXk2xprmn3lldmlcb52i36udll1` (`app_id`)
+                            KEY `idx01_job_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
+-- ----------------------------
+-- Table structure for namespace
+-- ----------------------------
+DROP TABLE IF EXISTS `namespace`;
+CREATE TABLE `namespace` (
+                             `id` bigint NOT NULL AUTO_INCREMENT,
+                             `code` varchar(255) DEFAULT NULL,
+                             `creator` bigint DEFAULT NULL,
+                             `dept` varchar(255) DEFAULT NULL,
+                             `extra` varchar(255) DEFAULT NULL,
+                             `gmt_create` datetime(6) DEFAULT NULL,
+                             `gmt_modified` datetime(6) DEFAULT NULL,
+                             `modifier` bigint DEFAULT NULL,
+                             `name` varchar(255) DEFAULT NULL,
+                             `status` int DEFAULT NULL,
+                             `tags` varchar(255) DEFAULT NULL,
+                             `token` varchar(255) DEFAULT NULL,
+                             PRIMARY KEY (`id`),
+                             UNIQUE KEY `uidx01_namespace` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
 -- ----------------------------
 -- Table structure for oms_lock
 -- ----------------------------
@@ -129,7 +166,22 @@ CREATE TABLE `oms_lock` (
                             `max_lock_time` bigint DEFAULT NULL,
                             `ownerip` varchar(255) DEFAULT NULL,
                             PRIMARY KEY (`id`),
-                            UNIQUE KEY `lockNameUK` (`lock_name`)
+                            UNIQUE KEY `uidx01_oms_lock` (`lock_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for pwjb_user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `pwjb_user_info`;
+CREATE TABLE `pwjb_user_info` (
+                                  `id` bigint NOT NULL AUTO_INCREMENT,
+                                  `extra` varchar(255) DEFAULT NULL,
+                                  `gmt_create` datetime(6) DEFAULT NULL,
+                                  `gmt_modified` datetime(6) DEFAULT NULL,
+                                  `password` varchar(255) DEFAULT NULL,
+                                  `username` varchar(255) DEFAULT NULL,
+                                  PRIMARY KEY (`id`),
+                                  UNIQUE KEY `uidx01_username` (`username`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -142,25 +194,66 @@ CREATE TABLE `server_info` (
                                `gmt_modified` datetime(6) DEFAULT NULL,
                                `ip` varchar(255) DEFAULT NULL,
                                PRIMARY KEY (`id`),
-                               UNIQUE KEY `UKtk8ytgpl7mpukhnvhbl82kgvy` (`ip`)
+                               UNIQUE KEY `uidx01_server_info` (`ip`),
+                               KEY `idx01_server_info` (`gmt_modified`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
+-- ----------------------------
+-- Table structure for sundry
+-- ----------------------------
+DROP TABLE IF EXISTS `sundry`;
+CREATE TABLE `sundry` (
+                          `id` bigint NOT NULL AUTO_INCREMENT,
+                          `content` varchar(255) DEFAULT NULL,
+                          `extra` varchar(255) DEFAULT NULL,
+                          `gmt_create` datetime(6) DEFAULT NULL,
+                          `gmt_modified` datetime(6) DEFAULT NULL,
+                          `pkey` varchar(255) DEFAULT NULL,
+                          `skey` varchar(255) DEFAULT NULL,
+                          PRIMARY KEY (`id`),
+                          UNIQUE KEY `uidx01_sundry` (`pkey`,`skey`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
 -- ----------------------------
 -- Table structure for user_info
 -- ----------------------------
 DROP TABLE IF EXISTS `user_info`;
 CREATE TABLE `user_info` (
                              `id` bigint NOT NULL AUTO_INCREMENT,
+                             `account_type` varchar(255) DEFAULT NULL,
                              `email` varchar(255) DEFAULT NULL,
                              `extra` varchar(255) DEFAULT NULL,
                              `gmt_create` datetime(6) DEFAULT NULL,
                              `gmt_modified` datetime(6) DEFAULT NULL,
+                             `nick` varchar(255) DEFAULT NULL,
+                             `origin_username` varchar(255) DEFAULT NULL,
                              `password` varchar(255) DEFAULT NULL,
                              `phone` varchar(255) DEFAULT NULL,
+                             `status` int DEFAULT NULL,
+                             `token_login_verify_info` varchar(255) DEFAULT NULL,
                              `username` varchar(255) DEFAULT NULL,
                              `web_hook` varchar(255) DEFAULT NULL,
-                             PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+                             PRIMARY KEY (`id`),
+                             UNIQUE KEY `uidx01_user_name` (`username`),
+                             KEY `uidx02_user_info` (`email`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `user_role`;
+CREATE TABLE `user_role` (
+                             `id` bigint NOT NULL AUTO_INCREMENT,
+                             `extra` varchar(255) DEFAULT NULL,
+                             `gmt_create` datetime(6) DEFAULT NULL,
+                             `gmt_modified` datetime(6) DEFAULT NULL,
+                             `role` int DEFAULT NULL,
+                             `scope` int DEFAULT NULL,
+                             `target` bigint DEFAULT NULL,
+                             `user_id` bigint DEFAULT NULL,
+                             PRIMARY KEY (`id`),
+                             KEY `uidx01_user_id` (`user_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for workflow_info
@@ -183,7 +276,7 @@ CREATE TABLE `workflow_info` (
                                  `wf_description` varchar(255) DEFAULT NULL,
                                  `wf_name` varchar(255) DEFAULT NULL,
                                  PRIMARY KEY (`id`),
-                                 KEY `IDX7uo5w0e3beeho3fnx9t7eiol3` (`app_id`)
+                                 KEY `idx01_workflow_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -199,13 +292,16 @@ CREATE TABLE `workflow_instance_info` (
                                           `finished_time` bigint DEFAULT NULL,
                                           `gmt_create` datetime(6) DEFAULT NULL,
                                           `gmt_modified` datetime(6) DEFAULT NULL,
+                                          `parent_wf_instance_id` bigint DEFAULT NULL,
                                           `result` longtext,
                                           `status` int DEFAULT NULL,
                                           `wf_context` longtext,
                                           `wf_init_params` longtext,
                                           `wf_instance_id` bigint DEFAULT NULL,
                                           `workflow_id` bigint DEFAULT NULL,
-                                          PRIMARY KEY (`id`)
+                                          PRIMARY KEY (`id`),
+                                          UNIQUE KEY `uidx01_wf_instance` (`wf_instance_id`),
+                                          KEY `idx01_wf_instance` (`workflow_id`,`status`,`app_id`,`expected_trigger_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -224,10 +320,9 @@ CREATE TABLE `workflow_node_info` (
                                       `node_params` longtext,
                                       `skip_when_failed` bit(1) NOT NULL,
                                       `type` int DEFAULT NULL,
-                                      `workflow_id` bigint NOT NULL,
+                                      `workflow_id` bigint DEFAULT NULL,
                                       PRIMARY KEY (`id`),
-                                      KEY `IDX36t7rhj4mkg2a5pb4ttorscta` (`app_id`),
-                                      KEY `IDXacr0i6my8jr002ou8i1gmygju` (`workflow_id`)
+                                      KEY `idx01_workflow_node_info` (`workflow_id`,`gmt_create`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;

others/script/jenkins_auto_build.sh

@@ -1,32 +1,31 @@
 #!/bin/bash
 cd `dirname $0`/../.. || exit
 echo "================== 构建 jar =================="
-mvn clean package -Pdev -DskipTests -U -e
+mvn clean package -Pdev -DskipTests -e
 echo "================== 拷贝 jar =================="
 /bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar
-/bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar
 echo "================== 关闭老应用 =================="
 docker stop powerjob-server
-docker stop powerjob-agent
-docker stop powerjob-agent2
+docker stop powerjob-worker-samples
+docker stop powerjob-worker-samples2
 echo "================== 删除老容器 =================="
 docker container rm powerjob-server
-docker container rm powerjob-agent
-docker container rm powerjob-agent2
+docker container rm powerjob-worker-samples
+docker container rm powerjob-worker-samples2
 echo "================== 删除旧镜像 =================="
 docker rmi -f tjqq/powerjob-server:latest
-docker rmi -f tjqq/powerjob-agent:latest
+docker rmi -f tjqq/powerjob-worker-samples:latest
 echo "================== 构建 powerjob-server 镜像 =================="
 docker build -t tjqq/powerjob-server:latest powerjob-server/docker/. || exit
-echo "================== 构建 powerjob-agent 镜像 =================="
-docker build -t tjqq/powerjob-agent:latest powerjob-worker-agent/. || exit
+echo "================== 构建 powerjob-worker-samples 镜像 =================="
+docker build -t tjqq/powerjob-worker-samples:latest powerjob-worker-samples/. || exit
 echo "================== 准备启动 powerjob-server =================="
 docker run -d \
        --restart=always \
        --name powerjob-server \
        -p 7700:7700 -p 10086:10086 -p 5001:5005 -p 10001:10000 \
        -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
-       -e PARAMS="--oms.swagger.enable=true --spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-product" \
+       -e PARAMS="--oms.swagger.enable=true --spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --oms.mongodb.enable=false --spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-product" \
        -v ~/docker/powerjob-server:/root/powerjob/server -v ~/.m2:/root/.m2 \
        tjqq/powerjob-server:latest
 sleep 60
@@ -37,19 +36,19 @@ echo "使用的Server地址：$serverAddress"
 
 docker run -d \
        --restart=always \
-       --name powerjob-agent \
+       --name powerjob-worker-samples \
        -p 27777:27777 -p 5002:5005 -p 10002:10000 \
        -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
-       -e PARAMS="--app powerjob-agent-test --server $serverAddress" \
-       -v ~/docker/powerjob-agent:/root \
-       tjqq/powerjob-agent:latest
+       -e PARAMS="--powerjob.worker.server-address=$serverAddress" \
+       -v ~/docker/powerjob-worker-samples:/root \
+       tjqq/powerjob-worker-samples:latest
 
 docker run -d \
        --restart=always \
-       --name powerjob-agent2 \
+       --name powerjob-worker-samples2 \
        -p 27778:27777 -p 5003:5005 -p 10003:10000 \
        -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
-       -e PARAMS="--app powerjob-agent-test --server $serverAddress" \
-       -v ~/docker/powerjob-agent2:/root \
-       tjqq/powerjob-agent:latest
+       -e PARAMS="--powerjob.worker.server-address=$serverAddress" \
+       -v ~/docker/powerjob-worker-samples2:/root \
+       tjqq/powerjob-worker-samples:latest
 

others/script/wait-for-it.sh

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi

others/sql/01schema.sql

@@ -0,0 +1,2 @@
+-- powerjob
+create database `powerjob-daily` default character set utf8mb4 collate utf8mb4_general_ci;

others/sql/02worker-samples.sql

@@ -0,0 +1,21 @@
+USE powerjob-daily;
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+CREATE TABLE IF NOT EXISTS `app_info` (
+    `id`             bigint       NOT NULL AUTO_INCREMENT COMMENT '应用ID',
+    `app_name`       varchar(128) not NULL COMMENT '应用名称',
+    `current_server` varchar(255) default null COMMENT 'Server地址,用于负责调度应用的ActorSystem地址',
+    `gmt_create`     datetime     not null COMMENT '创建时间',
+    `gmt_modified`   datetime     not null COMMENT '更新时间',
+    `password`       varchar(255) not null COMMENT '应用密码',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uidx01_app_info` (`app_name`)
+) ENGINE = InnoDB AUTO_INCREMENT = 1
+DEFAULT CHARSET = utf8mb4
+COLLATE = utf8mb4_general_ci COMMENT ='应用表';
+
+insert into app_info (app_name, gmt_create, gmt_modified, password) select 'powerjob-worker-samples', current_timestamp(), current_timestamp(), 'powerjob123' from dual where not exists ( select * from app_info where app_name = 'powerjob-worker-samples');
+
+SET FOREIGN_KEY_CHECKS = 1;

others/sql/schema/powerjob_mysql_4.3.9.sql

@@ -0,0 +1,243 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : Local@3306
+ Source Server Type    : MySQL
+ Source Server Version : 80300 (8.3.0)
+ Source Host           : localhost:3306
+ Source Schema         : powerjob4
+
+ Target Server Type    : MySQL
+ Target Server Version : 80300 (8.3.0)
+ File Encoding         : 65001
+
+ Date: 02/03/2024 18:51:36
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for app_info
+-- ----------------------------
+DROP TABLE IF EXISTS `app_info`;
+CREATE TABLE `app_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_name` varchar(255) DEFAULT NULL,
+  `current_server` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_app_info` (`app_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for container_info
+-- ----------------------------
+DROP TABLE IF EXISTS `container_info`;
+CREATE TABLE `container_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint DEFAULT NULL,
+  `container_name` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `last_deploy_time` datetime(6) DEFAULT NULL,
+  `source_info` varchar(255) DEFAULT NULL,
+  `source_type` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_container_info` (`app_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for instance_info
+-- ----------------------------
+DROP TABLE IF EXISTS `instance_info`;
+CREATE TABLE `instance_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `actual_trigger_time` bigint DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `expected_trigger_time` bigint DEFAULT NULL,
+  `finished_time` bigint DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `instance_id` bigint DEFAULT NULL,
+  `instance_params` longtext,
+  `job_id` bigint DEFAULT NULL,
+  `job_params` longtext,
+  `last_report_time` bigint DEFAULT NULL,
+  `result` longtext,
+  `running_times` bigint DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `task_tracker_address` varchar(255) DEFAULT NULL,
+  `type` int DEFAULT NULL,
+  `wf_instance_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_instance_info` (`job_id`,`status`),
+  KEY `idx02_instance_info` (`app_id`,`status`),
+  KEY `idx03_instance_info` (`instance_id`,`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for job_info
+-- ----------------------------
+DROP TABLE IF EXISTS `job_info`;
+CREATE TABLE `job_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `advanced_runtime_config` varchar(255) DEFAULT NULL,
+  `alarm_config` varchar(255) DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `concurrency` int DEFAULT NULL,
+  `designated_workers` varchar(255) DEFAULT NULL,
+  `dispatch_strategy` int DEFAULT NULL,
+  `dispatch_strategy_config` varchar(255) DEFAULT NULL,
+  `execute_type` int DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `instance_retry_num` int DEFAULT NULL,
+  `instance_time_limit` bigint DEFAULT NULL,
+  `job_description` varchar(255) DEFAULT NULL,
+  `job_name` varchar(255) DEFAULT NULL,
+  `job_params` longtext,
+  `lifecycle` varchar(255) DEFAULT NULL,
+  `log_config` varchar(255) DEFAULT NULL,
+  `max_instance_num` int DEFAULT NULL,
+  `max_worker_count` int DEFAULT NULL,
+  `min_cpu_cores` double NOT NULL,
+  `min_disk_space` double NOT NULL,
+  `min_memory_space` double NOT NULL,
+  `next_trigger_time` bigint DEFAULT NULL,
+  `notify_user_ids` varchar(255) DEFAULT NULL,
+  `processor_info` varchar(255) DEFAULT NULL,
+  `processor_type` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `tag` varchar(255) DEFAULT NULL,
+  `task_retry_num` int DEFAULT NULL,
+  `time_expression` varchar(255) DEFAULT NULL,
+  `time_expression_type` int DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_job_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for oms_lock
+-- ----------------------------
+DROP TABLE IF EXISTS `oms_lock`;
+CREATE TABLE `oms_lock` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `lock_name` varchar(255) DEFAULT NULL,
+  `max_lock_time` bigint DEFAULT NULL,
+  `ownerip` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_oms_lock` (`lock_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for server_info
+-- ----------------------------
+DROP TABLE IF EXISTS `server_info`;
+CREATE TABLE `server_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `ip` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_server_info` (`ip`),
+  KEY `idx01_server_info` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `user_info`;
+CREATE TABLE `user_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `email` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `phone` varchar(255) DEFAULT NULL,
+  `username` varchar(255) DEFAULT NULL,
+  `web_hook` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uidx01_user_info` (`username`),
+  KEY `uidx02_user_info` (`email`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_info`;
+CREATE TABLE `workflow_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `lifecycle` varchar(255) DEFAULT NULL,
+  `max_wf_instance_num` int DEFAULT NULL,
+  `next_trigger_time` bigint DEFAULT NULL,
+  `notify_user_ids` varchar(255) DEFAULT NULL,
+  `pedag` longtext,
+  `status` int DEFAULT NULL,
+  `time_expression` varchar(255) DEFAULT NULL,
+  `time_expression_type` int DEFAULT NULL,
+  `wf_description` varchar(255) DEFAULT NULL,
+  `wf_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_workflow_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_instance_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_instance_info`;
+CREATE TABLE `workflow_instance_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `actual_trigger_time` bigint DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `dag` longtext,
+  `expected_trigger_time` bigint DEFAULT NULL,
+  `finished_time` bigint DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `parent_wf_instance_id` bigint DEFAULT NULL,
+  `result` longtext,
+  `status` int DEFAULT NULL,
+  `wf_context` longtext,
+  `wf_init_params` longtext,
+  `wf_instance_id` bigint DEFAULT NULL,
+  `workflow_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_wf_instance` (`wf_instance_id`),
+  KEY `idx01_wf_instance` (`workflow_id`,`status`,`app_id`,`expected_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_node_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_node_info`;
+CREATE TABLE `workflow_node_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint NOT NULL,
+  `enable` bit(1) NOT NULL,
+  `extra` longtext,
+  `gmt_create` datetime(6) NOT NULL,
+  `gmt_modified` datetime(6) NOT NULL,
+  `job_id` bigint DEFAULT NULL,
+  `node_name` varchar(255) DEFAULT NULL,
+  `node_params` longtext,
+  `skip_when_failed` bit(1) NOT NULL,
+  `type` int DEFAULT NULL,
+  `workflow_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_workflow_node_info` (`workflow_id`,`gmt_create`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+SET FOREIGN_KEY_CHECKS = 1;

others/sql/schema/powerjob_mysql_5.0.1.sql

@@ -0,0 +1,323 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : Local@3306
+ Source Server Type    : MySQL
+ Source Server Version : 80300 (8.3.0)
+ Source Host           : localhost:3306
+ Source Schema         : powerjob5
+
+ Target Server Type    : MySQL
+ Target Server Version : 80300 (8.3.0)
+ File Encoding         : 65001
+
+ Date: 16/03/2024 22:07:31
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for app_info
+-- ----------------------------
+DROP TABLE IF EXISTS `app_info`;
+CREATE TABLE `app_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_name` varchar(255) DEFAULT NULL,
+  `creator` bigint DEFAULT NULL,
+  `current_server` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `modifier` bigint DEFAULT NULL,
+  `namespace_id` bigint DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `tags` varchar(255) DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_app_info` (`app_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for container_info
+-- ----------------------------
+DROP TABLE IF EXISTS `container_info`;
+CREATE TABLE `container_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint DEFAULT NULL,
+  `container_name` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `last_deploy_time` datetime(6) DEFAULT NULL,
+  `source_info` varchar(255) DEFAULT NULL,
+  `source_type` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_container_info` (`app_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for instance_info
+-- ----------------------------
+DROP TABLE IF EXISTS `instance_info`;
+CREATE TABLE `instance_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `actual_trigger_time` bigint DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `expected_trigger_time` bigint DEFAULT NULL,
+  `finished_time` bigint DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `instance_id` bigint DEFAULT NULL,
+  `instance_params` longtext,
+  `job_id` bigint DEFAULT NULL,
+  `job_params` longtext,
+  `last_report_time` bigint DEFAULT NULL,
+  `result` longtext,
+  `running_times` bigint DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `task_tracker_address` varchar(255) DEFAULT NULL,
+  `type` int DEFAULT NULL,
+  `wf_instance_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_instance_info` (`job_id`,`status`),
+  KEY `idx02_instance_info` (`app_id`,`status`),
+  KEY `idx03_instance_info` (`instance_id`,`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for job_info
+-- ----------------------------
+DROP TABLE IF EXISTS `job_info`;
+CREATE TABLE `job_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `advanced_runtime_config` varchar(255) DEFAULT NULL,
+  `alarm_config` varchar(255) DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `concurrency` int DEFAULT NULL,
+  `designated_workers` varchar(255) DEFAULT NULL,
+  `dispatch_strategy` int DEFAULT NULL,
+  `dispatch_strategy_config` varchar(255) DEFAULT NULL,
+  `execute_type` int DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `instance_retry_num` int DEFAULT NULL,
+  `instance_time_limit` bigint DEFAULT NULL,
+  `job_description` varchar(255) DEFAULT NULL,
+  `job_name` varchar(255) DEFAULT NULL,
+  `job_params` longtext,
+  `lifecycle` varchar(255) DEFAULT NULL,
+  `log_config` varchar(255) DEFAULT NULL,
+  `max_instance_num` int DEFAULT NULL,
+  `max_worker_count` int DEFAULT NULL,
+  `min_cpu_cores` double NOT NULL,
+  `min_disk_space` double NOT NULL,
+  `min_memory_space` double NOT NULL,
+  `next_trigger_time` bigint DEFAULT NULL,
+  `notify_user_ids` varchar(255) DEFAULT NULL,
+  `processor_info` varchar(255) DEFAULT NULL,
+  `processor_type` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `tag` varchar(255) DEFAULT NULL,
+  `task_retry_num` int DEFAULT NULL,
+  `time_expression` varchar(255) DEFAULT NULL,
+  `time_expression_type` int DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_job_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for namespace
+-- ----------------------------
+DROP TABLE IF EXISTS `namespace`;
+CREATE TABLE `namespace` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `code` varchar(255) DEFAULT NULL,
+  `creator` bigint DEFAULT NULL,
+  `dept` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `modifier` bigint DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `tags` varchar(255) DEFAULT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_namespace` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for oms_lock
+-- ----------------------------
+DROP TABLE IF EXISTS `oms_lock`;
+CREATE TABLE `oms_lock` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `lock_name` varchar(255) DEFAULT NULL,
+  `max_lock_time` bigint DEFAULT NULL,
+  `ownerip` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_oms_lock` (`lock_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for pwjb_user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `pwjb_user_info`;
+CREATE TABLE `pwjb_user_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `username` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_username` (`username`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for server_info
+-- ----------------------------
+DROP TABLE IF EXISTS `server_info`;
+CREATE TABLE `server_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `ip` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_server_info` (`ip`),
+  KEY `idx01_server_info` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for sundry
+-- ----------------------------
+DROP TABLE IF EXISTS `sundry`;
+CREATE TABLE `sundry` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `content` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `pkey` varchar(255) DEFAULT NULL,
+  `skey` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_sundry` (`pkey`,`skey`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `user_info`;
+CREATE TABLE `user_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `account_type` varchar(255) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `nick` varchar(255) DEFAULT NULL,
+  `origin_username` varchar(255) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `phone` varchar(255) DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `token_login_verify_info` varchar(255) DEFAULT NULL,
+  `username` varchar(255) DEFAULT NULL,
+  `web_hook` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_user_name` (`username`),
+  KEY `uidx02_user_info` (`email`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `user_role`;
+CREATE TABLE `user_role` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `role` int DEFAULT NULL,
+  `scope` int DEFAULT NULL,
+  `target` bigint DEFAULT NULL,
+  `user_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uidx01_user_id` (`user_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_info`;
+CREATE TABLE `workflow_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `lifecycle` varchar(255) DEFAULT NULL,
+  `max_wf_instance_num` int DEFAULT NULL,
+  `next_trigger_time` bigint DEFAULT NULL,
+  `notify_user_ids` varchar(255) DEFAULT NULL,
+  `pedag` longtext,
+  `status` int DEFAULT NULL,
+  `time_expression` varchar(255) DEFAULT NULL,
+  `time_expression_type` int DEFAULT NULL,
+  `wf_description` varchar(255) DEFAULT NULL,
+  `wf_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_workflow_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_instance_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_instance_info`;
+CREATE TABLE `workflow_instance_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `actual_trigger_time` bigint DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `dag` longtext,
+  `expected_trigger_time` bigint DEFAULT NULL,
+  `finished_time` bigint DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `parent_wf_instance_id` bigint DEFAULT NULL,
+  `result` longtext,
+  `status` int DEFAULT NULL,
+  `wf_context` longtext,
+  `wf_init_params` longtext,
+  `wf_instance_id` bigint DEFAULT NULL,
+  `workflow_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_wf_instance` (`wf_instance_id`),
+  KEY `idx01_wf_instance` (`workflow_id`,`status`,`app_id`,`expected_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_node_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_node_info`;
+CREATE TABLE `workflow_node_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint NOT NULL,
+  `enable` bit(1) NOT NULL,
+  `extra` longtext,
+  `gmt_create` datetime(6) NOT NULL,
+  `gmt_modified` datetime(6) NOT NULL,
+  `job_id` bigint DEFAULT NULL,
+  `node_name` varchar(255) DEFAULT NULL,
+  `node_params` longtext,
+  `skip_when_failed` bit(1) NOT NULL,
+  `type` int DEFAULT NULL,
+  `workflow_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_workflow_node_info` (`workflow_id`,`gmt_create`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+SET FOREIGN_KEY_CHECKS = 1;

others/sql/schema/powerjob_mysql_5.1.0.sql

@@ -0,0 +1,323 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : Local@3306
+ Source Server Type    : MySQL
+ Source Server Version : 80300 (8.3.0)
+ Source Host           : localhost:3306
+ Source Schema         : powerjob5
+
+ Target Server Type    : MySQL
+ Target Server Version : 80300 (8.3.0)
+ File Encoding         : 65001
+
+ Date: 11/08/2024 23:23:30
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for app_info
+-- ----------------------------
+DROP TABLE IF EXISTS `app_info`;
+CREATE TABLE `app_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_name` varchar(255) DEFAULT NULL,
+  `creator` bigint DEFAULT NULL,
+  `current_server` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `modifier` bigint DEFAULT NULL,
+  `namespace_id` bigint DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `tags` varchar(255) DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_app_info` (`app_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for container_info
+-- ----------------------------
+DROP TABLE IF EXISTS `container_info`;
+CREATE TABLE `container_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint DEFAULT NULL,
+  `container_name` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `last_deploy_time` datetime(6) DEFAULT NULL,
+  `source_info` varchar(255) DEFAULT NULL,
+  `source_type` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_container_info` (`app_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for instance_info
+-- ----------------------------
+DROP TABLE IF EXISTS `instance_info`;
+CREATE TABLE `instance_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `actual_trigger_time` bigint DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `expected_trigger_time` bigint DEFAULT NULL,
+  `finished_time` bigint DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `instance_id` bigint DEFAULT NULL,
+  `instance_params` longtext,
+  `job_id` bigint DEFAULT NULL,
+  `job_params` longtext,
+  `last_report_time` bigint DEFAULT NULL,
+  `result` longtext,
+  `running_times` bigint DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `task_tracker_address` varchar(255) DEFAULT NULL,
+  `type` int DEFAULT NULL,
+  `wf_instance_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_instance_info` (`job_id`,`status`),
+  KEY `idx02_instance_info` (`app_id`,`status`),
+  KEY `idx03_instance_info` (`instance_id`,`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for job_info
+-- ----------------------------
+DROP TABLE IF EXISTS `job_info`;
+CREATE TABLE `job_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `advanced_runtime_config` varchar(255) DEFAULT NULL,
+  `alarm_config` varchar(255) DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `concurrency` int DEFAULT NULL,
+  `designated_workers` varchar(255) DEFAULT NULL,
+  `dispatch_strategy` int DEFAULT NULL,
+  `dispatch_strategy_config` varchar(255) DEFAULT NULL,
+  `execute_type` int DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `instance_retry_num` int DEFAULT NULL,
+  `instance_time_limit` bigint DEFAULT NULL,
+  `job_description` varchar(255) DEFAULT NULL,
+  `job_name` varchar(255) DEFAULT NULL,
+  `job_params` longtext,
+  `lifecycle` varchar(255) DEFAULT NULL,
+  `log_config` varchar(255) DEFAULT NULL,
+  `max_instance_num` int DEFAULT NULL,
+  `max_worker_count` int DEFAULT NULL,
+  `min_cpu_cores` double NOT NULL,
+  `min_disk_space` double NOT NULL,
+  `min_memory_space` double NOT NULL,
+  `next_trigger_time` bigint DEFAULT NULL,
+  `notify_user_ids` varchar(255) DEFAULT NULL,
+  `processor_info` varchar(255) DEFAULT NULL,
+  `processor_type` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `tag` varchar(255) DEFAULT NULL,
+  `task_retry_num` int DEFAULT NULL,
+  `time_expression` varchar(255) DEFAULT NULL,
+  `time_expression_type` int DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_job_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for namespace
+-- ----------------------------
+DROP TABLE IF EXISTS `namespace`;
+CREATE TABLE `namespace` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `code` varchar(255) DEFAULT NULL,
+  `creator` bigint DEFAULT NULL,
+  `dept` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `modifier` bigint DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `tags` varchar(255) DEFAULT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_namespace` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for oms_lock
+-- ----------------------------
+DROP TABLE IF EXISTS `oms_lock`;
+CREATE TABLE `oms_lock` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `lock_name` varchar(255) DEFAULT NULL,
+  `max_lock_time` bigint DEFAULT NULL,
+  `ownerip` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_oms_lock` (`lock_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for pwjb_user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `pwjb_user_info`;
+CREATE TABLE `pwjb_user_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `username` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_username` (`username`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for server_info
+-- ----------------------------
+DROP TABLE IF EXISTS `server_info`;
+CREATE TABLE `server_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `ip` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_server_info` (`ip`),
+  KEY `idx01_server_info` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for sundry
+-- ----------------------------
+DROP TABLE IF EXISTS `sundry`;
+CREATE TABLE `sundry` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `content` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `pkey` varchar(255) DEFAULT NULL,
+  `skey` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_sundry` (`pkey`,`skey`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `user_info`;
+CREATE TABLE `user_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `account_type` varchar(255) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `nick` varchar(255) DEFAULT NULL,
+  `origin_username` varchar(255) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `phone` varchar(255) DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `token_login_verify_info` varchar(255) DEFAULT NULL,
+  `username` varchar(255) DEFAULT NULL,
+  `web_hook` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_user_name` (`username`),
+  KEY `uidx02_user_info` (`email`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `user_role`;
+CREATE TABLE `user_role` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `role` int DEFAULT NULL,
+  `scope` int DEFAULT NULL,
+  `target` bigint DEFAULT NULL,
+  `user_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uidx01_user_id` (`user_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_info`;
+CREATE TABLE `workflow_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint DEFAULT NULL,
+  `extra` varchar(255) DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `lifecycle` varchar(255) DEFAULT NULL,
+  `max_wf_instance_num` int DEFAULT NULL,
+  `next_trigger_time` bigint DEFAULT NULL,
+  `notify_user_ids` varchar(255) DEFAULT NULL,
+  `pedag` longtext,
+  `status` int DEFAULT NULL,
+  `time_expression` varchar(255) DEFAULT NULL,
+  `time_expression_type` int DEFAULT NULL,
+  `wf_description` varchar(255) DEFAULT NULL,
+  `wf_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_workflow_info` (`app_id`,`status`,`time_expression_type`,`next_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_instance_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_instance_info`;
+CREATE TABLE `workflow_instance_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `actual_trigger_time` bigint DEFAULT NULL,
+  `app_id` bigint DEFAULT NULL,
+  `dag` longtext,
+  `expected_trigger_time` bigint DEFAULT NULL,
+  `finished_time` bigint DEFAULT NULL,
+  `gmt_create` datetime(6) DEFAULT NULL,
+  `gmt_modified` datetime(6) DEFAULT NULL,
+  `parent_wf_instance_id` bigint DEFAULT NULL,
+  `result` longtext,
+  `status` int DEFAULT NULL,
+  `wf_context` longtext,
+  `wf_init_params` longtext,
+  `wf_instance_id` bigint DEFAULT NULL,
+  `workflow_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uidx01_wf_instance` (`wf_instance_id`),
+  KEY `idx01_wf_instance` (`workflow_id`,`status`,`app_id`,`expected_trigger_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for workflow_node_info
+-- ----------------------------
+DROP TABLE IF EXISTS `workflow_node_info`;
+CREATE TABLE `workflow_node_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `app_id` bigint NOT NULL,
+  `enable` bit(1) NOT NULL,
+  `extra` longtext,
+  `gmt_create` datetime(6) NOT NULL,
+  `gmt_modified` datetime(6) NOT NULL,
+  `job_id` bigint DEFAULT NULL,
+  `node_name` varchar(255) DEFAULT NULL,
+  `node_params` longtext,
+  `skip_when_failed` bit(1) NOT NULL,
+  `type` int DEFAULT NULL,
+  `workflow_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx01_workflow_node_info` (`workflow_id`,`gmt_create`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+SET FOREIGN_KEY_CHECKS = 1;

others/sql/upgrade/README.md

@@ -0,0 +1,7 @@
+由于存在不同数据库、不同版本的升级，官方能给出的 upgrade SQL 相对有限，大家可参考以下方式自行生成升级 SQL：
+
+- 【官方脚本】参考官方每个版本的数据库全库建表文件（项目 others - sql - schema），自行进行字段 DIFF
+
+- 【自己动手版】导出当前您的 powerjob 数据库表结构，同时创建一个测试库，让 5.x 版本的 server 直连该测试库，自动建表。分别拿到两个版本的表结构 SQL 后，借用工具生产 update SQL 即可（navigate 等数据库管理软件均支持结构对比）
+
+参考文档：https://www.yuque.com/powerjob/guidence/upgrade

others/sql/upgrade/v4.0.x-v4.1.x.sql

@@ -0,0 +1,10 @@
+-- Upgrade SQL FROM 4.0.x to 4.1.x
+-- ----------------------------
+-- Table change for workflow_instance_info
+-- ----------------------------
+alter table workflow_instance_info
+    add parent_wf_instance_id bigint default null null comment '上层工作流实例ID';
+-- ----------------------------
+-- Table change for job_info
+-- ----------------------------
+alter table job_info add alarm_config varchar(512) comment '告警配置' default null;

others/sql/upgrade/v4.1.x-v4.2.x.sql

@@ -0,0 +1,6 @@
+-- Upgrade SQL FROM 4.1.x to 4.2.x
+-- ----------------------------
+-- Table change for job_info
+-- ----------------------------
+alter table job_info add tag varchar(255) comment 'TAG' default null;
+alter table job_info add log_config varchar(255) comment 'logConfig' default null;

others/sql/upgrade/v4.3.7-v4.3.8.sql

@@ -0,0 +1,6 @@
+-- Upgrade SQL FROM 4.3.7 to 4.3.8
+-- ----------------------------
+-- Table change for job_info
+-- ----------------------------
+alter table job_info add dispatch_strategy_config varchar(255) comment 'dispatch_strategy_config' default null;
+alter table job_info add advanced_runtime_config varchar(255) comment 'advanced_runtime_config' default null;

others/sql/upgrade/v4.3.x-v5.0.x.sql

@@ -0,0 +1,88 @@
+-- Upgrade SQL FROM 4.1.x to 4.2.x
+-- ----------------------------
+-- Table change for app_info
+-- ----------------------------
+SET FOREIGN_KEY_CHECKS=0;
+
+ALTER TABLE `app_info` ADD COLUMN `creator` bigint NULL DEFAULT NULL;
+ALTER TABLE `app_info` ADD COLUMN `extra` varchar(255) NULL DEFAULT NULL;
+ALTER TABLE `app_info` ADD COLUMN `modifier` bigint NULL DEFAULT NULL;
+ALTER TABLE `app_info` ADD COLUMN `namespace_id` bigint NULL DEFAULT NULL;
+ALTER TABLE `app_info` ADD COLUMN `tags` varchar(255)  NULL DEFAULT NULL;
+ALTER TABLE `app_info` ADD COLUMN `title` varchar(255)  NULL DEFAULT NULL;
+
+-- ----------------------------
+-- Table change for user_info
+-- ----------------------------
+ALTER TABLE `user_info` ADD COLUMN `account_type` varchar(255)  NULL DEFAULT NULL;
+ALTER TABLE `user_info` ADD COLUMN `nick` varchar(255)  NULL DEFAULT NULL;
+ALTER TABLE `user_info` ADD COLUMN `origin_username` varchar(255)  NULL DEFAULT NULL;
+ALTER TABLE `user_info` ADD COLUMN `token_login_verify_info` varchar(255)  NULL DEFAULT NULL;
+ALTER TABLE `user_info` ADD UNIQUE INDEX `uidx01_user_name`(`username` ASC) USING BTREE;
+
+-- ----------------------------
+-- new table 'namespace'
+-- ----------------------------
+CREATE TABLE `namespace`  (
+                                          `id` bigint NOT NULL AUTO_INCREMENT,
+                                          `code` varchar(255)  NULL DEFAULT NULL,
+                                          `creator` bigint NULL DEFAULT NULL,
+                                          `dept` varchar(255)  NULL DEFAULT NULL,
+                                          `extra` varchar(255)  NULL DEFAULT NULL,
+                                          `gmt_create` datetime(6) NULL DEFAULT NULL,
+                                          `gmt_modified` datetime(6) NULL DEFAULT NULL,
+                                          `modifier` bigint NULL DEFAULT NULL,
+                                          `name` varchar(255)  NULL DEFAULT NULL,
+                                          `status` int NULL DEFAULT NULL,
+                                          `tags` varchar(255)  NULL DEFAULT NULL,
+                                          `token` varchar(255)  NULL DEFAULT NULL,
+                                          PRIMARY KEY (`id`) USING BTREE,
+                                          UNIQUE INDEX `uidx01_namespace`(`code` ASC) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+
+-- ----------------------------
+-- new table 'pwjb_user_info'
+-- ----------------------------
+CREATE TABLE `pwjb_user_info`  (
+                                               `id` bigint NOT NULL AUTO_INCREMENT,
+                                               `extra` varchar(255)  NULL DEFAULT NULL,
+                                               `gmt_create` datetime(6) NULL DEFAULT NULL,
+                                               `gmt_modified` datetime(6) NULL DEFAULT NULL,
+                                               `password` varchar(255)  NULL DEFAULT NULL,
+                                               `username` varchar(255)  NULL DEFAULT NULL,
+                                               PRIMARY KEY (`id`) USING BTREE,
+                                               UNIQUE INDEX `uidx01_username`(`username` ASC) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- new table 'sundry'
+-- ----------------------------
+CREATE TABLE `sundry`  (
+                                       `id` bigint NOT NULL AUTO_INCREMENT,
+                                       `content` varchar(255)  NULL DEFAULT NULL,
+                                       `extra` varchar(255)  NULL DEFAULT NULL,
+                                       `gmt_create` datetime(6) NULL DEFAULT NULL,
+                                       `gmt_modified` datetime(6) NULL DEFAULT NULL,
+                                       `pkey` varchar(255)  NULL DEFAULT NULL,
+                                       `skey` varchar(255)  NULL DEFAULT NULL,
+                                       PRIMARY KEY (`id`) USING BTREE,
+                                       UNIQUE INDEX `uidx01_sundry`(`pkey` ASC, `skey` ASC) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+
+-- ----------------------------
+-- new table 'user_role'
+-- ----------------------------
+CREATE TABLE `user_role`  (
+                                          `id` bigint NOT NULL AUTO_INCREMENT,
+                                          `extra` varchar(255)  NULL DEFAULT NULL,
+                                          `gmt_create` datetime(6) NULL DEFAULT NULL,
+                                          `gmt_modified` datetime(6) NULL DEFAULT NULL,
+                                          `role` int NULL DEFAULT NULL,
+                                          `scope` int NULL DEFAULT NULL,
+                                          `target` bigint NULL DEFAULT NULL,
+                                          `user_id` bigint NULL DEFAULT NULL,
+                                          PRIMARY KEY (`id`) USING BTREE,
+                                          INDEX `uidx01_user_id`(`user_id` ASC) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.powerjob</groupId>
     <artifactId>powerjob</artifactId>
-    <version>3.0.0</version>
+    <version>5.1.1</version>
     <packaging>pom</packaging>
     <name>powerjob</name>
     <url>http://www.powerjob.tech</url>
@@ -44,6 +44,7 @@
         <module>powerjob-worker-spring-boot-starter</module>
         <module>powerjob-worker-samples</module>
         <module>powerjob-official-processors</module>
+        <module>powerjob-remote</module>
     </modules>
 
     <properties>
@@ -150,6 +151,17 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.7</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
 

powerjob-client/pom.xml

@@ -5,18 +5,19 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>3.0.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-client</artifactId>
-    <version>4.0.0</version>
+    <version>5.1.1</version>
     <packaging>jar</packaging>
 
     <properties>
-        <junit.version>5.6.1</junit.version>
-        <fastjson.version>1.2.68</fastjson.version>
-        <powerjob.common.version>4.0.0</powerjob.common.version>
+        <junit.version>5.9.1</junit.version>
+        <logback.version>1.2.13</logback.version>
+        <fastjson.version>1.2.83</fastjson.version>
+        <powerjob.common.version>5.1.1</powerjob.common.version>
 
         <mvn.shade.plugin.version>3.2.4</mvn.shade.plugin.version>
     </properties>
@@ -44,6 +45,13 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- log for test stage -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

powerjob-client/src/main/java/tech/powerjob/client/ClientConfig.java

@@ -0,0 +1,71 @@
+package tech.powerjob.client;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import tech.powerjob.client.common.Protocol;
+import tech.powerjob.client.extension.ClientExtension;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客户端配置
+ *
+ * @author 程序帕鲁
+ * @since 2024/2/20
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class ClientConfig implements Serializable {
+
+    /**
+     * 执行器 AppName
+     */
+    private String appName;
+
+    /**
+     * 执行器密码
+     */
+    private String password;
+
+    /**
+     * 地址列表，支持格式：
+     *  - IP:Port, eg: 192.168.1.1:7700
+     *  - 域名, eg: powerjob.apple-inc.com
+     */
+    private List<String> addressList;
+
+    /**
+     * 客户端通讯协议
+     */
+    private Protocol protocol = Protocol.HTTP;
+
+    /**
+     * 连接超时时间
+     */
+    private Integer connectionTimeout;
+    /**
+     * 指定了等待服务器响应数据的最长时间。更具体地说，这是从服务器开始返回响应数据（包括HTTP头和数据）后，客户端读取数据的超时时间
+     */
+    private Integer readTimeout;
+    /**
+     * 指定了向服务器发送数据的最长时间。这是从客户端开始发送数据（如POST请求的正文）到数据完全发送出去的时间
+     */
+    private Integer writeTimeout;
+
+    /**
+     * 默认携带的请求头
+     * 用于流量被基础设施识别
+     */
+    private Map<String, String> defaultHeaders;
+
+    /**
+     * 客户端行为扩展
+     */
+    private ClientExtension clientExtension;
+}

powerjob-client/src/main/java/tech/powerjob/client/IPowerJobClient.java

@@ -0,0 +1,82 @@
+package tech.powerjob.client;
+
+import tech.powerjob.common.request.http.SaveJobInfoRequest;
+import tech.powerjob.common.request.http.SaveWorkflowNodeRequest;
+import tech.powerjob.common.request.http.SaveWorkflowRequest;
+import tech.powerjob.common.request.query.InstancePageQuery;
+import tech.powerjob.common.request.query.JobInfoQuery;
+import tech.powerjob.common.response.*;
+
+import java.util.List;
+
+/**
+ * PowerJobClient, the client for OpenAPI.
+ *
+ * @author tjq
+ * @since 2023/3/5
+ */
+public interface IPowerJobClient {
+
+    /* ************* Job 区 ************* */
+
+    ResultDTO<SaveJobInfoRequest> exportJob(Long jobId);
+
+    ResultDTO<Long> saveJob(SaveJobInfoRequest request);
+
+    ResultDTO<Long> copyJob(Long jobId);
+
+    ResultDTO<JobInfoDTO> fetchJob(Long jobId);
+
+    ResultDTO<List<JobInfoDTO>> fetchAllJob();
+
+    ResultDTO<List<JobInfoDTO>> queryJob(JobInfoQuery powerQuery);
+
+    ResultDTO<Void> disableJob(Long jobId);
+
+    ResultDTO<Void> enableJob(Long jobId);
+
+    ResultDTO<Void> deleteJob(Long jobId);
+
+    ResultDTO<Long> runJob(Long jobId, String instanceParams, long delayMS);
+
+    /* ************* Instance API list ************* */
+
+    ResultDTO<Void> stopInstance(Long instanceId);
+
+    ResultDTO<Void> cancelInstance(Long instanceId);
+
+    ResultDTO<Void> retryInstance(Long instanceId);
+
+    ResultDTO<Integer> fetchInstanceStatus(Long instanceId);
+
+    ResultDTO<InstanceInfoDTO> fetchInstanceInfo(Long instanceId);
+
+    ResultDTO<PageResult<InstanceInfoDTO>> queryInstanceInfo(InstancePageQuery instancePageQuery);
+
+    /* ************* Workflow API list ************* */
+    ResultDTO<Long> saveWorkflow(SaveWorkflowRequest request);
+
+    ResultDTO<Long> copyWorkflow(Long workflowId);
+
+    ResultDTO<List<WorkflowNodeInfoDTO>> saveWorkflowNode(List<SaveWorkflowNodeRequest> requestList);
+
+    ResultDTO<WorkflowInfoDTO> fetchWorkflow(Long workflowId);
+
+    ResultDTO<Void> disableWorkflow(Long workflowId);
+
+    ResultDTO<Void> enableWorkflow(Long workflowId);
+
+    ResultDTO<Void> deleteWorkflow(Long workflowId);
+
+    ResultDTO<Long> runWorkflow(Long workflowId, String initParams, long delayMS);
+
+    /* ************* Workflow Instance API list ************* */
+
+    ResultDTO<Void> stopWorkflowInstance(Long wfInstanceId);
+
+    ResultDTO<Void> retryWorkflowInstance(Long wfInstanceId);
+
+    ResultDTO<Void> markWorkflowNodeAsSuccess(Long wfInstanceId, Long nodeId);
+
+    ResultDTO<WorkflowInstanceInfoDTO> fetchWorkflowInstanceInfo(Long wfInstanceId);
+}

powerjob-client/src/main/java/tech/powerjob/client/PowerJobClient.java

@@ -1,28 +1,33 @@
 package tech.powerjob.client;
 
 import com.alibaba.fastjson.JSON;
-import tech.powerjob.common.enums.InstanceStatus;
-import tech.powerjob.common.OmsConstant;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import tech.powerjob.client.module.AppAuthRequest;
+import tech.powerjob.client.module.AppAuthResult;
+import tech.powerjob.client.service.PowerRequestBody;
+import tech.powerjob.client.service.RequestService;
+import tech.powerjob.client.service.impl.ClusterRequestServiceOkHttp3Impl;
 import tech.powerjob.common.OpenAPIConstant;
+import tech.powerjob.common.enums.EncryptType;
+import tech.powerjob.common.enums.InstanceStatus;
 import tech.powerjob.common.exception.PowerJobException;
 import tech.powerjob.common.request.http.SaveJobInfoRequest;
 import tech.powerjob.common.request.http.SaveWorkflowNodeRequest;
 import tech.powerjob.common.request.http.SaveWorkflowRequest;
+import tech.powerjob.common.request.query.InstancePageQuery;
 import tech.powerjob.common.request.query.JobInfoQuery;
 import tech.powerjob.common.response.*;
-import tech.powerjob.common.utils.CommonUtils;
-import tech.powerjob.common.utils.HttpUtils;
 import tech.powerjob.common.serialize.JsonUtils;
-import com.google.common.collect.Lists;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.FormBody;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-import org.apache.commons.lang3.StringUtils;
+import tech.powerjob.common.utils.CommonUtils;
+import tech.powerjob.common.utils.DigestUtils;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
-import java.util.Objects;
+import java.util.Map;
 
 import static tech.powerjob.client.TypeStore.*;
 
@@ -33,14 +38,44 @@ import static tech.powerjob.client.TypeStore.*;
  * @since 2020/4/15
  */
 @Slf4j
-public class PowerJobClient {
+public class PowerJobClient implements IPowerJobClient, Closeable {
 
     private Long appId;
-    private String currentAddress;
-    private final List<String> allAddress;
+    
+    private final RequestService requestService;
 
-    private static final String URL_PATTERN = "http://%s%s%s";
+    public PowerJobClient(ClientConfig config) {
+        
+        List<String> addressList = config.getAddressList();
+        String appName = config.getAppName();
 
+        CommonUtils.requireNonNull(addressList, "addressList can't be null!");
+        CommonUtils.requireNonNull(appName, "appName can't be null");
+
+        this.requestService = new ClusterRequestServiceOkHttp3Impl(config);
+
+        AppAuthRequest appAuthRequest = new AppAuthRequest();
+        appAuthRequest.setAppName(appName);
+        appAuthRequest.setEncryptedPassword(DigestUtils.md5(config.getPassword()));
+        appAuthRequest.setEncryptType(EncryptType.MD5.getCode());
+
+        String assertResponse = requestService.request(OpenAPIConstant.AUTH_APP, PowerRequestBody.newJsonRequestBody(appAuthRequest));
+
+        if (StringUtils.isNotEmpty(assertResponse)) {
+            ResultDTO<AppAuthResult> resultDTO = JSON.parseObject(assertResponse, APP_AUTH_RESULT_TYPE);
+            if (resultDTO.isSuccess()) {
+                appId = resultDTO.getData().getAppId();
+            } else {
+                throw new PowerJobException(resultDTO.getMessage());
+            }
+        }
+        
+        if (appId == null) {
+            throw new PowerJobException("appId is null, please check your config");
+        }
+        
+        log.info("[PowerJobClient] [INIT] {}'s PowerJobClient bootstrap successfully", appName);
+    }
     /**
      * Init PowerJobClient with domain, appName and password.
      *
@@ -49,7 +84,7 @@ public class PowerJobClient {
      * @param password password of the application
      */
     public PowerJobClient(String domain, String appName, String password) {
-        this(Lists.newArrayList(domain), appName, password);
+        this(new ClientConfig().setAppName(appName).setPassword(password).setAddressList(Lists.newArrayList(domain)));
     }
 
 
@@ -61,48 +96,7 @@ public class PowerJobClient {
      * @param password    password of the application
      */
     public PowerJobClient(List<String> addressList, String appName, String password) {
-
-        CommonUtils.requireNonNull(addressList, "addressList can't be null!");
-        CommonUtils.requireNonNull(appName, "appName can't be null");
-
-        allAddress = addressList;
-        for (String addr : addressList) {
-            String url = getUrl(OpenAPIConstant.ASSERT, addr);
-            try {
-                String result = assertApp(appName, password, url);
-                if (StringUtils.isNotEmpty(result)) {
-                    ResultDTO<Long> resultDTO = JSON.parseObject(result, LONG_RESULT_TYPE);
-                    if (resultDTO.isSuccess()) {
-                        appId = resultDTO.getData();
-                        currentAddress = addr;
-                        break;
-                    } else {
-                        throw new PowerJobException(resultDTO.getMessage());
-                    }
-                }
-            } catch (IOException ignore) {
-                //
-            }
-        }
-
-        if (StringUtils.isEmpty(currentAddress)) {
-            throw new PowerJobException("no server available for PowerJobClient");
-        }
-        log.info("[PowerJobClient] {}'s PowerJobClient bootstrap successfully, using server: {}", appName, currentAddress);
-    }
-
-    private static String assertApp(String appName, String password, String url) throws IOException {
-        FormBody.Builder builder = new FormBody.Builder()
-                .add("appName", appName);
-        if (password != null) {
-            builder.add("password", password);
-        }
-        return HttpUtils.post(url, builder.build());
-    }
-
-
-    private static String getUrl(String path, String address) {
-        return String.format(URL_PATTERN, address, OpenAPIConstant.WEB_PATH, path);
+        this(new ClientConfig().setAppName(appName).setPassword(password).setAddressList(addressList));
     }
 
     /* ************* Job 区 ************* */
@@ -114,12 +108,11 @@ public class PowerJobClient {
      * @param request Job meta info
      * @return jobId
      */
+    @Override
     public ResultDTO<Long> saveJob(SaveJobInfoRequest request) {
 
         request.setAppId(appId);
-        MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE);
-        String json = JSON.toJSONString(request);
-        String post = postHA(OpenAPIConstant.SAVE_JOB, RequestBody.create(jsonType, json));
+        String post = requestService.request(OpenAPIConstant.SAVE_JOB, PowerRequestBody.newJsonRequestBody(request));
         return JSON.parseObject(post, LONG_RESULT_TYPE);
     }
 
@@ -130,27 +123,37 @@ public class PowerJobClient {
      * @param jobId Job id
      * @return Id of job copy
      */
+    @Override
     public ResultDTO<Long> copyJob(Long jobId) {
-        RequestBody body = new FormBody.Builder()
-                .add("jobId", jobId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.COPY_JOB, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+
+        String post = requestService.request(OpenAPIConstant.COPY_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, LONG_RESULT_TYPE);
     }
 
+    @Override
+    public ResultDTO<SaveJobInfoRequest> exportJob(Long jobId) {
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.EXPORT_JOB, PowerRequestBody.newFormRequestBody(param));
+        return JSON.parseObject(post, SAVE_JOB_INFO_REQUEST_RESULT_TYPE);
+    }
+
     /**
      * Query JobInfo by jobId
      *
      * @param jobId jobId
      * @return Job meta info
      */
+    @Override
     public ResultDTO<JobInfoDTO> fetchJob(Long jobId) {
-        RequestBody body = new FormBody.Builder()
-                .add("jobId", jobId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.FETCH_JOB, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.FETCH_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, JOB_RESULT_TYPE);
     }
 
@@ -159,11 +162,11 @@ public class PowerJobClient {
      *
      * @return All JobInfo
      */
+    @Override
     public ResultDTO<List<JobInfoDTO>> fetchAllJob() {
-        RequestBody body = new FormBody.Builder()
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.FETCH_ALL_JOB, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.FETCH_ALL_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, LIST_JOB_RESULT_TYPE);
     }
 
@@ -173,11 +176,10 @@ public class PowerJobClient {
      * @param powerQuery JobQuery
      * @return JobInfo
      */
+    @Override
     public ResultDTO<List<JobInfoDTO>> queryJob(JobInfoQuery powerQuery) {
         powerQuery.setAppIdEq(appId);
-        MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE);
-        String json = JsonUtils.toJSONStringUnsafe(powerQuery);
-        String post = postHA(OpenAPIConstant.QUERY_JOB, RequestBody.create(jsonType, json));
+        String post = requestService.request(OpenAPIConstant.QUERY_JOB, PowerRequestBody.newJsonRequestBody(powerQuery));
         return JSON.parseObject(post, LIST_JOB_RESULT_TYPE);
     }
 
@@ -187,12 +189,12 @@ public class PowerJobClient {
      * @param jobId jobId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> disableJob(Long jobId) {
-        RequestBody body = new FormBody.Builder()
-                .add("jobId", jobId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.DISABLE_JOB, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.DISABLE_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -202,12 +204,12 @@ public class PowerJobClient {
      * @param jobId jobId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> enableJob(Long jobId) {
-        RequestBody body = new FormBody.Builder()
-                .add("jobId", jobId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.ENABLE_JOB, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.ENABLE_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -217,12 +219,12 @@ public class PowerJobClient {
      * @param jobId jobId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> deleteJob(Long jobId) {
-        RequestBody body = new FormBody.Builder()
-                .add("jobId", jobId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.DELETE_JOB, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.DELETE_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -234,16 +236,18 @@ public class PowerJobClient {
      * @param delayMS        Delay time（Milliseconds）
      * @return instanceId
      */
+    @Override
     public ResultDTO<Long> runJob(Long jobId, String instanceParams, long delayMS) {
-        FormBody.Builder builder = new FormBody.Builder()
-                .add("jobId", jobId.toString())
-                .add("appId", appId.toString())
-                .add("delay", String.valueOf(delayMS));
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("jobId", jobId.toString());
+        param.put("appId", appId.toString());
+        param.put("delay", String.valueOf(delayMS));
 
         if (StringUtils.isNotEmpty(instanceParams)) {
-            builder.add("instanceParams", instanceParams);
+            param.put("instanceParams", instanceParams);
         }
-        String post = postHA(OpenAPIConstant.RUN_JOB, builder.build());
+        String post = requestService.request(OpenAPIConstant.RUN_JOB, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, LONG_RESULT_TYPE);
     }
 
@@ -259,12 +263,14 @@ public class PowerJobClient {
      * @param instanceId instanceId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> stopInstance(Long instanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("instanceId", instanceId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.STOP_INSTANCE, body);
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("instanceId", instanceId.toString());
+        param.put("appId", appId.toString());
+
+        String post = requestService.request(OpenAPIConstant.STOP_INSTANCE, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -275,12 +281,12 @@ public class PowerJobClient {
      * @param instanceId instanceId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> cancelInstance(Long instanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("instanceId", instanceId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.CANCEL_INSTANCE, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("instanceId", instanceId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.CANCEL_INSTANCE, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -291,12 +297,12 @@ public class PowerJobClient {
      * @param instanceId instanceId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> retryInstance(Long instanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("instanceId", instanceId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.RETRY_INSTANCE, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("instanceId", instanceId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.RETRY_INSTANCE, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -306,11 +312,12 @@ public class PowerJobClient {
      * @param instanceId instanceId
      * @return {@link InstanceStatus}
      */
+    @Override
     public ResultDTO<Integer> fetchInstanceStatus(Long instanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("instanceId", instanceId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.FETCH_INSTANCE_STATUS, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("instanceId", instanceId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.FETCH_INSTANCE_STATUS, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, INTEGER_RESULT_TYPE);
     }
 
@@ -320,14 +327,22 @@ public class PowerJobClient {
      * @param instanceId instanceId
      * @return instance detail
      */
+    @Override
     public ResultDTO<InstanceInfoDTO> fetchInstanceInfo(Long instanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("instanceId", instanceId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.FETCH_INSTANCE_INFO, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("instanceId", instanceId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.FETCH_INSTANCE_INFO, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, INSTANCE_RESULT_TYPE);
     }
 
+    @Override
+    public ResultDTO<PageResult<InstanceInfoDTO>> queryInstanceInfo(InstancePageQuery instancePageQuery) {
+        instancePageQuery.setAppIdEq(appId);
+        String post = requestService.request(OpenAPIConstant.QUERY_INSTANCE, PowerRequestBody.newJsonRequestBody(instancePageQuery));
+        return JSON.parseObject(post, PAGE_INSTANCE_RESULT_TYPE);
+    }
+
     /* ************* Workflow API list ************* */
 
     /**
@@ -337,12 +352,12 @@ public class PowerJobClient {
      * @param request Workflow meta info
      * @return workflowId
      */
+    @Override
     public ResultDTO<Long> saveWorkflow(SaveWorkflowRequest request) {
         request.setAppId(appId);
-        MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE);
         // 中坑记录：用 FastJSON 序列化会导致 Server 接收时 pEWorkflowDAG 为 null，无语.jpg
         String json = JsonUtils.toJSONStringUnsafe(request);
-        String post = postHA(OpenAPIConstant.SAVE_WORKFLOW, RequestBody.create(jsonType, json));
+        String post = requestService.request(OpenAPIConstant.SAVE_WORKFLOW, PowerRequestBody.newJsonRequestBody(json));
         return JSON.parseObject(post, LONG_RESULT_TYPE);
     }
 
@@ -352,12 +367,14 @@ public class PowerJobClient {
      * @param workflowId Workflow id
      * @return Id of workflow copy
      */
+    @Override
     public ResultDTO<Long> copyWorkflow(Long workflowId) {
-        RequestBody body = new FormBody.Builder()
-                .add("workflowId", workflowId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.COPY_WORKFLOW, body);
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("workflowId", workflowId.toString());
+        param.put("appId", appId.toString());
+
+        String post = requestService.request(OpenAPIConstant.COPY_WORKFLOW, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, LONG_RESULT_TYPE);
     }
 
@@ -368,13 +385,14 @@ public class PowerJobClient {
      * @param requestList Node info list of Workflow
      * @return Standard return object
      */
+    @Override
     public ResultDTO<List<WorkflowNodeInfoDTO>> saveWorkflowNode(List<SaveWorkflowNodeRequest> requestList) {
         for (SaveWorkflowNodeRequest saveWorkflowNodeRequest : requestList) {
             saveWorkflowNodeRequest.setAppId(appId);
         }
-        MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE);
+
         String json = JsonUtils.toJSONStringUnsafe(requestList);
-        String post = postHA(OpenAPIConstant.SAVE_WORKFLOW_NODE, RequestBody.create(jsonType, json));
+        String post = requestService.request(OpenAPIConstant.SAVE_WORKFLOW_NODE, PowerRequestBody.newJsonRequestBody(json));
         return JSON.parseObject(post, WF_NODE_LIST_RESULT_TYPE);
     }
 
@@ -386,12 +404,12 @@ public class PowerJobClient {
      * @param workflowId workflowId
      * @return Workflow meta info
      */
+    @Override
     public ResultDTO<WorkflowInfoDTO> fetchWorkflow(Long workflowId) {
-        RequestBody body = new FormBody.Builder()
-                .add("workflowId", workflowId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.FETCH_WORKFLOW, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("workflowId", workflowId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.FETCH_WORKFLOW, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, WF_RESULT_TYPE);
     }
 
@@ -401,12 +419,12 @@ public class PowerJobClient {
      * @param workflowId workflowId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> disableWorkflow(Long workflowId) {
-        RequestBody body = new FormBody.Builder()
-                .add("workflowId", workflowId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.DISABLE_WORKFLOW, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("workflowId", workflowId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.DISABLE_WORKFLOW, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -416,12 +434,12 @@ public class PowerJobClient {
      * @param workflowId workflowId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> enableWorkflow(Long workflowId) {
-        RequestBody body = new FormBody.Builder()
-                .add("workflowId", workflowId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.ENABLE_WORKFLOW, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("workflowId", workflowId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.ENABLE_WORKFLOW, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -431,12 +449,12 @@ public class PowerJobClient {
      * @param workflowId workflowId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> deleteWorkflow(Long workflowId) {
-        RequestBody body = new FormBody.Builder()
-                .add("workflowId", workflowId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.DELETE_WORKFLOW, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("workflowId", workflowId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.DELETE_WORKFLOW, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -448,15 +466,19 @@ public class PowerJobClient {
      * @param delayMS    Delay time（Milliseconds）
      * @return workflow instanceId
      */
+    @Override
     public ResultDTO<Long> runWorkflow(Long workflowId, String initParams, long delayMS) {
-        FormBody.Builder builder = new FormBody.Builder()
-                .add("workflowId", workflowId.toString())
-                .add("appId", appId.toString())
-                .add("delay", String.valueOf(delayMS));
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("workflowId", workflowId.toString());
+        param.put("appId", appId.toString());
+        param.put("delay", String.valueOf(delayMS));
+
+
         if (StringUtils.isNotEmpty(initParams)) {
-            builder.add("initParams", initParams);
+            param.put("initParams", initParams);
         }
-        String post = postHA(OpenAPIConstant.RUN_WORKFLOW, builder.build());
+        String post = requestService.request(OpenAPIConstant.RUN_WORKFLOW, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, LONG_RESULT_TYPE);
     }
 
@@ -472,12 +494,14 @@ public class PowerJobClient {
      * @param wfInstanceId workflow instanceId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> stopWorkflowInstance(Long wfInstanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("wfInstanceId", wfInstanceId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.STOP_WORKFLOW_INSTANCE, body);
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("wfInstanceId", wfInstanceId.toString());
+        param.put("appId", appId.toString());
+
+        String post = requestService.request(OpenAPIConstant.STOP_WORKFLOW_INSTANCE, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -487,12 +511,12 @@ public class PowerJobClient {
      * @param wfInstanceId workflow instanceId
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> retryWorkflowInstance(Long wfInstanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("wfInstanceId", wfInstanceId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.RETRY_WORKFLOW_INSTANCE, body);
+        Map<String, String> param = Maps.newHashMap();
+        param.put("wfInstanceId", wfInstanceId.toString());
+        param.put("appId", appId.toString());
+        String post = requestService.request(OpenAPIConstant.RETRY_WORKFLOW_INSTANCE, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -503,13 +527,15 @@ public class PowerJobClient {
      * @param nodeId       node id
      * @return Standard return object
      */
+    @Override
     public ResultDTO<Void> markWorkflowNodeAsSuccess(Long wfInstanceId, Long nodeId) {
-        RequestBody body = new FormBody.Builder()
-                .add("wfInstanceId", wfInstanceId.toString())
-                .add("nodeId", nodeId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.MARK_WORKFLOW_NODE_AS_SUCCESS, body);
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("wfInstanceId", wfInstanceId.toString());
+        param.put("appId", appId.toString());
+        param.put("nodeId", nodeId.toString());
+
+        String post = requestService.request(OpenAPIConstant.MARK_WORKFLOW_NODE_AS_SUCCESS, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, VOID_RESULT_TYPE);
     }
 
@@ -519,48 +545,19 @@ public class PowerJobClient {
      * @param wfInstanceId workflow instanceId
      * @return detail about a workflow
      */
+    @Override
     public ResultDTO<WorkflowInstanceInfoDTO> fetchWorkflowInstanceInfo(Long wfInstanceId) {
-        RequestBody body = new FormBody.Builder()
-                .add("wfInstanceId", wfInstanceId.toString())
-                .add("appId", appId.toString())
-                .build();
-        String post = postHA(OpenAPIConstant.FETCH_WORKFLOW_INSTANCE_INFO, body);
+
+        Map<String, String> param = Maps.newHashMap();
+        param.put("wfInstanceId", wfInstanceId.toString());
+        param.put("appId", appId.toString());
+
+        String post = requestService.request(OpenAPIConstant.FETCH_WORKFLOW_INSTANCE_INFO, PowerRequestBody.newFormRequestBody(param));
         return JSON.parseObject(post, WF_INSTANCE_RESULT_TYPE);
     }
 
-
-    private String postHA(String path, RequestBody requestBody) {
-
-        // 先尝试默认地址
-        String url = getUrl(path, currentAddress);
-        try {
-            String res = HttpUtils.post(url, requestBody);
-            if (StringUtils.isNotEmpty(res)) {
-                return res;
-            }
-        } catch (IOException e) {
-            log.warn("[PowerJobClient] request url:{} failed, reason is {}.", url, e.toString());
-        }
-
-        // 失败，开始重试
-        for (String addr : allAddress) {
-            if (Objects.equals(addr, currentAddress)) {
-                continue;
-            }
-            url = getUrl(path, addr);
-            try {
-                String res = HttpUtils.post(url, requestBody);
-                if (StringUtils.isNotEmpty(res)) {
-                    log.warn("[PowerJobClient] server change: from({}) -> to({}).", currentAddress, addr);
-                    currentAddress = addr;
-                    return res;
-                }
-            } catch (IOException e) {
-                log.warn("[PowerJobClient] request url:{} failed, reason is {}.", url, e.toString());
-            }
-        }
-
-        log.error("[PowerJobClient] do post for path: {} failed because of no server available in {}.", path, allAddress);
-        throw new PowerJobException("no server available when send post request");
+    @Override
+    public void close() throws IOException {
+        requestService.close();
     }
 }

powerjob-client/src/main/java/tech/powerjob/client/TypeStore.java

@@ -1,6 +1,8 @@
 package tech.powerjob.client;
 
 import com.alibaba.fastjson.TypeReference;
+import tech.powerjob.client.module.AppAuthResult;
+import tech.powerjob.common.request.http.SaveJobInfoRequest;
 import tech.powerjob.common.response.*;
 
 import java.util.List;
@@ -13,6 +15,7 @@ import java.util.List;
  */
 public class TypeStore {
 
+    public static final TypeReference<ResultDTO<AppAuthResult>> APP_AUTH_RESULT_TYPE = new TypeReference<ResultDTO<AppAuthResult>>(){};
     public static final TypeReference<ResultDTO<Void>> VOID_RESULT_TYPE = new TypeReference<ResultDTO<Void>>(){};
 
     public static final TypeReference<ResultDTO<Integer>> INTEGER_RESULT_TYPE = new TypeReference<ResultDTO<Integer>>(){};
@@ -21,12 +24,16 @@ public class TypeStore {
 
     public static final TypeReference<ResultDTO<JobInfoDTO>> JOB_RESULT_TYPE = new TypeReference<ResultDTO<JobInfoDTO>>(){};
 
+    public static final TypeReference<ResultDTO<SaveJobInfoRequest>> SAVE_JOB_INFO_REQUEST_RESULT_TYPE = new TypeReference<ResultDTO<SaveJobInfoRequest>>(){};
+
     public static final TypeReference<ResultDTO<List<JobInfoDTO>>> LIST_JOB_RESULT_TYPE = new TypeReference<ResultDTO<List<JobInfoDTO>>>(){};
 
     public static final TypeReference<ResultDTO<InstanceInfoDTO>> INSTANCE_RESULT_TYPE = new TypeReference<ResultDTO<InstanceInfoDTO>>() {};
 
     public static final TypeReference<ResultDTO<List<InstanceInfoDTO>>> LIST_INSTANCE_RESULT_TYPE = new TypeReference<ResultDTO<List<InstanceInfoDTO>>>(){};
 
+    public static final TypeReference<ResultDTO<PageResult<InstanceInfoDTO>>> PAGE_INSTANCE_RESULT_TYPE = new TypeReference<ResultDTO<PageResult<InstanceInfoDTO>>>(){};
+
     public static final TypeReference<ResultDTO<WorkflowInfoDTO>> WF_RESULT_TYPE = new TypeReference<ResultDTO<WorkflowInfoDTO>>() {};
 
     public static final TypeReference<ResultDTO<WorkflowInstanceInfoDTO>> WF_INSTANCE_RESULT_TYPE = new TypeReference<ResultDTO<WorkflowInstanceInfoDTO>>() {};

powerjob-client/src/main/java/tech/powerjob/client/common/Protocol.java

@@ -0,0 +1,28 @@
+package tech.powerjob.client.common;
+
+import lombok.Getter;
+
+/**
+ * Protocol
+ *
+ * @author tjq
+ * @since 2024/2/20
+ */
+@Getter
+public enum Protocol {
+
+    HTTP("http"),
+
+    HTTPS("https");
+
+    private final String protocol;
+
+    Protocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    @Override
+    public String toString() {
+        return protocol;
+    }
+}

powerjob-client/src/main/java/tech/powerjob/client/extension/ClientExtension.java

@@ -0,0 +1,19 @@
+package tech.powerjob.client.extension;
+
+import java.util.List;
+
+/**
+ * 扩展服务
+ *
+ * @author tjq
+ * @since 2024/8/11
+ */
+public interface ClientExtension {
+
+    /**
+     * 动态提供地址，适用于 server 部署在动态集群上的场景
+     * @param context 上下文
+     * @return 地址，格式要求同 ClientConfig#addressList
+     */
+    List<String> addressProvider(ExtensionContext context);
+}

powerjob-client/src/main/java/tech/powerjob/client/extension/ExtensionContext.java

@@ -0,0 +1,10 @@
+package tech.powerjob.client.extension;
+
+/**
+ * 扩展上下文
+ *
+ * @author tjq
+ * @since 2024/8/11
+ */
+public class ExtensionContext {
+}

powerjob-client/src/main/java/tech/powerjob/client/module/AppAuthRequest.java

@@ -0,0 +1,39 @@
+package tech.powerjob.client.module;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * App 鉴权请求
+ *
+ * @author tjq
+ * @since 2024/2/19
+ */
+@Getter
+@Setter
+@ToString
+public class AppAuthRequest implements Serializable {
+
+    /**
+     * 应用名称
+     */
+    private String appName;
+    /**
+     * 加密后密码
+     */
+    private String encryptedPassword;
+
+    /**
+     * 加密类型
+     */
+    private String encryptType;
+
+    /**
+     * 额外参数，方便开发者传递其他参数
+     */
+    private Map<String, Object> extra;
+}

powerjob-client/src/main/java/tech/powerjob/client/module/AppAuthResult.java

@@ -0,0 +1,30 @@
+package tech.powerjob.client.module;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * App 鉴权响应
+ *
+ * @author tjq
+ * @since 2024/2/21
+ */
+@Getter
+@Setter
+@ToString
+public class AppAuthResult implements Serializable {
+
+    private Long appId;
+
+    private String token;
+
+    /**
+     * 额外参数
+     * 有安全需求的开发者可执行扩展
+     */
+    private Map<String, Object> extra;
+}

powerjob-client/src/main/java/tech/powerjob/client/service/HttpResponse.java

@@ -0,0 +1,26 @@
+package tech.powerjob.client.service;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * HTTP 响应
+ *
+ * @author tjq
+ * @since 2024/8/10
+ */
+@Data
+@Accessors(chain = true)
+public class HttpResponse implements Serializable {
+
+    private boolean success;
+
+    private int code;
+
+    private String response;
+
+    private Map<String, String> headers;
+}

powerjob-client/src/main/java/tech/powerjob/client/service/PowerRequestBody.java

@@ -0,0 +1,47 @@
+package tech.powerjob.client.service;
+
+import com.google.common.collect.Maps;
+import lombok.Getter;
+import tech.powerjob.common.enums.MIME;
+
+import java.util.Map;
+
+/**
+ * 请求体
+ *
+ * @author tjq
+ * @since 2024/8/10
+ */
+@Getter
+public class PowerRequestBody {
+
+    private MIME mime;
+
+    private Object payload;
+
+    private final Map<String, String> headers = Maps.newHashMap();
+
+    private PowerRequestBody() {
+    }
+
+    public static PowerRequestBody newJsonRequestBody(Object data) {
+        PowerRequestBody powerRequestBody = new PowerRequestBody();
+        powerRequestBody.mime = MIME.APPLICATION_JSON;
+        powerRequestBody.payload = data;
+        return powerRequestBody;
+    }
+
+    public static PowerRequestBody newFormRequestBody(Map<String, String> form) {
+        PowerRequestBody powerRequestBody = new PowerRequestBody();
+        powerRequestBody.mime = MIME.APPLICATION_FORM;
+        powerRequestBody.payload = form;
+        return powerRequestBody;
+    }
+
+    public void addHeaders(Map<String, String> hs) {
+        if (hs == null || hs.isEmpty()) {
+            return;
+        }
+        this.headers.putAll(hs);
+    }
+}

powerjob-client/src/main/java/tech/powerjob/client/service/RequestService.java

@@ -0,0 +1,15 @@
+package tech.powerjob.client.service;
+
+import java.io.Closeable;
+
+/**
+ * 请求服务
+ *
+ * @author tjq
+ * @since 2024/2/20
+ */
+public interface RequestService extends Closeable {
+
+
+    String request(String path, PowerRequestBody powerRequestBody);
+}

powerjob-client/src/main/java/tech/powerjob/client/service/impl/AppAuthClusterRequestService.java

@@ -0,0 +1,107 @@
+package tech.powerjob.client.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import tech.powerjob.client.ClientConfig;
+import tech.powerjob.client.TypeStore;
+import tech.powerjob.client.module.AppAuthRequest;
+import tech.powerjob.client.module.AppAuthResult;
+import tech.powerjob.client.service.HttpResponse;
+import tech.powerjob.client.service.PowerRequestBody;
+import tech.powerjob.common.OpenAPIConstant;
+import tech.powerjob.common.enums.EncryptType;
+import tech.powerjob.common.exception.PowerJobException;
+import tech.powerjob.common.response.ResultDTO;
+import tech.powerjob.common.utils.DigestUtils;
+import tech.powerjob.common.utils.MapUtils;
+
+import java.util.Map;
+
+/**
+ * 封装鉴权相关逻辑
+ *
+ * @author tjq
+ * @since 2024/2/21
+ */
+@Slf4j
+abstract class AppAuthClusterRequestService extends ClusterRequestService {
+
+    protected AppAuthResult appAuthResult;
+
+    public AppAuthClusterRequestService(ClientConfig config) {
+        super(config);
+    }
+
+
+    @Override
+    public String request(String path, PowerRequestBody powerRequestBody) {
+        // 若不存在 appAuthResult，则首先进行鉴权
+        if (appAuthResult == null) {
+            refreshAppAuthResult();
+        }
+
+        HttpResponse httpResponse = doRequest(path, powerRequestBody);
+
+        // 如果 auth 成功，则代表请求有效，直接返回
+        String authStatus = MapUtils.getString(httpResponse.getHeaders(), OpenAPIConstant.RESPONSE_HEADER_AUTH_STATUS);
+        if (Boolean.TRUE.toString().equalsIgnoreCase(authStatus)) {
+            return httpResponse.getResponse();
+        }
+
+        // 否则请求无效，刷新鉴权后重新请求
+        log.warn("[PowerJobClient] auth failed[authStatus: {}], try to refresh the auth info", authStatus);
+        refreshAppAuthResult();
+        httpResponse = doRequest(path, powerRequestBody);
+
+        // 只要请求不失败，直接返回（如果鉴权失败则返回鉴权错误信息，server 保证 response 永远非空）
+        return httpResponse.getResponse();
+    }
+
+    private HttpResponse doRequest(String path, PowerRequestBody powerRequestBody) {
+
+        // 添加鉴权信息
+        Map<String, String> authHeaders = buildAuthHeader();
+        powerRequestBody.addHeaders(authHeaders);
+
+        HttpResponse httpResponse = clusterHaRequest(path, powerRequestBody);
+
+        // 任何请求不成功，都直接报错
+        if (!httpResponse.isSuccess()) {
+            throw new PowerJobException("REMOTE_SERVER_INNER_EXCEPTION");
+        }
+        return httpResponse;
+    }
+
+    private Map<String, String> buildAuthHeader() {
+        Map<String, String> authHeader = Maps.newHashMap();
+        authHeader.put(OpenAPIConstant.REQUEST_HEADER_APP_ID, String.valueOf(appAuthResult.getAppId()));
+        authHeader.put(OpenAPIConstant.REQUEST_HEADER_ACCESS_TOKEN, appAuthResult.getToken());
+        return authHeader;
+    }
+
+    @SneakyThrows
+    private void refreshAppAuthResult() {
+        AppAuthRequest appAuthRequest = buildAppAuthRequest();
+        HttpResponse httpResponse = clusterHaRequest(OpenAPIConstant.AUTH_APP, PowerRequestBody.newJsonRequestBody(appAuthRequest));
+        if (!httpResponse.isSuccess()) {
+            throw new PowerJobException("AUTH_APP_EXCEPTION!");
+        }
+        ResultDTO<AppAuthResult> authResultDTO = JSONObject.parseObject(httpResponse.getResponse(), TypeStore.APP_AUTH_RESULT_TYPE);
+        if (!authResultDTO.isSuccess()) {
+            throw new PowerJobException("AUTH_FAILED_" + authResultDTO.getMessage());
+        }
+
+        log.warn("[PowerJobClient] refresh auth info successfully!");
+        this.appAuthResult = authResultDTO.getData();
+    }
+
+    protected AppAuthRequest buildAppAuthRequest() {
+        AppAuthRequest appAuthRequest = new AppAuthRequest();
+        appAuthRequest.setAppName(config.getAppName());
+        appAuthRequest.setEncryptedPassword(DigestUtils.md5(config.getPassword()));
+        appAuthRequest.setEncryptType(EncryptType.MD5.getCode());
+        return appAuthRequest;
+    }
+}

powerjob-client/src/main/java/tech/powerjob/client/service/impl/ClusterRequestService.java

@@ -0,0 +1,140 @@
+package tech.powerjob.client.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import tech.powerjob.client.ClientConfig;
+import tech.powerjob.client.extension.ClientExtension;
+import tech.powerjob.client.extension.ExtensionContext;
+import tech.powerjob.client.service.HttpResponse;
+import tech.powerjob.client.service.PowerRequestBody;
+import tech.powerjob.client.service.RequestService;
+import tech.powerjob.common.OpenAPIConstant;
+import tech.powerjob.common.exception.PowerJobException;
+import tech.powerjob.common.utils.CollectionUtils;
+
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 集群请求服务
+ * 封装网络相关通用逻辑
+ *
+ * @author tjq
+ * @since 2024/2/21
+ */
+@Slf4j
+abstract class ClusterRequestService implements RequestService {
+
+    protected final ClientConfig config;
+
+    /**
+     * 当前地址（上次请求成功的地址）
+     */
+    protected String currentAddress;
+
+    /**
+     * 地址格式
+     * 协议://域名/OpenAPI/子路径
+     */
+    protected static final String URL_PATTERN = "%s://%s%s%s";
+
+    /**
+     * 默认超时时间
+     */
+    protected static final Integer DEFAULT_TIMEOUT_SECONDS = 2;
+
+    protected static final int HTTP_SUCCESS_CODE = 200;
+
+    public ClusterRequestService(ClientConfig config) {
+        this.config = config;
+        this.currentAddress = config.getAddressList().get(0);
+    }
+
+    /**
+     * 具体某一次 HTTP 请求的实现
+     * @param url 完整请求地址
+     * @param body 请求体
+     * @return 响应
+     * @throws IOException 异常
+     */
+    protected abstract HttpResponse sendHttpRequest(String url, PowerRequestBody body) throws IOException;
+
+    /**
+     * 封装集群请求能力
+     * @param path 请求 PATH
+     * @param powerRequestBody 请求体
+     * @return 响应
+     */
+    protected HttpResponse clusterHaRequest(String path, PowerRequestBody powerRequestBody) {
+
+        // 先尝试默认地址
+        String url = getUrl(path, currentAddress);
+        try {
+            return sendHttpRequest(url, powerRequestBody);
+        } catch (IOException e) {
+            log.warn("[ClusterRequestService] request url:{} failed, reason is {}.", url, e.toString());
+        }
+
+        List<String> addressList = fetchAddressList();
+
+        // 失败，开始重试
+        for (String addr : addressList) {
+            if (Objects.equals(addr, currentAddress)) {
+                continue;
+            }
+            url = getUrl(path, addr);
+            try {
+                HttpResponse res = sendHttpRequest(url, powerRequestBody);
+                log.warn("[ClusterRequestService] server change: from({}) -> to({}).", currentAddress, addr);
+                currentAddress = addr;
+                return res;
+            } catch (IOException e) {
+                log.warn("[ClusterRequestService] request url:{} failed, reason is {}.", url, e.toString());
+            }
+        }
+
+        log.error("[ClusterRequestService] do post for path: {} failed because of no server available in {}.", path, addressList);
+        throw new PowerJobException("no server available when send post request");
+    }
+
+    private List<String> fetchAddressList() {
+
+        ClientExtension clientExtension = config.getClientExtension();
+        if (clientExtension != null) {
+            List<String> addressList = clientExtension.addressProvider(new ExtensionContext());
+            if (!CollectionUtils.isEmpty(addressList)) {
+                return addressList;
+            }
+        }
+
+        return config.getAddressList();
+    }
+
+    /**
+     * 不验证证书
+     * X.509 是一个国际标准，定义了公钥证书的格式。这个标准是由国际电信联盟（ITU-T）制定的，用于公钥基础设施（PKI）中数字证书的创建和分发。X.509证书主要用于在公开网络上验证实体的身份，如服务器或客户端的身份验证过程中，确保通信双方是可信的。X.509证书广泛应用于多种安全协议中，包括SSL/TLS，它是实现HTTPS的基础。
+     */
+    protected static class NoVerifyX509TrustManager implements X509TrustManager {
+        @Override
+        public void checkClientTrusted(X509Certificate[] arg0, String arg1) {
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] arg0, String arg1) {
+            // 不验证
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[0];
+        }
+    }
+
+
+    private String getUrl(String path, String address) {
+        String protocol = config.getProtocol().getProtocol();
+        return String.format(URL_PATTERN, protocol, address, OpenAPIConstant.WEB_PATH, path);
+    }
+}

powerjob-client/src/main/java/tech/powerjob/client/service/impl/ClusterRequestServiceOkHttp3Impl.java

@@ -0,0 +1,148 @@
+package tech.powerjob.client.service.impl;
+
+import com.google.common.collect.Maps;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import tech.powerjob.client.ClientConfig;
+import tech.powerjob.client.common.Protocol;
+import tech.powerjob.client.service.HttpResponse;
+import tech.powerjob.client.service.PowerRequestBody;
+import tech.powerjob.common.OmsConstant;
+import tech.powerjob.common.serialize.JsonUtils;
+
+import javax.net.ssl.*;
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * desc
+ *
+ * @author tjq
+ * @since 2024/2/20
+ */
+@Slf4j
+public class ClusterRequestServiceOkHttp3Impl extends AppAuthClusterRequestService {
+
+    private final OkHttpClient okHttpClient;
+
+
+    public ClusterRequestServiceOkHttp3Impl(ClientConfig config) {
+        super(config);
+
+        // 初始化 HTTP 客户端
+        if (Protocol.HTTPS.equals(config.getProtocol())) {
+            okHttpClient = initHttpsNoVerifyClient();
+        } else {
+            okHttpClient = initHttpClient();
+        }
+    }
+
+    @Override
+    protected HttpResponse sendHttpRequest(String url, PowerRequestBody powerRequestBody) throws IOException {
+
+        // 添加公共 header
+        powerRequestBody.addHeaders(config.getDefaultHeaders());
+
+        Object obj = powerRequestBody.getPayload();
+
+        RequestBody requestBody = null;
+
+        switch (powerRequestBody.getMime()) {
+            case APPLICATION_JSON:
+                MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE);
+                String body = obj instanceof String ? (String) obj : JsonUtils.toJSONStringUnsafe(obj);
+                requestBody = RequestBody.create(jsonType, body);
+
+                break;
+            case APPLICATION_FORM:
+                FormBody.Builder formBuilder = new FormBody.Builder();
+                Map<String, String> formObj = (Map<String, String>) obj;
+                formObj.forEach(formBuilder::add);
+                requestBody = formBuilder.build();
+        }
+
+        Request request = new Request.Builder()
+                .post(requestBody)
+                .headers(Headers.of(powerRequestBody.getHeaders()))
+                .url(url)
+                .build();
+
+        try (Response response = okHttpClient.newCall(request).execute()) {
+
+            int code = response.code();
+            HttpResponse httpResponse = new HttpResponse()
+                    .setCode(code)
+                    .setSuccess(code == HTTP_SUCCESS_CODE);
+
+            ResponseBody body = response.body();
+            if (body != null) {
+                httpResponse.setResponse(body.string());
+            }
+
+            Headers respHeaders = response.headers();
+            Set<String> headerNames = respHeaders.names();
+            Map<String, String> respHeaderMap = Maps.newHashMap();
+            headerNames.forEach(hdKey -> respHeaderMap.put(hdKey, respHeaders.get(hdKey)));
+
+            httpResponse.setHeaders(respHeaderMap);
+
+            return httpResponse;
+        }
+    }
+
+    @SneakyThrows
+    private OkHttpClient initHttpClient() {
+        OkHttpClient.Builder okHttpBuilder = commonOkHttpBuilder();
+        return okHttpBuilder.build();
+    }
+
+    @SneakyThrows
+    private OkHttpClient initHttpsNoVerifyClient() {
+
+        X509TrustManager trustManager = new NoVerifyX509TrustManager();
+
+        SSLContext sslContext = SSLContext.getInstance("TLS");
+        sslContext.init(null, new TrustManager[]{trustManager}, new SecureRandom());
+        SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+
+        OkHttpClient.Builder okHttpBuilder = commonOkHttpBuilder();
+
+        // 不需要校验证书
+        okHttpBuilder.sslSocketFactory(sslSocketFactory, trustManager);
+        // 不校验 url中的 hostname
+        okHttpBuilder.hostnameVerifier((String hostname, SSLSession session) -> true);
+
+
+        return okHttpBuilder.build();
+    }
+
+    private OkHttpClient.Builder commonOkHttpBuilder() {
+        return new OkHttpClient.Builder()
+                // 设置读取超时时间
+                .readTimeout(Optional.ofNullable(config.getReadTimeout()).orElse(DEFAULT_TIMEOUT_SECONDS), TimeUnit.SECONDS)
+                // 设置写的超时时间
+                .writeTimeout(Optional.ofNullable(config.getWriteTimeout()).orElse(DEFAULT_TIMEOUT_SECONDS), TimeUnit.SECONDS)
+                // 设置连接超时时间
+                .connectTimeout(Optional.ofNullable(config.getConnectionTimeout()).orElse(DEFAULT_TIMEOUT_SECONDS), TimeUnit.SECONDS)
+                .callTimeout(Optional.ofNullable(config.getConnectionTimeout()).orElse(DEFAULT_TIMEOUT_SECONDS), TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void close() throws IOException {
+
+        // 关闭 Dispatcher
+        okHttpClient.dispatcher().executorService().shutdown();
+        // 清理连接池
+        okHttpClient.connectionPool().evictAll();
+        // 清理缓存（如果有使用）
+        Cache cache = okHttpClient.cache();
+        if (cache != null) {
+            cache.close();
+        }
+    }
+}

powerjob-client/src/test/java/tech/powerjob/client/test/ClientInitializer.java

@@ -1,7 +1,9 @@
 package tech.powerjob.client.test;
 
-import tech.powerjob.client.PowerJobClient;
+import com.google.common.collect.Lists;
 import org.junit.jupiter.api.BeforeAll;
+import tech.powerjob.client.IPowerJobClient;
+import tech.powerjob.client.PowerJobClient;
 
 /**
  * Initialize OhMyClient
@@ -11,10 +13,10 @@ import org.junit.jupiter.api.BeforeAll;
  */
 public class ClientInitializer {
 
-    protected static PowerJobClient powerJobClient;
+    protected static IPowerJobClient powerJobClient;
 
     @BeforeAll
     public static void initClient() throws Exception {
-        powerJobClient = new PowerJobClient("127.0.0.1:7700", "powerjob-agent-test", "123");
+        powerJobClient = new PowerJobClient(Lists.newArrayList("127.0.0.1:7700", "127.0.0.1:7701"), "powerjob-worker-samples", "powerjob123");
     }
 }

powerjob-client/src/test/java/tech/powerjob/client/test/TestClient.java

@@ -1,19 +1,19 @@
 package tech.powerjob.client.test;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import tech.powerjob.client.PowerJobClient;
 import tech.powerjob.common.enums.ExecuteType;
 import tech.powerjob.common.enums.ProcessorType;
 import tech.powerjob.common.enums.TimeExpressionType;
 import tech.powerjob.common.request.http.SaveJobInfoRequest;
+import tech.powerjob.common.request.query.InstancePageQuery;
 import tech.powerjob.common.response.InstanceInfoDTO;
 import tech.powerjob.common.response.JobInfoDTO;
 import tech.powerjob.common.response.ResultDTO;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.TimeUnit;
 
 /**
  * Test cases for {@link PowerJobClient}
@@ -22,17 +22,18 @@ import java.util.concurrent.TimeUnit;
  * @author Echo009
  * @since 2020/4/15
  */
+@Slf4j
 class TestClient extends ClientInitializer {
 
-    public static final long JOB_ID = 4L;
+    public static final long JOB_ID = 1L;
 
     @Test
     void testSaveJob() {
 
         SaveJobInfoRequest newJobInfo = new SaveJobInfoRequest();
         newJobInfo.setId(JOB_ID);
-        newJobInfo.setJobName("omsOpenAPIJobccccc");
-        newJobInfo.setJobDescription("test OpenAPI");
+        newJobInfo.setJobName("omsOpenAPIJobccccc" + System.currentTimeMillis());
+        newJobInfo.setJobDescription("test OpenAPI" + System.currentTimeMillis());
         newJobInfo.setJobParams("{'aa':'bb'}");
         newJobInfo.setTimeExpressionType(TimeExpressionType.CRON);
         newJobInfo.setTimeExpression("0 0 * * * ? ");
@@ -45,8 +46,10 @@ class TestClient extends ClientInitializer {
         newJobInfo.setMinMemorySpace(1.2);
         newJobInfo.setMinDiskSpace(1.3);
 
+        log.info("[TestClient] [testSaveJob] SaveJobInfoRequest: {}", JSONObject.toJSONString(newJobInfo));
+
         ResultDTO<Long> resultDTO = powerJobClient.saveJob(newJobInfo);
-        System.out.println(JSONObject.toJSONString(resultDTO));
+        log.info("[TestClient] [testSaveJob] result: {}", JSONObject.toJSONString(resultDTO));
         Assertions.assertNotNull(resultDTO);
     }
 
@@ -57,6 +60,12 @@ class TestClient extends ClientInitializer {
         Assertions.assertNotNull(copyJobRes);
     }
 
+    @Test
+    void testExportJob() {
+        ResultDTO<SaveJobInfoRequest> exportJobRes = powerJobClient.exportJob(JOB_ID);
+        System.out.println(JSONObject.toJSONString(exportJobRes));
+    }
+
     @Test
     void testFetchJob() {
         ResultDTO<JobInfoDTO> fetchJob = powerJobClient.fetchJob(JOB_ID);
@@ -87,7 +96,7 @@ class TestClient extends ClientInitializer {
 
     @Test
     void testRun() {
-        ResultDTO<Long> res = powerJobClient.runJob(JOB_ID);
+        ResultDTO<Long> res = powerJobClient.runJob(JOB_ID, null, 0);
         System.out.println(res);
         Assertions.assertNotNull(res);
     }
@@ -101,21 +110,32 @@ class TestClient extends ClientInitializer {
 
     @Test
     void testFetchInstanceInfo() {
-        ResultDTO<InstanceInfoDTO> res = powerJobClient.fetchInstanceInfo(205436386851946560L);
+        ResultDTO<InstanceInfoDTO> res = powerJobClient.fetchInstanceInfo(702482902331424832L);
         System.out.println(res);
         Assertions.assertNotNull(res);
     }
 
+    @Test
+    void testQueryInstanceInfo() {
+        InstancePageQuery instancePageQuery = new InstancePageQuery();
+        instancePageQuery.setJobIdEq(11L);
+        instancePageQuery.setSortBy("actualTriggerTime");
+        instancePageQuery.setAsc(true);
+        instancePageQuery.setPageSize(3);
+        instancePageQuery.setStatusIn(Lists.newArrayList(1,2,5));
+        TestUtils.output(powerJobClient.queryInstanceInfo(instancePageQuery));
+    }
+
     @Test
     void testStopInstance() {
-        ResultDTO<Void> res = powerJobClient.stopInstance(205436995885858880L);
+        ResultDTO<Void> res = powerJobClient.stopInstance(702482902331424832L);
         System.out.println(res);
         Assertions.assertNotNull(res);
     }
 
     @Test
     void testFetchInstanceStatus() {
-        ResultDTO<Integer> res = powerJobClient.fetchInstanceStatus(205436995885858880L);
+        ResultDTO<Integer> res = powerJobClient.fetchInstanceStatus(702482902331424832L);
         System.out.println(res);
         Assertions.assertNotNull(res);
     }
@@ -129,19 +149,19 @@ class TestClient extends ClientInitializer {
         Assertions.assertTrue(cancelRes.isSuccess());
     }
 
-    @Test
-    @SneakyThrows
-    void testCancelInstanceInDatabase() {
-        ResultDTO<Long> startRes = powerJobClient.runJob(15L, "start by OhMyClient", 2000000);
-        System.out.println("runJob result: " + JSONObject.toJSONString(startRes));
-
-        // Restart server manually and clear all the data in time wheeler.
-        TimeUnit.MINUTES.sleep(1);
-
-        ResultDTO<Void> cancelRes = powerJobClient.cancelInstance(startRes.getData());
-        System.out.println("cancelJob result: " + JSONObject.toJSONString(cancelRes));
-        Assertions.assertTrue(cancelRes.isSuccess());
-    }
+//    @Test
+//    @SneakyThrows
+//    void testCancelInstanceInDatabase() {
+//        ResultDTO<Long> startRes = powerJobClient.runJob(15L, "start by OhMyClient", 2000000);
+//        System.out.println("runJob result: " + JSONObject.toJSONString(startRes));
+//
+//        // Restart server manually and clear all the data in time wheeler.
+//        TimeUnit.MINUTES.sleep(1);
+//
+//        ResultDTO<Void> cancelRes = powerJobClient.cancelInstance(startRes.getData());
+//        System.out.println("cancelJob result: " + JSONObject.toJSONString(cancelRes));
+//        Assertions.assertTrue(cancelRes.isSuccess());
+//    }
 
     @Test
     void testRetryInstance() {

powerjob-client/src/test/java/tech/powerjob/client/test/TestClusterHA.java

@@ -0,0 +1,35 @@
+package tech.powerjob.client.test;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import tech.powerjob.common.response.JobInfoDTO;
+import tech.powerjob.common.response.ResultDTO;
+import tech.powerjob.common.utils.CommonUtils;
+
+/**
+ * 测试容灾能力
+ *
+ * @author tjq
+ * @since 2024/8/11
+ */
+@Slf4j
+public class TestClusterHA extends ClientInitializer {
+
+    @Test
+    void testHa() {
+        // 人工让 server 启停
+        for (int i = 0; i < 1000000; i++) {
+
+            CommonUtils.easySleep(100);
+
+            ResultDTO<JobInfoDTO> jobInfoDTOResultDTO = powerJobClient.fetchJob(1L);
+
+            log.info("[TestClusterHA] response: {}", JSONObject.toJSONString(jobInfoDTOResultDTO));
+
+            if (!jobInfoDTOResultDTO.isSuccess()) {
+                throw new RuntimeException("request failed!");
+            }
+        }
+    }
+}

powerjob-client/src/test/java/tech/powerjob/client/test/TestUtils.java

@@ -0,0 +1,17 @@
+package tech.powerjob.client.test;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * TestUtils
+ *
+ * @author tjq
+ * @since 2024/11/21
+ */
+public class TestUtils {
+
+    public static void output(Object v) {
+        String str = JSONObject.toJSONString(v);
+        System.out.println(str);
+    }
+}

powerjob-client/src/test/java/tech/powerjob/client/test/TestWorkflow.java

@@ -29,7 +29,7 @@ import java.util.List;
  */
 class TestWorkflow extends ClientInitializer {
 
-    private static final long WF_ID = 1;
+    private static final long WF_ID = 2;
 
     @Test
     void initTestData() {
@@ -71,18 +71,18 @@ class TestWorkflow extends ClientInitializer {
         SaveWorkflowNodeRequest saveWorkflowNodeRequest1 = new SaveWorkflowNodeRequest();
         saveWorkflowNodeRequest1.setJobId(1L);
         saveWorkflowNodeRequest1.setNodeName("DAG-Node-1");
-        saveWorkflowNodeRequest1.setType(WorkflowNodeType.JOB);
+        saveWorkflowNodeRequest1.setType(WorkflowNodeType.JOB.getCode());
 
         SaveWorkflowNodeRequest saveWorkflowNodeRequest2 = new SaveWorkflowNodeRequest();
         saveWorkflowNodeRequest2.setJobId(1L);
         saveWorkflowNodeRequest2.setNodeName("DAG-Node-2");
-        saveWorkflowNodeRequest2.setType(WorkflowNodeType.JOB);
+        saveWorkflowNodeRequest2.setType(WorkflowNodeType.JOB.getCode());
 
 
         SaveWorkflowNodeRequest saveWorkflowNodeRequest3 = new SaveWorkflowNodeRequest();
         saveWorkflowNodeRequest3.setJobId(1L);
         saveWorkflowNodeRequest3.setNodeName("DAG-Node-3");
-        saveWorkflowNodeRequest3.setType(WorkflowNodeType.JOB);
+        saveWorkflowNodeRequest3.setType(WorkflowNodeType.JOB.getCode());
 
 
         List<WorkflowNodeInfoDTO> nodeList = powerJobClient.saveWorkflowNode(Lists.newArrayList(saveWorkflowNodeRequest1,saveWorkflowNodeRequest2,saveWorkflowNodeRequest3)).getData();
@@ -149,7 +149,7 @@ class TestWorkflow extends ClientInitializer {
 
     @Test
     void testRunWorkflow() {
-        ResultDTO<Long> res = powerJobClient.runWorkflow(WF_ID);
+        ResultDTO<Long> res = powerJobClient.runWorkflow(WF_ID, null, 0);
         System.out.println(res);
         Assertions.assertNotNull(res);
     }

powerjob-common/pom.xml

@@ -5,24 +5,23 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>3.0.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-common</artifactId>
-    <version>4.0.0</version>
+    <version>5.1.1</version>
     <packaging>jar</packaging>
 
     <properties>
-        <slf4j.version>1.7.30</slf4j.version>
-        <commons.lang.version>3.10</commons.lang.version>
-        <commons.io.version>2.6</commons.io.version>
-        <guava.version>29.0-jre</guava.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <commons.lang.version>3.12.0</commons.lang.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <guava.version>31.1-jre</guava.version>
         <okhttp.version>3.14.9</okhttp.version>
-        <akka.version>2.6.12</akka.version>
-        <kryo.version>5.0.4</kryo.version>
-        <jackson.version>2.12.2</jackson.version>
-        <junit.version>5.6.1</junit.version>
+        <kryo.version>5.3.0</kryo.version>
+        <jackson.version>2.14.3</jackson.version>
+        <junit.version>5.9.0</junit.version>
     </properties>
 
     <dependencies>
@@ -54,18 +53,6 @@
             <version>${okhttp.version}</version>
         </dependency>
 
-        <!-- akka remote -->
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-remote_2.13</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_2.13</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-
         <!-- commons-io -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -90,6 +77,13 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <!-- 解决 Java8 data/time 类型处理问题 #869 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
 
         <!-- Junit tests -->
         <dependency>

powerjob-common/src/main/java/tech/powerjob/common/OmsConstant.java

@@ -8,6 +8,11 @@ package tech.powerjob.common;
  */
 public class OmsConstant {
 
+    /**
+     * package name
+     */
+    public static final String PACKAGE = "tech.powerjob";
+
     public static final int SERVER_DEFAULT_AKKA_PORT = 10086;
     public static final int SERVER_DEFAULT_HTTP_PORT = 10010;
 
@@ -17,8 +22,14 @@ public class OmsConstant {
     public static final String NONE = "N/A";
 
     public static final String COMMA = ",";
+
+    public static final String AND = "&";
+
+    public static final String EQUAL = "=";
     public static final String LINE_SEPARATOR = "\r\n";
 
     public static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
     public static final String JSON_MEDIA_TYPE = "application/json; charset=utf-8";
+
+    public static final String NULL = "null";
 }

powerjob-common/src/main/java/tech/powerjob/common/OpenAPIConstant.java

@@ -16,10 +16,14 @@ public class OpenAPIConstant {
 
     public static final String ASSERT = "/assert";
 
+    public static final String AUTH_APP = "/authApp";
+
     /* ************* JOB 区 ************* */
 
     public static final String SAVE_JOB = "/saveJob";
     public static final String COPY_JOB = "/copyJob";
+
+    public static final String EXPORT_JOB = "/exportJob";
     public static final String FETCH_JOB = "/fetchJob";
     public static final String FETCH_ALL_JOB = "/fetchAllJob";
     public static final String QUERY_JOB = "/queryJob";
@@ -54,4 +58,12 @@ public class OpenAPIConstant {
     public static final String RETRY_WORKFLOW_INSTANCE = "/retryWfInstance";
     public static final String FETCH_WORKFLOW_INSTANCE_INFO = "/fetchWfInstanceInfo";
     public static final String MARK_WORKFLOW_NODE_AS_SUCCESS = "/markWorkflowNodeAsSuccess";
+
+    /* ************* 鉴权 ************* */
+
+    public static final String REQUEST_HEADER_ACCESS_TOKEN = "X-POWERJOB-ACCESS-TOKEN";
+
+    public static final String REQUEST_HEADER_APP_ID = "X-POWERJOB-APP-ID";
+
+    public static final String RESPONSE_HEADER_AUTH_STATUS = "X-POWERJOB-AUTH-PASSED";
 }

powerjob-common/src/main/java/tech/powerjob/common/PowerJobDKey.java

@@ -5,7 +5,6 @@ import java.net.NetworkInterface;
 /**
  * 通过 JVM 启动参数传入的配置信息
  *
- *
  * @author tjq
  * @since 2020/8/8
  */
@@ -16,13 +15,55 @@ public class PowerJobDKey {
      */
     public static final String PREFERRED_NETWORK_INTERFACE = "powerjob.network.interface.preferred";
 
+    /**
+     * 绑定地址，一般填写本机网卡地址
+     */
     public static final String BIND_LOCAL_ADDRESS = "powerjob.network.local.address";
+    /**
+     * 外部地址，可选，默认与绑定地址相同。当存在 NAT 等场景时可通过单独传递外部地址来实现通讯
+     */
+    public static final String NT_EXTERNAL_ADDRESS = "powerjob.network.external.address";
+    public static final String NT_EXTERNAL_PORT = "powerjob.network.external.port";
 
     /**
      * Java regular expressions for network interfaces that will be ignored.
      */
     public static final String IGNORED_NETWORK_INTERFACE_REGEX = "powerjob.network.interface.ignored";
 
+    /**
+     * Enables compression during data transfer, such as gzip under the HTTP protocol. default value is 'false'
+     * Note that enabling compression reduces network usage, but increases CPU consumption
+     */
+    public static final String TRANSPORTER_USE_COMPRESSING = "powerjob.transporter.compression.enabled";
+
+    /**
+     * keep-alive connection timeout(in seconds), value <= 0 means disable keepalive. default value is 75
+     */
+    public static final String TRANSPORTER_KEEP_ALIVE_TIMEOUT = "powerjob.transporter.keepalive.timeout";
+
     public static final String WORKER_STATUS_CHECK_PERIOD = "powerjob.worker.status-check.normal.period";
 
+    /**
+     * allowed PowerJob to invoke Thread#stop to kill a thread when PowerJob can't interrupt the thread
+     * <a href="https://stackoverflow.com/questions/16504140/thread-stop-deprecated">It's VERY dangerous</a>
+     */
+    public static final String WORKER_ALLOWED_FORCE_STOP_THREAD = "powerjob.worker.allowed-force-stop-thread";
+
+    public static final String WORKER_WORK_SPACE = "powerjob.worker.workspace";
+    /**
+     * ms
+     */
+    public static final String FREQUENCY_JOB_MAX_INTERVAL = "powerjob.server.frequency-job.max-interval";
+
+    /* ******************* 不太可能有人用的参数，主要方便内部测试 ******************* */
+
+    /**
+     * 最大活跃任务数量，超出部分 SWAP 到磁盘以提升性能
+     */
+    public static final String WORKER_RUNTIME_SWAP_MAX_ACTIVE_TASK_NUM = "powerjob.worker.swap.max-active-task-num";
+
+    public static final String WORKER_RUNTIME_SWAP_TASK_SCHEDULE_INTERVAL_MS = "powerjob.worker.swap.scan-interval";
+
+    public static final String SERVER_TEST_ACCOUNT_USERNAME = "powerjob.server.test-accounts";
+
 }

powerjob-common/src/main/java/tech/powerjob/common/PowerSerializable.java

@@ -9,12 +9,4 @@ import java.io.Serializable;
  * @since 2020/4/16
  */
 public interface PowerSerializable extends Serializable {
-
-    /**
-     * request path for http or other protocol, like '/worker/stopInstance'
-     * @return null for non-http request object or no-null path for http request needed object
-     */
-    default String path() {
-        return null;
-    }
 }

powerjob-common/src/main/java/tech/powerjob/common/ProtocolConstant.java

@@ -1,18 +0,0 @@
-package tech.powerjob.common;
-
-/**
- * HttpProtocolConstant
- *
- * @author tjq
- * @since 2021/2/8
- */
-public class ProtocolConstant {
-
-    public static final String SERVER_PATH_HEARTBEAT = "/server/heartbeat";
-    public static final String SERVER_PATH_STATUS_REPORT = "/server/statusReport";
-    public static final String SERVER_PATH_LOG_REPORT = "/server/logReport";
-
-    public static final String WORKER_PATH_DISPATCH_JOB = "/worker/runJob";
-    public static final String WORKER_PATH_STOP_INSTANCE = "/worker/stopInstance";
-    public static final String WORKER_PATH_QUERY_INSTANCE_INFO = "/worker/queryInstanceInfo";
-}

powerjob-common/src/main/java/tech/powerjob/common/RemoteConstant.java

@@ -12,25 +12,93 @@ public class RemoteConstant {
     /* ************************ AKKA WORKER ************************ */
     public static final int DEFAULT_WORKER_PORT = 27777;
 
-    public static final String WORKER_ACTOR_SYSTEM_NAME = "oms";
-
-    public static final String TASK_TRACKER_ACTOR_NAME = "task_tracker";
-    public static final String PROCESSOR_TRACKER_ACTOR_NAME = "processor_tracker";
-    public static final String WORKER_ACTOR_NAME = "worker";
-    public static final String TROUBLESHOOTING_ACTOR_NAME = "troubleshooting";
-
-    public static final String WORKER_AKKA_CONFIG_NAME = "oms-worker.akka.conf";
-
-
-    /* ************************ AKKA SERVER ************************ */
-    public static final String SERVER_ACTOR_SYSTEM_NAME = "oms-server";
-
-    public static final String SERVER_ACTOR_NAME = "server_actor";
-    public static final String SERVER_FRIEND_ACTOR_NAME = "friend_actor";
-    public static final String SERVER_AKKA_CONFIG_NAME = "oms-server.akka.conf";
-
 
     /* ************************ OTHERS ************************ */
     public static final String EMPTY_ADDRESS = "N/A";
     public static final long DEFAULT_TIMEOUT_MS = 5000;
+
+    /* ************************ SERVER-self_side (s4s == server for server side) ************************ */
+    public static final String S4S_PATH = "friend";
+
+    /**
+     * server 集群间的心跳处理
+     */
+    public static final String S4S_HANDLER_PING = "ping";
+    /**
+     * 处理其他 server 的执行请求
+     */
+    public static final String S4S_HANDLER_PROCESS = "process";
+
+    /* ************************ SERVER-worker_side（s4w == server for worker side） ************************ */
+    public static final String S4W_PATH = "server";
+    /**
+     * server 处理在线日志
+     */
+    public static final String S4W_HANDLER_REPORT_LOG = "reportLog";
+    /**
+     * server 处理 worker 心跳
+     */
+    public static final String S4W_HANDLER_WORKER_HEARTBEAT = "workerHeartbeat";
+
+    /**
+     * server 处理 TaskTracker 上报的任务实例状态
+     */
+    public static final String S4W_HANDLER_REPORT_INSTANCE_STATUS = "reportInstanceStatus";
+
+    /**
+     * server 查询任务的可执行集群
+     */
+    public static final String S4W_HANDLER_QUERY_JOB_CLUSTER = "queryJobCluster";
+
+    /**
+     * server 处理 worker 请求部署容器命令
+     */
+    public static final String S4W_HANDLER_WORKER_NEED_DEPLOY_CONTAINER = "queryContainer";
+
+    /* ************************ Worker-TaskTracker ************************ */
+    public static final String WTT_PATH = "taskTracker";
+
+    /**
+     * server 任务执行命令
+     */
+    public static final String WTT_HANDLER_RUN_JOB = "runJob";
+    /**
+     * server 停止任务实例命令
+     */
+    public static final String WTT_HANDLER_STOP_INSTANCE = "stopInstance";
+
+    /**
+     * sever 查询任务状态
+     */
+    public static final String WTT_HANDLER_QUERY_INSTANCE_STATUS = "queryInstanceStatus";
+
+    /**
+     * PT 上报任务状态，包含执行结果
+     */
+    public static final String WTT_HANDLER_REPORT_TASK_STATUS = "reportTaskStatus";
+    /**
+     * PT 上报自身状态
+     */
+    public static final String WTT_HANDLER_REPORT_PROCESSOR_TRACKER_STATUS = "reportProcessorTrackerStatus";
+
+    /**
+     * Map 任务
+     */
+    public static final String WTT_HANDLER_MAP_TASK = "mapTask";
+
+    /* ************************ Worker-ProcessorTracker ************************ */
+    public static final String WPT_PATH = "processorTracker";
+
+    public static final String WPT_HANDLER_START_TASK = "startTask";
+
+    public static final String WPT_HANDLER_STOP_INSTANCE = "stopInstance";
+
+    /* ************************ Worker-NORMAL ************************ */
+
+    public static final String WORKER_PATH = "worker";
+
+    public static final String WORKER_HANDLER_DEPLOY_CONTAINER = "deployContainer";
+
+    public static final String WORKER_HANDLER_DESTROY_CONTAINER = "destroyContainer";
+
 }

powerjob-common/src/main/java/tech/powerjob/common/SystemInstanceResult.java

@@ -26,6 +26,23 @@ public class SystemInstanceResult {
      * 任务执行超时
      */
     public static final String INSTANCE_EXECUTE_TIMEOUT = "instance execute timeout";
+    /**
+     * 任务执行超时，成功打断任务
+     */
+    public static final String INSTANCE_EXECUTE_TIMEOUT_INTERRUPTED = "instance execute timeout,interrupted success";
+    /**
+     * 任务执行超时，强制终止任务
+     */
+    public static final String INSTANCE_EXECUTE_TIMEOUT_FORCE_STOP= "instance execute timeout,force stop success";
+
+    /**
+     * 用户手动停止任务，成功打断任务
+     */
+    public static final String USER_STOP_INSTANCE_INTERRUPTED= "user stop instance,interrupted success";
+    /**
+     * 用户手动停止任务，被系统强制终止
+     */
+    public static final String USER_STOP_INSTANCE_FORCE_STOP= "user stop instance,force stop success";
     /**
      * 创建根任务失败
      */

powerjob-common/src/main/java/tech/powerjob/common/enhance/SafeRunnable.java

@@ -0,0 +1,26 @@
+package tech.powerjob.common.enhance;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * 安全的 runnable，可防止因抛出异常导致周期性任务终止
+ * 使用 {@link ScheduledExecutorService} 执行任务时，推荐继承此类捕获并打印异常，避免因为抛出异常导致周期性任务终止
+ *
+ * @author songyinyin
+ * @since 2023/9/20 15:52
+ */
+@Slf4j
+public abstract class SafeRunnable implements Runnable{
+  @Override
+  public void run() {
+    try {
+      run0();
+    } catch (Exception e) {
+      log.error("[SafeRunnable] run failed", e);
+    }
+  }
+
+  protected abstract void run0();
+}

powerjob-common/src/main/java/tech/powerjob/common/enhance/SafeRunnableWrapper.java

@@ -0,0 +1,30 @@
+package tech.powerjob.common.enhance;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * 使用 {@link ScheduledExecutorService} 执行任务时，推荐使用此对象包装一层，避免因为抛出异常导致周期性任务终止
+ *
+ * @author songyinyin
+ * @since 2023/9/20 16:04
+ */
+@Slf4j
+public class SafeRunnableWrapper implements Runnable {
+
+  private final Runnable runnable;
+
+  public SafeRunnableWrapper(Runnable runnable) {
+    this.runnable = runnable;
+  }
+
+  @Override
+  public void run() {
+    try {
+      runnable.run();
+    } catch (Exception e) {
+      log.error("[SafeRunnableWrapper] run failed", e);
+    }
+  }
+}

powerjob-common/src/main/java/tech/powerjob/common/enums/DispatchStrategy.java

@@ -13,8 +13,19 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DispatchStrategy {
 
+    /**
+     * 健康度优先
+     */
     HEALTH_FIRST(1),
-    RANDOM(2);
+    /**
+     * 随机
+     */
+    RANDOM(2),
+    /**
+     * 指定执行
+     */
+    SPECIFY(11)
+    ;
 
     private final int v;
 

powerjob-common/src/main/java/tech/powerjob/common/enums/EncryptType.java

@@ -0,0 +1,22 @@
+package tech.powerjob.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 加密类型
+ *
+ * @author tjq
+ * @since 2024/8/10
+ */
+@Getter
+@AllArgsConstructor
+public enum EncryptType {
+
+    NONE("none"),
+
+    MD5("md5")
+    ;
+
+    private final String code;
+}

powerjob-common/src/main/java/tech/powerjob/common/enums/ErrorCodes.java

@@ -0,0 +1,71 @@
+package tech.powerjob.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 鉴权错误信息
+ *
+ * @author tjq
+ * @since 2024/2/11
+ */
+@Getter
+@AllArgsConstructor
+public enum ErrorCodes {
+
+    USER_NOT_LOGIN("-100", "UserNotLoggedIn"),
+    USER_NOT_EXIST("-101", "UserNotExist"),
+    USER_AUTH_FAILED("-102", "UserAuthFailed"),
+    /**
+     * 账户被停用
+     */
+    USER_DISABLED("-103", "UserDisabled"),
+
+
+    NO_PERMISSION("-200", "NoPermission"),
+
+    /**
+     * 无效请求，一般是参数问题
+     */
+    INVALID_REQUEST("-300", "INVALID_REQUEST"),
+
+    INCORRECT_PASSWORD("-400", "INCORRECT_PASSWORD"),
+
+    /**
+     * 非法令牌
+     */
+    INVALID_TOKEN("-401", "INVALID_TOKEN"),
+    /**
+     * 无效 APP（无法找到 app）
+     */
+    INVALID_APP("-402", "INVALID_APP"),
+
+    /**
+     * 令牌过期
+     */
+    TOKEN_EXPIRED("-403", "TOKEN_EXPIRED"),
+
+    /**
+     * 系统内部异常
+     */
+    SYSTEM_UNKNOWN_ERROR("-500", "SYS_UNKNOWN_ERROR"),
+    /**
+     * 非法参数
+     */
+    ILLEGAL_ARGS_ERROR("-501", "ILLEGAL_ARGS_ERROR"),
+
+    /**
+     * OPENAPI 错误码号段 -10XX
+     */
+    OPEN_API_AUTH_FAILED("-1002", "OPEN_API_AUTH_FAILED"),
+
+    /**
+     * PowerJobClient 错误码号段
+     */
+    CLIENT_HTTP_REQUEST_FAILED("-2001", "CLIENT_HTTP_REQUEST_FAILED"),
+
+    ;
+
+    private final String code;
+    private final String msg;
+}

powerjob-common/src/main/java/tech/powerjob/common/enums/ExecuteType.java

@@ -26,8 +26,8 @@ public enum ExecuteType {
     MAP_REDUCE(3, "MapReduce"),
     MAP(4, "Map");
 
-    int v;
-    String des;
+    private final int v;
+    private final String des;
 
     public static ExecuteType of(int v) {
         for (ExecuteType type : values()) {

powerjob-common/src/main/java/tech/powerjob/common/enums/LogLevel.java

@@ -18,7 +18,8 @@ public enum LogLevel {
     DEBUG(1),
     INFO(2),
     WARN(3),
-    ERROR(4);
+    ERROR(4),
+    OFF(99);
 
     private final int v;
 

powerjob-common/src/main/java/tech/powerjob/common/enums/LogType.java

@@ -0,0 +1,37 @@
+package tech.powerjob.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * LogType
+ *
+ * @author tjq
+ * @since 2022/10/3
+ */
+@Getter
+@AllArgsConstructor
+public enum LogType {
+    ONLINE(1),
+    LOCAL(2),
+    STDOUT(3),
+
+    LOCAL_AND_ONLINE(4),
+
+    NULL(999);
+    private final Integer v;
+
+    public static LogType of(Integer type) {
+
+        if (type == null) {
+            return ONLINE;
+        }
+
+        for (LogType logType : values()) {
+            if (logType.v.equals(type)) {
+                return logType;
+            }
+        }
+        return ONLINE;
+    }
+}

powerjob-common/src/main/java/tech/powerjob/common/enums/MIME.java

@@ -0,0 +1,22 @@
+package tech.powerjob.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types">消息内容类型</a>
+ *
+ * @author tjq
+ * @since 2024/8/10
+ */
+@Getter
+@AllArgsConstructor
+public enum MIME {
+
+    APPLICATION_JSON("application/json; charset=utf-8"),
+
+    APPLICATION_FORM("application/x-www-form-urlencoded")
+    ;
+
+    private final String code;
+}

powerjob-common/src/main/java/tech/powerjob/common/enums/SwitchableStatus.java

@@ -1,4 +1,4 @@
-package tech.powerjob.server.common.constants;
+package tech.powerjob.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -13,10 +13,16 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum SwitchableStatus {
     /**
-     *
+     * 启用
      */
     ENABLE(1),
+    /**
+     * 关闭
+     */
     DISABLE(2),
+    /**
+     * 软删除
+     */
     DELETED(99);
 
     private final int v;

powerjob-common/src/main/java/tech/powerjob/common/enums/TaskTrackerBehavior.java

@@ -0,0 +1,42 @@
+package tech.powerjob.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TaskTracker 行为枚举
+ *
+ * @author tjq
+ * @since 2024/2/24
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskTrackerBehavior {
+
+    /**
+     * 普通：不特殊处理，参与集群计算，会导致 TaskTracker 负载比常规节点高。适用于节点数不那么多，任务不那么繁重的场景
+     */
+    NORMAL(1),
+    /**
+     * 划水：只负责管理节点，不参与计算，稳定性最优。适用于节点数量非常多的大规模计算场景，少一个计算节点来换取稳定性提升
+     */
+    PADDLING(11)
+    ;
+
+
+    private final Integer v;
+
+    public static TaskTrackerBehavior of(Integer type) {
+
+        if (type == null) {
+            return NORMAL;
+        }
+
+        for (TaskTrackerBehavior t : values()) {
+            if (t.v.equals(type)) {
+                return t;
+            }
+        }
+        return NORMAL;
+    }
+}

powerjob-common/src/main/java/tech/powerjob/common/enums/TimeExpressionType.java

@@ -3,7 +3,9 @@ package tech.powerjob.common.enums;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.ToString;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -14,17 +16,24 @@ import java.util.List;
  */
 @Getter
 @AllArgsConstructor
+@ToString
 public enum TimeExpressionType {
 
     API(1),
     CRON(2),
     FIXED_RATE(3),
     FIXED_DELAY(4),
-    WORKFLOW(5);
+    WORKFLOW(5),
 
-    int v;
+    DAILY_TIME_INTERVAL(11);
 
-    public static final List<Integer> frequentTypes = Lists.newArrayList(FIXED_RATE.v, FIXED_DELAY.v);
+    private final int v;
+
+    public static final List<Integer> FREQUENT_TYPES = Collections.unmodifiableList(Lists.newArrayList(FIXED_RATE.v, FIXED_DELAY.v));
+    /**
+     * 首次计算触发时间时必须计算出一个有效值
+     */
+    public static final List<Integer> INSPECT_TYPES =  Collections.unmodifiableList(Lists.newArrayList(CRON.v, DAILY_TIME_INTERVAL.v));
 
     public static TimeExpressionType of(int v) {
         for (TimeExpressionType type : values()) {

powerjob-common/src/main/java/tech/powerjob/common/enums/WorkflowInstanceStatus.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -27,11 +28,11 @@ public enum WorkflowInstanceStatus {
     /**
      * 广义的运行状态
      */
-    public static final List<Integer> GENERALIZED_RUNNING_STATUS = Lists.newArrayList(WAITING.v, RUNNING.v);
+    public static final List<Integer> GENERALIZED_RUNNING_STATUS = Collections.unmodifiableList(Lists.newArrayList(WAITING.v, RUNNING.v));
     /**
      * 结束状态
      */
-    public static final List<Integer> FINISHED_STATUS = Lists.newArrayList(FAILED.v, SUCCEED.v, STOPPED.v);
+    public static final List<Integer> FINISHED_STATUS = Collections.unmodifiableList(Lists.newArrayList(FAILED.v, SUCCEED.v, STOPPED.v));
 
     private final int v;
 

powerjob-common/src/main/java/tech/powerjob/common/enums/WorkflowNodeType.java

@@ -15,9 +15,33 @@ public enum WorkflowNodeType {
     /**
      * 任务节点
      */
-    JOB(1);
+    JOB(1,false),
+    /**
+     * 判断节点
+     */
+    DECISION(2,true),
+    /**
+     * 内嵌工作流
+     */
+    NESTED_WORKFLOW(3,false),
 
+    ;
 
     private final int code;
+    /**
+     * 控制节点
+     */
+    private final boolean controlNode;
+
+    public static WorkflowNodeType of(int code) {
+        for (WorkflowNodeType nodeType : values()) {
+            if (nodeType.code == code) {
+                return nodeType;
+            }
+        }
+        throw new IllegalArgumentException("unknown WorkflowNodeType of " + code);
+    }
+
+
 
 }

powerjob-common/src/main/java/tech/powerjob/common/exception/ImpossibleException.java

@@ -0,0 +1,10 @@
+package tech.powerjob.common.exception;
+
+/**
+ * ImpossibleException
+ *
+ * @author tjq
+ * @since 2023/7/12
+ */
+public class ImpossibleException extends RuntimeException {
+}

powerjob-common/src/main/java/tech/powerjob/common/exception/PowerJobException.java

@@ -1,13 +1,21 @@
 package tech.powerjob.common.exception;
 
+import lombok.Getter;
+import lombok.Setter;
+import tech.powerjob.common.enums.ErrorCodes;
+
 /**
  * PowerJob 运行时异常
  *
  * @author tjq
  * @since 2020/5/26
  */
+@Setter
+@Getter
 public class PowerJobException extends RuntimeException {
 
+    protected String code;
+
     public PowerJobException() {
     }
 
@@ -15,6 +23,11 @@ public class PowerJobException extends RuntimeException {
         super(message);
     }
 
+    public PowerJobException(ErrorCodes errorCode, String extraMsg) {
+        super(extraMsg == null ? errorCode.getMsg() : errorCode.getMsg().concat(":").concat(extraMsg));
+        this.code = errorCode.getCode();
+    }
+
     public PowerJobException(String message, Throwable cause) {
         super(message, cause);
     }

powerjob-common/src/main/java/tech/powerjob/common/exception/PowerJobExceptionLauncher.java

@@ -0,0 +1,17 @@
+package tech.powerjob.common.exception;
+
+
+import tech.powerjob.common.enums.ErrorCodes;
+
+/**
+ * PowerJobExceptionLauncher
+ *
+ * @author tjq
+ * @since 2024/11/22
+ */
+public class PowerJobExceptionLauncher {
+
+    public PowerJobExceptionLauncher(ErrorCodes errorCode, String message) {
+        throw new PowerJobException(errorCode, message);
+    }
+}

powerjob-common/src/main/java/tech/powerjob/common/model/AlarmConfig.java

@@ -0,0 +1,28 @@
+package tech.powerjob.common.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Echo009
+ * @since 2022/1/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AlarmConfig {
+    /**
+     * 触发告警的阈值
+     */
+    private Integer alertThreshold;
+    /**
+     * 统计的窗口长度（s）
+     */
+    private Integer statisticWindowLen;
+    /**
+     * 沉默时间窗口（s）
+     */
+    private Integer silenceWindowLen;
+
+}

powerjob-common/src/main/java/tech/powerjob/common/model/InstanceDetail.java

@@ -1,8 +1,8 @@
 package tech.powerjob.common.model;
 
-import tech.powerjob.common.PowerSerializable;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import tech.powerjob.common.PowerSerializable;
 
 import java.util.List;
 
@@ -51,8 +51,15 @@ public class InstanceDetail implements PowerSerializable {
 
     /**
      * Task detail, used by MapReduce or Broadcast tasks.
+     * 命名有点问题，实际是 task 统计信息
      */
     private TaskDetail taskDetail;
+
+    /**
+     * 查询出来的 Task 详细结果
+     */
+    private List<TaskDetailInfo> queriedTaskDetailInfoList;
+
     /**
      * Sub instance details, used by frequent tasks.
      */
@@ -92,5 +99,14 @@ public class InstanceDetail implements PowerSerializable {
         private long totalTaskNum;
         private long succeedTaskNum;
         private long failedTaskNum;
+
+        // 等待派发状态（仅存在 TaskTracker 数据库中）
+        protected Long waitingDispatchTaskNum;
+        // 已派发，但 ProcessorTracker 未确认，可能由于网络错误请求未送达，也有可能 ProcessorTracker 线程池满，拒绝执行
+        protected Long workerUnreceivedTaskNum;
+        // ProcessorTracker确认接收，存在与线程池队列中，排队执行
+        protected Long receivedTaskNum;
+        // ProcessorTracker正在执行
+        protected Long runningTaskNum;
     }
 }

powerjob-common/src/main/java/tech/powerjob/common/model/JobAdvancedRuntimeConfig.java

@@ -0,0 +1,25 @@
+package tech.powerjob.common.model;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 任务运行时高级配置
+ *
+ * @author tjq
+ * @since 2024/2/24
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class JobAdvancedRuntimeConfig {
+
+    /**
+     * MR 任务专享参数，TaskTracker 行为 {@link tech.powerjob.common.enums.TaskTrackerBehavior}
+     */
+    private Integer taskTrackerBehavior;
+
+}

powerjob-common/src/main/java/tech/powerjob/common/model/LifeCycle.java

@@ -0,0 +1,28 @@
+package tech.powerjob.common.model;
+
+import lombok.Data;
+import tech.powerjob.common.serialize.JsonUtils;
+
+/**
+ * @author Echo009
+ * @since 2022/3/22
+ */
+@Data
+public class LifeCycle {
+
+    public static final LifeCycle EMPTY_LIFE_CYCLE = new LifeCycle();
+
+    private Long start;
+
+    private Long end;
+
+    public static LifeCycle parse(String lifeCycle){
+        try {
+           return JsonUtils.parseObject(lifeCycle,LifeCycle.class);
+        }catch (Exception e){
+            // ignore
+            return EMPTY_LIFE_CYCLE;
+        }
+    }
+
+}

powerjob-common/src/main/java/tech/powerjob/common/model/LogConfig.java

@@ -0,0 +1,32 @@
+package tech.powerjob.common.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 任务日志配置
+ *
+ * @author yhz
+ * @since 2022/9/16
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class LogConfig {
+    /**
+     * log type {@link tech.powerjob.common.enums.LogType}
+     */
+    private Integer type;
+    /**
+     * log level {@link tech.powerjob.common.enums.LogLevel}
+     */
+    private Integer level;
+
+    private String loggerName;
+
+
+}

powerjob-common/src/main/java/tech/powerjob/common/model/PEWorkflowDAG.java

@@ -3,10 +3,10 @@ package tech.powerjob.common.model;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.google.common.collect.Lists;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import tech.powerjob.common.enums.WorkflowNodeType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -38,10 +38,10 @@ public class PEWorkflowDAG implements Serializable {
     @Data
     @Accessors(chain = true)
     @NoArgsConstructor
-    @AllArgsConstructor
     public static class Node implements Serializable {
         /**
          * node id
+         *
          * @since 20210128
          */
         private Long nodeId;
@@ -49,11 +49,15 @@ public class PEWorkflowDAG implements Serializable {
 
         /**
          * note type
+         *
+         * @see WorkflowNodeType
          * @since 20210316
          */
         private Integer nodeType;
         /**
-         * job id
+         * job id or workflow id (if this Node type is a nested workflow)
+         *
+         * @see WorkflowNodeType#NESTED_WORKFLOW
          */
         private Long jobId;
         /**
@@ -61,23 +65,41 @@ public class PEWorkflowDAG implements Serializable {
          */
         private String nodeName;
 
-        @JsonSerialize(using= ToStringSerializer.class)
+        @JsonSerialize(using = ToStringSerializer.class)
         private Long instanceId;
-
+        /**
+         * for decision node, it is JavaScript code
+         */
         private String nodeParams;
 
         private Integer status;
-
+        /**
+         * for decision node, it only be can "true" or "false"
+         */
         private String result;
         /**
          * instanceId will be null if disable .
          */
         private Boolean enable;
+        /**
+         * mark node which disable by control node.
+         */
+        private Boolean disableByControlNode;
 
         private Boolean skipWhenFailed;
 
+        private String startTime;
+
+        private String finishedTime;
+
         public Node(Long nodeId) {
             this.nodeId = nodeId;
+            this.nodeType = WorkflowNodeType.JOB.getCode();
+        }
+
+        public Node(Long nodeId, Integer nodeType) {
+            this.nodeId = nodeId;
+            this.nodeType = nodeType;
         }
     }
 
@@ -86,10 +108,29 @@ public class PEWorkflowDAG implements Serializable {
      */
     @Data
     @NoArgsConstructor
-    @AllArgsConstructor
     public static class Edge implements Serializable {
+
         private Long from;
+
         private Long to;
+        /**
+         * property,support for complex flow control
+         * for decision node , it can be "true" or "false"
+         */
+        private String property;
+
+        private Boolean enable;
+
+        public Edge(long from, long to) {
+            this.from = from;
+            this.to = to;
+        }
+
+        public Edge(long from, long to, String property) {
+            this.from = from;
+            this.to = to;
+            this.property = property;
+        }
     }
 
     public PEWorkflowDAG(@Nonnull List<Node> nodes, @Nullable List<Edge> edges) {

powerjob-common/src/main/java/tech/powerjob/common/model/TaskDetailInfo.java

@@ -0,0 +1,43 @@
+package tech.powerjob.common.model;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import tech.powerjob.common.PowerSerializable;
+
+/**
+ * Task 详细信息
+ *
+ * @author tjq
+ * @since 2024/2/25
+ */
+@Data
+@Accessors(chain = true)
+public class TaskDetailInfo implements PowerSerializable {
+
+    private String taskId;
+    private String taskName;
+    /**
+     * 任务对象（map 的 subTask）
+     */
+    private String taskContent;
+    /**
+     * 处理器地址
+     */
+    private String processorAddress;
+    private Integer status;
+    private String statusStr;
+    private String result;
+    private Integer failedCnt;
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 最后修改时间
+     */
+    private Long lastModifiedTime;
+    /**
+     * ProcessorTracker 最后上报时间
+     */
+    private Long lastReportTime;
+}

powerjob-common/src/main/java/tech/powerjob/common/model/WorkerAppInfo.java

@@ -0,0 +1,24 @@
+package tech.powerjob.common.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * WorkerAppInfo
+ *
+ * @author tjq
+ * @since 2023/9/2
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class WorkerAppInfo implements Serializable {
+
+    /**
+     * 应用唯一 ID
+     */
+    private Long appId;
+}

powerjob-common/src/main/java/tech/powerjob/common/request/ServerDiscoveryRequest.java

@@ -0,0 +1,62 @@
+package tech.powerjob.common.request;
+
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+import tech.powerjob.common.enums.Protocol;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * 服务发现请求
+ *
+ * @author tjq
+ * @since 2023/1/21
+ */
+@Setter
+@Accessors(chain = true)
+public class ServerDiscoveryRequest implements Serializable {
+
+    private Long appId;
+
+    private String protocol;
+
+    private String currentServer;
+
+    private String clientVersion;
+
+    public Map<String, Object> toMap() {
+        Map<String, Object> ret = new HashMap<>();
+        // testMode 下 appId 可能为空，此处不判断会导致 testMode 无法启动 #580
+        if (appId != null) {
+            ret.put("appId", appId);
+        }
+        ret.put("protocol", protocol);
+        if (StringUtils.isNotEmpty(currentServer)) {
+            ret.put("currentServer", currentServer);
+        }
+        if (StringUtils.isNotEmpty(clientVersion)) {
+            ret.put("clientVersion", clientVersion);
+        }
+        return ret;
+    }
+
+    public Long getAppId() {
+        return appId;
+    }
+
+    public String getProtocol() {
+        return Optional.ofNullable(protocol).orElse(Protocol.AKKA.name());
+    }
+
+    public String getCurrentServer() {
+        return currentServer;
+    }
+
+    public String getClientVersion() {
+        return clientVersion;
+    }
+}

powerjob-common/src/main/java/tech/powerjob/common/request/ServerQueryInstanceStatusReq.java

@@ -1,10 +1,9 @@
 package tech.powerjob.common.request;
 
-import tech.powerjob.common.PowerSerializable;
-import tech.powerjob.common.ProtocolConstant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import tech.powerjob.common.PowerSerializable;
 
 /**
  * 服务器查询实例运行状态，需要返回详细的运行数据
@@ -18,8 +17,11 @@ import lombok.NoArgsConstructor;
 public class ServerQueryInstanceStatusReq implements PowerSerializable {
     private Long instanceId;
 
-    @Override
-    public String path() {
-        return ProtocolConstant.WORKER_PATH_QUERY_INSTANCE_INFO;
-    }
+    /**
+     * 自定义查询
+     * 针对高阶用户，直接开放底库查询，便于运维和排查问题
+     * 此处只传递查询条件，前置拼接 select *，后置拼接 limit
+     */
+    private String customQuery;
+
 }

powerjob-common/src/main/java/tech/powerjob/common/request/ServerScheduleJobReq.java

@@ -1,8 +1,7 @@
 package tech.powerjob.common.request;
 
-import tech.powerjob.common.PowerSerializable;
-import tech.powerjob.common.ProtocolConstant;
 import lombok.Data;
+import tech.powerjob.common.PowerSerializable;
 
 import java.util.List;
 
@@ -15,9 +14,16 @@ import java.util.List;
 @Data
 public class ServerScheduleJobReq implements PowerSerializable {
 
-    // 可用处理器地址，可能多值，逗号分隔
+    /**
+     * 可用处理器地址，可能多值，逗号分隔
+     */
     private List<String> allWorkerAddress;
 
+    /**
+     * 最大机器数量
+     */
+    private Integer maxWorkerCount;
+
     /* *********************** 任务相关属性 *********************** */
 
     /**
@@ -32,48 +38,68 @@ public class ServerScheduleJobReq implements PowerSerializable {
     private Long instanceId;
 
     /**
-     * 任务执行处理器信息
+     * 任务执行类型，单机、广播、MR
      */
-    // 任务执行类型，单机、广播、MR
     private String executeType;
-    // 处理器类型（JavaBean、Jar、脚本等）
+    /**
+     * 处理器类型（内建，外部）
+     */
     private String processorType;
-    // 处理器信息
+    /**
+     * 处理器信息
+     */
     private String processorInfo;
 
 
     /**
-     * 超时时间
+     * 整个任务的总体超时时间
      */
-    // 整个任务的总体超时时间
     private long instanceTimeoutMS;
 
     /**
-     * 任务运行参数
+     * 任务级别的参数，相当于类的static变量
      */
-    // 任务级别的参数，相当于类的static变量
     private String jobParams;
-    // 实例级别的参数，相当于类的普通变量（API触发专用，从API触发处带入）
+    /**
+     * 实例级别的参数，相当于类的普通变量（API触发专用，从API触发处带入）
+     */
     private String instanceParams;
 
-    // 每台机器的处理线程数上限
+    /**
+     * 每台机器的处理线程数上限
+     */
     private int threadConcurrency;
-    // 子任务重试次数（任务本身的重试机制由server控制）
+    /**
+     * 子任务重试次数（任务本身的重试机制由server控制）
+     */
     private int taskRetryNum;
 
     /**
-     * 定时执行信息
+     * 时间表达式类型（CRON/API/FIX_RATE/FIX_DELAY）
      */
-    // 时间表达式类型（CRON/API/FIX_RATE/FIX_DELAY）
     private String timeExpressionType;
-    // 时间表达式，CRON/NULL/LONG/LONG（单位MS）
+    /**
+     * 时间表达式，CRON/NULL/LONG/LONG（单位MS）
+     */
     private String timeExpression;
 
-    // 最大同时运行任务数，默认 1
+    /**
+     * 最大同时运行任务数，默认 1
+     */
     private Integer maxInstanceNum;
 
-    @Override
-    public String path() {
-        return ProtocolConstant.WORKER_PATH_DISPATCH_JOB;
-    }
+    /**
+     * 告警配置
+     */
+    private String alarmConfig;
+
+    /**
+     * 日志配置
+     */
+    private String logConfig;
+
+    /**
+     * 高级运行时配置
+     */
+    private String advancedRuntimeConfig;
 }

powerjob-common/src/main/java/tech/powerjob/common/request/ServerStopInstanceReq.java

@@ -1,10 +1,9 @@
 package tech.powerjob.common.request;
 
-import tech.powerjob.common.PowerSerializable;
-import tech.powerjob.common.ProtocolConstant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import tech.powerjob.common.PowerSerializable;
 
 
 /**
@@ -18,9 +17,4 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class ServerStopInstanceReq implements PowerSerializable {
     private Long instanceId;
-
-    @Override
-    public String path() {
-        return ProtocolConstant.WORKER_PATH_STOP_INSTANCE;
-    }
 }

powerjob-common/src/main/java/tech/powerjob/common/request/TaskTrackerReportInstanceStatusReq.java

@@ -15,6 +15,12 @@ import java.util.Map;
 @Data
 public class TaskTrackerReportInstanceStatusReq implements PowerSerializable {
 
+    /**
+     * 追加上报自己的 appId
+     * 方便后续的监控日志埋点
+     */
+    private Long appId;
+
     private Long jobId;
 
     private Long instanceId;
@@ -40,7 +46,18 @@ public class TaskTrackerReportInstanceStatusReq implements PowerSerializable {
 
     private long startTime;
 
+    private Long endTime;
+
     private long reportTime;
 
     private String sourceAddress;
+
+    /* ********* 秒级任务的告警信息 ********* */
+
+    private boolean needAlert;
+
+    private String alertContent;
+
+
+
 }

powerjob-common/src/main/java/tech/powerjob/common/request/WorkerHeartbeat.java

@@ -17,26 +17,55 @@ import java.util.List;
 @Data
 public class WorkerHeartbeat implements PowerSerializable {
 
-    // 本机地址 -> IP:port
+    /**
+     * 本机地址 -> IP:port
+     */
     private String workerAddress;
-    // 当前 appName
+    /**
+     * 当前 appName
+     */
     private String appName;
-    // 当前 appId
+    /**
+     * 当前 appId
+     */
     private Long appId;
-    // 当前时间
+    /**
+     * 当前时间
+     */
     private long heartbeatTime;
-    // 当前加载的容器（容器名称 -> 容器版本）
+    /**
+     * 当前加载的容器（容器名称 -> 容器版本）
+     */
     private List<DeployedContainerInfo> containerInfos;
-    // worker 版本信息
+    /**
+     * worker 版本信息
+     */
     private String version;
-    // 使用的通讯协议 AKKA / HTTP
+    /**
+     * 使用的通讯协议 AKKA / HTTP
+     */
     private String protocol;
-    // worker tag，标识同一个 worker 下的一类集群 ISSUE: 226
+    /**
+     * worker tag，标识同一个 worker 下的一类集群 ISSUE: 226
+     */
     private String tag;
-    // 客户端名称
+    /**
+     * 客户端名称
+     */
     private String client;
-    // 扩展字段
+    /**
+     * 扩展字段
+     */
     private String extra;
+    /**
+     * 是否已经超载，超载的情况下 Server 一段时间内不会再向其派发任务
+     */
+    private boolean isOverload;
+
+    private int lightTaskTrackerNum;
+
+    private int heavyTaskTrackerNum;
+
 
     private SystemMetrics systemMetrics;
 }

powerjob-common/src/main/java/tech/powerjob/common/request/http/SaveJobInfoRequest.java

@@ -4,6 +4,10 @@ import tech.powerjob.common.enums.DispatchStrategy;
 import tech.powerjob.common.enums.ExecuteType;
 import tech.powerjob.common.enums.ProcessorType;
 import tech.powerjob.common.enums.TimeExpressionType;
+import tech.powerjob.common.model.AlarmConfig;
+import tech.powerjob.common.model.JobAdvancedRuntimeConfig;
+import tech.powerjob.common.model.LogConfig;
+import tech.powerjob.common.model.LifeCycle;
 import tech.powerjob.common.utils.CommonUtils;
 import lombok.Data;
 import tech.powerjob.common.response.JobInfoDTO;
@@ -131,8 +135,31 @@ public class SaveJobInfoRequest {
 
     private DispatchStrategy dispatchStrategy;
 
-    private String lifecycle;
+    /**
+     * 某种派发策略背后的具体配置，值取决于 dispatchStrategy
+     */
+    private String dispatchStrategyConfig;
 
+    private LifeCycle lifeCycle;
+    /**
+     * alarm config
+     */
+    private AlarmConfig alarmConfig;
+
+    /**
+     * 任务归类，开放给接入方自由定制
+     */
+    private String tag;
+
+    /**
+     * 日志配置，包括日志级别、日志方式等配置信息
+     */
+    private LogConfig logConfig;
+
+    /**
+     * 高级运行时配置
+     */
+    private JobAdvancedRuntimeConfig advancedRuntimeConfig;
 
     /**
      * Check non-null properties.

powerjob-common/src/main/java/tech/powerjob/common/request/http/SaveWorkflowNodeRequest.java

@@ -1,8 +1,8 @@
 package tech.powerjob.common.request.http;
 
+import lombok.Data;
 import tech.powerjob.common.enums.WorkflowNodeType;
 import tech.powerjob.common.utils.CommonUtils;
-import lombok.Data;
 
 
 
@@ -22,7 +22,7 @@ public class SaveWorkflowNodeRequest {
     /**
      * 节点类型(默认为任务节点)
      */
-    private WorkflowNodeType type = WorkflowNodeType.JOB;
+    private Integer type;
     /**
      * 任务 ID
      */
@@ -44,10 +44,11 @@ public class SaveWorkflowNodeRequest {
      */
     private Boolean skipWhenFailed = false;
 
-    public void valid(){
+    public void valid() {
         CommonUtils.requireNonNull(this.appId, "appId can't be empty");
         CommonUtils.requireNonNull(this.type, "type can't be empty");
-        if (type == WorkflowNodeType.JOB) {
+        final WorkflowNodeType workflowNodeType = WorkflowNodeType.of(type);
+        if (workflowNodeType == WorkflowNodeType.JOB || workflowNodeType == WorkflowNodeType.NESTED_WORKFLOW) {
             CommonUtils.requireNonNull(this.jobId, "jobId can't be empty");
         }
     }

powerjob-common/src/main/java/tech/powerjob/common/request/http/SaveWorkflowRequest.java

@@ -1,6 +1,7 @@
 package tech.powerjob.common.request.http;
 
 import tech.powerjob.common.enums.TimeExpressionType;
+import tech.powerjob.common.model.LifeCycle;
 import tech.powerjob.common.model.PEWorkflowDAG;
 import tech.powerjob.common.utils.CommonUtils;
 import com.google.common.collect.Lists;
@@ -63,6 +64,8 @@ public class SaveWorkflowRequest implements Serializable {
     /** 点线表示法*/
     private PEWorkflowDAG dag;
 
+    private LifeCycle lifeCycle;
+
     public void valid() {
         CommonUtils.requireNonNull(wfName, "workflow name can't be empty");
         CommonUtils.requireNonNull(appId, "appId can't be empty");

powerjob-common/src/main/java/tech/powerjob/common/request/query/InstancePageQuery.java

@@ -0,0 +1,33 @@
+package tech.powerjob.common.request.query;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务实例分页查询
+ *
+ * @author tjq
+ * @since 2024/11/21
+ */
+@Getter
+@Setter
+public class InstancePageQuery extends PowerPageQuery {
+
+    private Long instanceIdEq;
+    private Long instanceIdLt;
+    private Long instanceIdGt;
+
+    private Long jobIdEq;
+
+    private List<Integer> statusIn;
+
+
+    private Date gmtCreateLt;
+    private Date gmtCreateGt;
+
+    private Date gmtModifiedLt;
+    private Date gmtModifiedGt;
+}

powerjob-common/src/main/java/tech/powerjob/common/request/query/JobInfoQuery.java

@@ -50,4 +50,6 @@ public class JobInfoQuery extends PowerQuery {
     private Date gmtModifiedGt;
 
     private Integer dispatchStrategyEq;
+
+    private String tagEq;
 }

powerjob-common/src/main/java/tech/powerjob/common/request/query/PowerPageQuery.java

@@ -0,0 +1,41 @@
+package tech.powerjob.common.request.query;
+
+import lombok.Getter;
+import lombok.Setter;
+import tech.powerjob.common.PowerQuery;
+
+import java.io.Serializable;
+
+/**
+ * 分页查询
+ *
+ * @author tjq
+ * @since 2024/11/21
+ */
+@Getter
+@Setter
+public class PowerPageQuery extends PowerQuery implements Serializable {
+
+
+    /* ****************** 分页参数  ****************** */
+    /**
+     * 当前页码
+     */
+    protected Integer index = 0;
+    /**
+     * 页大小
+     */
+    protected Integer pageSize = 10;
+
+    /* ****************** 排序参数  ****************** */
+
+    /**
+     * 排序参数，如 gmtCreate、instanceId
+     */
+    protected String sortBy;
+
+    /**
+     * asc是指定列按升序排列，desc则是指定列按降序排列
+     */
+    protected boolean asc = false;
+}

powerjob-common/src/main/java/tech/powerjob/common/response/JobInfoDTO.java

@@ -1,6 +1,9 @@
 package tech.powerjob.common.response;
 
 import lombok.Data;
+import tech.powerjob.common.model.AlarmConfig;
+import tech.powerjob.common.model.JobAdvancedRuntimeConfig;
+import tech.powerjob.common.model.LogConfig;
 
 import java.util.Date;
 
@@ -16,69 +19,131 @@ public class JobInfoDTO {
     private Long id;
 
     /* ************************** 任务基本信息 ************************** */
-    // 任务名称
+    /**
+     * 任务名称
+     */
     private String jobName;
-    // 任务描述
+    /**
+     * 任务描述
+     */
     private String jobDescription;
-    // 任务所属的应用ID
+    /**
+     * 任务所属的应用ID
+     */
     private Long appId;
-    // 任务自带的参数
+    /**
+     * 任务自带的参数
+     */
     private String jobParams;
 
     /* ************************** 定时参数 ************************** */
-    // 时间表达式类型（CRON/API/FIX_RATE/FIX_DELAY）
+    /**
+     * 时间表达式类型（CRON/API/FIX_RATE/FIX_DELAY）
+     */
     private Integer timeExpressionType;
-    // 时间表达式，CRON/NULL/LONG/LONG
+    /**
+     * 时间表达式，CRON/NULL/LONG/LONG
+     */
     private String timeExpression;
 
     /* ************************** 执行方式 ************************** */
-    // 执行类型，单机/广播/MR
+    /**
+     * 执行类型，单机/广播/MR
+     */
     private Integer executeType;
-    // 执行器类型，Java/Shell
+    /**
+     * 执行器类型，Java/Shell
+     */
     private Integer processorType;
-    // 执行器信息
+    /**
+     * 执行器信息
+     */
     private String processorInfo;
 
     /* ************************** 运行时配置 ************************** */
-    // 最大同时运行任务数，默认 1
+    /**
+     * 最大同时运行任务数，默认 1
+     */
     private Integer maxInstanceNum;
-    // 并发度，同时执行某个任务的最大线程数量
+    /**
+     * 并发度，同时执行某个任务的最大线程数量
+     */
     private Integer concurrency;
-    // 任务整体超时时间
+    /**
+     * 任务整体超时时间
+     */
     private Long instanceTimeLimit;
 
-    /* ************************** 重试配置 ************************** */
+    /** ************************** 重试配置 ************************** */
     private Integer instanceRetryNum;
     private Integer taskRetryNum;
 
-    // 1 正常运行，2 停止（不再调度）
+    /**
+     * 1 正常运行，2 停止（不再调度）
+     */
     private Integer status;
-    // 下一次调度时间
+    /**
+     * 下一次调度时间
+     */
     private Long nextTriggerTime;
 
     /* ************************** 繁忙机器配置 ************************** */
-    // 最低CPU核心数量，0代表不限
+    /**
+     * 最低CPU核心数量，0代表不限
+     */
     private double minCpuCores;
-    // 最低内存空间，单位 GB，0代表不限
+    /**
+     * 最低内存空间，单位 GB，0代表不限
+     */
     private double minMemorySpace;
-    // 最低磁盘空间，单位 GB，0代表不限
+    /**
+     * 最低磁盘空间，单位 GB，0代表不限
+     */
     private double minDiskSpace;
 
     /* ************************** 集群配置 ************************** */
-    // 指定机器运行，空代表不限，非空则只会使用其中的机器运行（多值逗号分割）
+    /**
+     * 指定机器运行，空代表不限，非空则只会使用其中的机器运行（多值逗号分割）
+     */
     private String designatedWorkers;
-    // 最大机器数量
+    /**
+     * 最大机器数量
+     */
     private Integer maxWorkerCount;
 
-    // 报警用户ID列表，多值逗号分隔
+    /**
+     * 报警用户ID列表，多值逗号分隔
+     */
     private String notifyUserIds;
 
     private Date gmtCreate;
+
     private Date gmtModified;
 
     private String extra;
 
+    /**
+     * 派发策略
+     */
     private Integer dispatchStrategy;
+    /**
+     * 某种派发策略背后的具体配置，值取决于 dispatchStrategy
+     */
+    private String dispatchStrategyConfig;
 
     private String lifecycle;
+
+    private AlarmConfig alarmConfig;
+
+    /**
+     * 任务归类，开放给接入方自由定制
+     */
+    private String tag;
+
+    /**
+     * 日志配置，包括日志级别、日志方式等配置信息
+     */
+    private LogConfig logConfig;
+
+    private JobAdvancedRuntimeConfig advancedRuntimeConfig;
 }

powerjob-common/src/main/java/tech/powerjob/common/response/ObjectResultDTO.java

@@ -0,0 +1,10 @@
+package tech.powerjob.common.response;
+
+/**
+ * 主要目的：消除 idea 烦人的类型提示
+ *
+ * @author tjq
+ * @since 2023/9/2
+ */
+public class ObjectResultDTO extends ResultDTO<Object> {
+}

powerjob-common/src/main/java/tech/powerjob/common/response/PageResult.java

@@ -0,0 +1,42 @@
+package tech.powerjob.common.response;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页对象
+ *
+ * @author tjq
+ * @since 2020/4/12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class PageResult<T> implements Serializable {
+
+    /**
+     * 当前页数
+     */
+    private int index;
+    /**
+     * 页大小
+     */
+    private int pageSize;
+    /**
+     * 总页数
+     */
+    private int totalPages;
+    /**
+     * 总数据量
+     */
+    private long totalItems;
+    /**
+     * 数据
+     */
+    private List<T> data;
+
+}