From bda0e0ec64a8f08f211975d1526b17f19cf0b130 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 17 六月 2023 00:24:08 +0800
Subject: [PATCH] update 优化 !pr359 完成 powerjob 集成
---
ruoyi-extend/ruoyi-powerjob-server/Dockerfile | 13 ++
ruoyi-extend/ruoyi-powerjob-server/pom.xml | 8
ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/PowerJobServerApplication.java | 25 ++++
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties | 3
script/sql/update/sqlserver/update_5.0-5.1.sql | 3
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml | 132 ++++++++++++++++++++++
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties | 9
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/banner.txt | 26 +--
ruoyi-modules/ruoyi-job/pom.xml | 5
script/sql/update/postgres/update_5.0-5.1.sql | 2
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties | 3
ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapProcessorDemo.java | 4
script/sql/update/update_5.0-5.1.sql | 2
ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapReduceProcessorDemo.java | 17 +-
/dev/null | 78 -------------
script/sql/update/oracle/update_5.0-5.1.sql | 2
ruoyi-admin/src/main/resources/application-prod.yml | 7
.run/ruoyi-powerjob-server.run.xml | 12 ++
script/sql/powerjob_demo.sql | 2
ruoyi-admin/src/main/resources/application-dev.yml | 7
20 files changed, 233 insertions(+), 127 deletions(-)
diff --git a/.run/ruoyi-powerjob-server.run.xml b/.run/ruoyi-powerjob-server.run.xml
new file mode 100644
index 0000000..7c42630
--- /dev/null
+++ b/.run/ruoyi-powerjob-server.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <deployment type="dockerfile">
+ <settings>
+ <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.0.0" />
+ <option name="buildOnly" value="true" />
+ <option name="sourceFilePath" value="ruoyi-extend/ruoyi-powerjob-server/Dockerfile" />
+ </settings>
+ </deployment>
+ <method v="2" />
+ </configuration>
+</component>
diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml
deleted file mode 100644
index be52557..0000000
--- a/.run/ruoyi-xxl-job-admin.run.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
- <deployment type="dockerfile">
- <settings>
- <option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:5.0.0" />
- <option name="buildOnly" value="true" />
- <option name="sourceFilePath" value="ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile" />
- </settings>
- </deployment>
- <method v="2" />
- </configuration>
-</component>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index e2ca3d6..0d895fa 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -11,15 +11,16 @@
--- # powerjob 閰嶇疆
powerjob:
worker:
- enabled: true
- # 闇�瑕佺幇鍦╬owerjob鐧诲綍椤垫墽琛屽簲鐢ㄦ敞鍐屽悗鎵嶈兘浣跨敤
+ # 濡備綍寮�鍚皟搴︿腑蹇冭鏌ョ湅鏂囨。鏁欑▼
+ enabled: false
+ # 闇�瑕佸厛鍦� powerjob 鐧诲綍椤垫墽琛屽簲鐢ㄦ敞鍐屽悗鎵嶈兘浣跨敤
app-name: ruoyi-worker
enable-test-mode: false
max-appended-wf-context-length: 4096
max-result-length: 4096
port: 27777
protocol: http
- server-address: 127.0.0.1:7700,127.0.0.1:7701
+ server-address: 127.0.0.1:7700
store-strategy: disk
--- # 鏁版嵁婧愰厤缃�
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 1928c5b..836fc22 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -14,15 +14,16 @@
--- # powerjob 閰嶇疆
powerjob:
worker:
- enabled: true
- # 闇�瑕佺幇鍦╬owerjob鐧诲綍椤垫墽琛屽簲鐢ㄦ敞鍐屽悗鎵嶈兘浣跨敤
+ # 濡備綍寮�鍚皟搴︿腑蹇冭鏌ョ湅鏂囨。鏁欑▼
+ enabled: false
+ # 闇�瑕佸厛鍦� powerjob 鐧诲綍椤垫墽琛屽簲鐢ㄦ敞鍐屽悗鎵嶈兘浣跨敤
app-name: ruoyi-worker
enable-test-mode: false
max-appended-wf-context-length: 4096
max-result-length: 4096
port: 27777
protocol: http
- server-address: 127.0.0.1:7700,127.0.0.1:7701
+ server-address: 127.0.0.1:7700
store-strategy: disk
--- # 鏁版嵁婧愰厤缃�
diff --git a/ruoyi-extend/ruoyi-powerjob-server/Dockerfile b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
new file mode 100644
index 0000000..e92de89
--- /dev/null
+++ b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
@@ -0,0 +1,13 @@
+FROM findepi/graalvm:java17-native
+
+MAINTAINER Lion Li
+
+RUN mkdir -p /ruoyi/powerjob/logs
+
+WORKDIR /ruoyi/powerjob
+
+EXPOSE 7700
+
+ADD ./target/ruoyi-powerjob-server.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/ruoyi-extend/ruoyi-powerjob-server/pom.xml b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
index 7bac8b1..f771ae9 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
@@ -1,18 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-extend</artifactId>
<version>${revision}</version>
</parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-powerjob-server</artifactId>
- <version>${revision}</version>
+ <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
+ <artifactId>ruoyi-powerjob-server</artifactId>
<properties>
- <spring-boot.version>2.7.4</spring-boot.version>
+ <spring-boot.version>2.7.12</spring-boot.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/PowerJobServerApplication.java b/ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/PowerJobServerApplication.java
new file mode 100644
index 0000000..3898639
--- /dev/null
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/PowerJobServerApplication.java
@@ -0,0 +1,25 @@
+package org.dromara.powerjob;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import tech.powerjob.server.common.utils.PropertyUtils;
+
+/**
+ * powerjob 鍚姩绋嬪簭
+ *
+ * @author yhan219
+ */
+@Slf4j
+@EnableScheduling
+@SpringBootApplication(scanBasePackages = "tech.powerjob.server")
+public class PowerJobServerApplication {
+
+ public static void main(String[] args) {
+ PropertyUtils.init();
+ SpringApplication.run(tech.powerjob.server.PowerJobServerApplication.class, args);
+ log.info("鏂囨。鍦板潃: https://www.yuque.com/powerjob/guidence/problem");
+ }
+
+}
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/server/RuoyiPowerJobServerApplication.java b/ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/server/RuoyiPowerJobServerApplication.java
deleted file mode 100644
index ff8b069..0000000
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/java/org/dromara/powerjob/server/RuoyiPowerJobServerApplication.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.dromara.powerjob.server;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import tech.powerjob.server.PowerJobServerApplication;
-import tech.powerjob.server.common.utils.PropertyUtils;
-
-/**
- * Admin 鐩戞帶鍚姩绋嬪簭
- *
- * @author yhan219
- */
-@Slf4j
-@EnableScheduling
-@SpringBootApplication(scanBasePackages = "tech.powerjob.server")
-public class RuoyiPowerJobServerApplication {
-
- private static final String TIPS = "\n\n" +
- "******************* PowerJob Tips *******************\n" +
- "濡傛灉搴旂敤鏃犳硶鍚姩锛屾垜浠缓璁偍浠旂粏闃呰浠ヤ笅鏂囨。鏉ヨВ鍐�:\n" +
- "if server can't startup, we recommend that you read the documentation to find a solution:\n" +
- "https://www.yuque.com/powerjob/guidence/problem\n" +
- "******************* PowerJob Tips *******************\n\n";
-
- public static void main(String[] args) {
-
- pre();
-
- // Start SpringBoot application.
- try {
- SpringApplication.run(PowerJobServerApplication.class, args);
- } catch (Throwable t) {
- log.error(TIPS);
- throw t;
- }
- }
-
- private static void pre() {
- log.info(TIPS);
- PropertyUtils.init();
- }
-
-}
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-daily.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties
similarity index 96%
rename from ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-daily.properties
rename to ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties
index 5b07eec..b3e342e 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-daily.properties
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties
@@ -1,5 +1,4 @@
-oms.env=DAILY
-logging.config=classpath:logback-dev.xml
+oms.env=dev
####### Database properties(Configure according to the the environment) #######
spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-pre.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-pre.properties
deleted file mode 100644
index f08f673..0000000
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-pre.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-oms.env=PRE
-logging.config=classpath:logback-product.xml
-
-####### Database properties(Configure according to the the environment) #######
-spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-pre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.core.username=root
-spring.datasource.core.password=No1Bug2Please3!
-spring.datasource.core.maximum-pool-size=20
-spring.datasource.core.minimum-idle=5
-
-####### MongoDB properties(Non-core configuration properties) #######
-####### delete mongodb config to disable mongodb #######
-oms.mongodb.enable=true
-spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-pre
-
-####### Email properties(Non-core configuration properties) #######
-####### Delete the following code to disable the mail #######
-spring.mail.host=smtp.qq.com
-spring.mail.username=zqq
-spring.mail.password=qqz
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-
-####### DingTalk properties(Non-core configuration properties) #######
-####### Delete the following code to disable the DingTalk #######
-oms.alarm.ding.app-key=dingauqwkvxxnqskknfv
-oms.alarm.ding.app-secret=XWrEPdAZMPgJeFtHuL0LH73LRj-74umF2_0BFcoXMfvnX0pCQvt0rpb1JOJU_HLl
-oms.alarm.ding.agent-id=847044348
-
-####### Resource cleaning properties #######
-oms.instanceinfo.retention=3
-oms.container.retention.local=3
-oms.container.retention.remote=-1
-
-####### Cache properties #######
-oms.instance.metadata.cache.size=1024
-
-####### Threshold in precise fetching server(0~100). 100 means full detection of server, in which #######
-####### split-brain could be avoided while performance overhead would increase. #######
-oms.accurate.select.server.percentage = 50
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-daily.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties
similarity index 91%
copy from ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-daily.properties
copy to ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties
index 5b07eec..6316e30 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-daily.properties
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties
@@ -1,5 +1,4 @@
-oms.env=DAILY
-logging.config=classpath:logback-dev.xml
+oms.env=prod
####### Database properties(Configure according to the the environment) #######
spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -30,12 +29,12 @@
#oms.alarm.ding.agent-id=847044348
####### Resource cleaning properties #######
-oms.instanceinfo.retention=1
-oms.container.retention.local=1
+oms.instanceinfo.retention=7
+oms.container.retention.local=7
oms.container.retention.remote=-1
####### Cache properties #######
-oms.instance.metadata.cache.size=1024
+oms.instance.metadata.cache.size=2048
####### Threshold in precise fetching server(0~100). 100 means full detection of server, in which #######
####### split-brain could be avoided while performance overhead would increase. #######
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-product.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-product.properties
deleted file mode 100644
index a3ed4fe..0000000
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-product.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-oms.env=PRODUCT
-logging.config=classpath:logback-product.xml
-
-####### Database properties(Configure according to the the environment) #######
-spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.core.username=root
-spring.datasource.core.password=No1Bug2Please3!
-spring.datasource.core.maximum-pool-size=20
-spring.datasource.core.minimum-idle=5
-
-####### MongoDB properties(Non-core configuration properties) #######
-####### delete mongodb config to disable mongodb #######
-oms.mongodb.enable=true
-spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-product
-
-####### Email properties(Non-core configuration properties) #######
-####### Delete the following code to disable the mail #######
-spring.mail.host=smtp.qq.com
-spring.mail.username=zqq
-spring.mail.password=qqz
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-
-####### DingTalk properties(Non-core configuration properties) #######
-####### Delete the following code to disable the DingTalk #######
-oms.alarm.ding.app-key=
-oms.alarm.ding.app-secret=
-oms.alarm.ding.agent-id=
-
-####### Resource cleaning properties #######
-oms.instanceinfo.retention=7
-oms.container.retention.local=7
-oms.container.retention.remote=-1
-
-####### Cache properties #######
-oms.instance.metadata.cache.size=2048
-
-####### Threshold in precise fetching server(0~100). 100 means full detection of server, in which #######
-####### split-brain could be avoided while performance overhead would increase. #######
-oms.accurate.select.server.percentage = 50
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
index 6946a0e..7028499 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
@@ -1,11 +1,12 @@
# Http server port
server.port=7700
-spring.profiles.active=daily
+spring.profiles.active=@profiles.active@
spring.main.banner-mode=log
spring.jpa.open-in-view=false
spring.data.mongodb.repositories.type=none
logging.level.org.mongodb=warn
+logging.config: classpath:logback-plus.xml
# Configuration for uploading files.
spring.servlet.multipart.enabled=true
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/banner.txt
index 82d536a..c0fac79 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/banner.txt
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/banner.txt
@@ -1,15 +1,11 @@
-${AnsiColor.GREEN}
- 鈻堚枅鈻堚枅鈻堚枅鈻� 鈻堚枅 鈻堚枅
-鈻戔枅鈻堚枒鈻戔枒鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
-鈻戔枅鈻� 鈻戔枅鈻� 鈻堚枅鈻堚枅鈻堚枅 鈻堚枅鈻� 鈻堚枅 鈻堚枅鈻堚枅鈻� 鈻堚枅鈻堚枅鈻堚枅 鈻戔枅鈻� 鈻堚枅鈻堚枅鈻堚枅 鈻戔枅鈻�
-鈻戔枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅鈻戔枒鈻戔枒鈻堚枅鈻戔枒鈻堚枅 鈻� 鈻戔枅鈻� 鈻堚枅鈻戔枒鈻戔枅鈻堚枒鈻戔枅鈻堚枒鈻戔枅 鈻戔枅鈻� 鈻堚枅鈻戔枒鈻戔枒鈻堚枅鈻戔枅鈻堚枅鈻堚枅鈻�
-鈻戔枅鈻堚枒鈻戔枒鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻堚枅鈻堚枒鈻堚枅鈻戔枅鈻堚枅鈻堚枅鈻堚枅 鈻戔枅鈻� 鈻� 鈻戔枅鈻堚枒鈻堚枅 鈻戔枅鈻堚枒鈻堚枅鈻戔枒鈻戔枅鈻�
-鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻堚枅鈻堚枒鈻堚枅鈻堚枅鈻戔枅鈻堚枒鈻戔枒鈻� 鈻戔枅鈻� 鈻堚枅 鈻戔枅鈻堚枒鈻堚枅 鈻戔枅鈻堚枒鈻堚枅 鈻戔枅鈻�
-鈻戔枅鈻� 鈻戔枒鈻堚枅鈻堚枅鈻堚枅 鈻堚枅鈻堚枒 鈻戔枒鈻戔枅鈻堚枒鈻戔枅鈻堚枅鈻堚枅鈻堚枒鈻堚枅鈻� 鈻戔枒鈻堚枅鈻堚枅鈻� 鈻戔枒鈻堚枅鈻堚枅鈻堚枅 鈻戔枅鈻堚枅鈻堚枅鈻�
-鈻戔枒 鈻戔枒鈻戔枒鈻戔枒 鈻戔枒鈻� 鈻戔枒鈻� 鈻戔枒鈻戔枒鈻戔枒 鈻戔枒鈻� 鈻戔枒鈻戔枒鈻� 鈻戔枒鈻戔枒鈻戔枒 鈻戔枒鈻戔枒鈻�
-${AnsiColor.BRIGHT_RED}
-* Maintainer: tengjiqi@gmail.com & Team PowerJob
-* OfficialWebsite: http://www.powerjob.tech/
-* SourceCode: https://github.com/PowerJob/PowerJob
-* PoweredBy: SpringBoot${spring-boot.formatted-version}
-${AnsiColor.DEFAULT}
\ No newline at end of file
+Application Version: ${revision}
+Spring Boot Version: ${spring-boot.version}
+ _ _
+ (_) | |
+ _ __ _____ _____ _ __ _ ___ | |__ ______ ___ ___ _ ____ _____ _ __
+| '_ \ / _ \ \ /\ / / _ \ '__| |/ _ \| '_ \______/ __|/ _ \ '__\ \ / / _ \ '__|
+| |_) | (_) \ V V / __/ | | | (_) | |_) | \__ \ __/ | \ V / __/ |
+| .__/ \___/ \_/\_/ \___|_| | |\___/|_.__/ |___/\___|_| \_/ \___|_|
+| | _/ |
+|_| |__/
+
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-dev.xml b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-dev.xml
deleted file mode 100644
index 9951c3b..0000000
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-dev.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!-- Configuration for local environment, all logs would print in console. -->
-<configuration>
- <!-- Configure color for logs. -->
- <!-- Classes for rendering color. -->
- <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
- <conversionRule conversionWord="wex"
- converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
- <conversionRule conversionWord="wEx"
- converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
- <!-- Color log pattern. -->
- <property name="CONSOLE_LOG_PATTERN"
- value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{20}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
- <logger name="MONITOR_LOGGER_DB_OPERATION" level="OFF"/>
-
- <!-- Configuration for console output. -->
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${CONSOLE_LOG_PATTERN}</pattern>
- <charset>utf8</charset>
- </encoder>
- </appender>
-
- <!-- Quit timing logs, which seems disordered. -->
- <logger name="tech.powerjob.server.service.timing" level="WARN" additivity="false">
- <appender-ref ref="CONSOLE"/>
- </logger>
-
- <logger name="tech.powerjob" level="DEBUG" additivity="false">
- <appender-ref ref="CONSOLE"/>
- </logger>
-
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml
new file mode 100644
index 0000000..658aeb0
--- /dev/null
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <property name="log.path" value="./logs"/>
+ <property name="console.log.pattern"
+ value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+ <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+ <!-- include other logback configs -->
+ <include resource="logback-config/powerjob_monitor.xml"/>
+
+ <!-- 鎺у埗鍙拌緭鍑� -->
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${console.log.pattern}</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <!-- 鎺у埗鍙拌緭鍑� -->
+ <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-console.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
+ <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶� 1澶� -->
+ <maxHistory>1</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <!-- 杩囨护鐨勭骇鍒� -->
+ <level>INFO</level>
+ </filter>
+ </appender>
+
+ <!-- 绯荤粺鏃ュ織杈撳嚭 -->
+ <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-info.log</file>
+ <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
+ <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!-- 杩囨护鐨勭骇鍒� -->
+ <level>INFO</level>
+ <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
+ <onMatch>ACCEPT</onMatch>
+ <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-error.log</file>
+ <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
+ <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!-- 杩囨护鐨勭骇鍒� -->
+ <level>ERROR</level>
+ <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
+ <onMatch>ACCEPT</onMatch>
+ <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- info寮傛杈撳嚭 -->
+ <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
+ <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
+ <discardingThreshold>0</discardingThreshold>
+ <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
+ <queueSize>512</queueSize>
+ <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
+ <appender-ref ref="file_info"/>
+ </appender>
+
+ <!-- error寮傛杈撳嚭 -->
+ <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
+ <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
+ <discardingThreshold>0</discardingThreshold>
+ <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
+ <queueSize>512</queueSize>
+ <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
+ <appender-ref ref="file_error"/>
+ </appender>
+
+ <!-- 鏁村悎 skywalking 鎺у埗鍙拌緭鍑� tid -->
+<!-- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
+<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+<!-- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+<!-- <pattern>[%tid] ${console.log.pattern}</pattern>-->
+<!-- </layout>-->
+<!-- <charset>utf-8</charset>-->
+<!-- </encoder>-->
+<!-- </appender>-->
+
+ <!-- 鏁村悎 skywalking 鎺ㄩ�侀噰闆嗘棩蹇� -->
+<!-- <appender name="sky_log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">-->
+<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+<!-- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+<!-- <pattern>[%tid] ${console.log.pattern}</pattern>-->
+<!-- </layout>-->
+<!-- <charset>utf-8</charset>-->
+<!-- </encoder>-->
+<!-- </appender>-->
+
+ <!--绯荤粺鎿嶄綔鏃ュ織-->
+ <root level="info">
+ <appender-ref ref="console" />
+ <appender-ref ref="async_info" />
+ <appender-ref ref="async_error" />
+ <appender-ref ref="file_console" />
+<!-- <appender-ref ref="sky_log"/>-->
+ </root>
+
+</configuration>
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-product.xml b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-product.xml
deleted file mode 100644
index 80be04f..0000000
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-product.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!-- Configuration for production environment. -->
-<configuration>
-
- <!-- Default configuration. -->
- <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
- <!-- Configuration for console. -->
- <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-
- <!--
- Log path, pay attention to permission, logs may be unable to generate.
- Bug recording: Setting `~/logs`, is unable to create folder in user home directory,
- a folder with the name ~ is created in project folder.
- -->
- <property name="LOG_PATH" value="${user.home}/powerjob/server/logs"/>
-
- <!-- include other logback configs -->
- <include resource="logback-config/powerjob_monitor.xml"/>
-
- <!-- Configuration for ERROR logs. All error logs will write twice. -->
- <appender name="ERROR_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_PATH}/powerjob-server-error.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/powerjob-server-error.%d{yyyy-MM-dd}.log</FileNamePattern>
- <MaxHistory>7</MaxHistory>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
- <!-- End of configuration for ERROR logs. -->
-
- <!-- Configuration for Web services. -->
- <appender name="WEB_LOG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_PATH}/powerjob-server-web.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/powerjob-server-web.%d{yyyy-MM-dd}.log</FileNamePattern>
- <MaxHistory>7</MaxHistory>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <append>true</append>
- </appender>
- <logger name="WEB_LOG" level="INFO" additivity="false">
- <appender-ref ref="WEB_LOG_APPENDER"/>
- </logger>
- <!-- End of configuration for Web services. -->
-
- <!-- Configuration for system logs. -->
- <appender name="DEFAULT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_PATH}/powerjob-server-application.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/powerjob-server-application.%d{yyyy-MM-dd}.log</FileNamePattern>
- <MaxHistory>7</MaxHistory>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <append>true</append>
- </appender>
- <!-- End of configuration for system logs. -->
-
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="DEFAULT_APPENDER"/>
- <appender-ref ref="ERROR_APPENDER"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 2fd78e9..2431a1c 100644
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -20,15 +20,14 @@
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
+ <artifactId>ruoyi-common-json</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-job</artifactId>
</dependency>
-
-
+
</dependencies>
</project>
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapProcessorDemo.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapProcessorDemo.java
index bb5529b..720d333 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapProcessorDemo.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapProcessorDemo.java
@@ -4,8 +4,8 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
+import org.dromara.common.json.utils.JsonUtils;
import org.springframework.stereotype.Component;
-import tech.powerjob.common.serialize.JsonUtils;
import tech.powerjob.worker.core.processor.ProcessResult;
import tech.powerjob.worker.core.processor.TaskContext;
import tech.powerjob.worker.core.processor.sdk.MapProcessor;
@@ -37,7 +37,7 @@
log.info("============== MapProcessorDemo#process ==============");
log.info("isRootTask:{}", isRootTask());
- log.info("taskContext:{}", JsonUtils.toJSONString(context));
+ log.info("taskContext:{}", JsonUtils.toJsonString(context));
if (isRootTask()) {
log.info("==== MAP ====");
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapReduceProcessorDemo.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapReduceProcessorDemo.java
index 0d02e8d..1498854 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapReduceProcessorDemo.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/processors/MapReduceProcessorDemo.java
@@ -1,15 +1,14 @@
package org.dromara.job.processors;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import cn.hutool.core.lang.Dict;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.json.utils.JsonUtils;
import org.springframework.stereotype.Component;
-import tech.powerjob.common.serialize.JsonUtils;
import tech.powerjob.worker.core.processor.ProcessResult;
import tech.powerjob.worker.core.processor.TaskContext;
import tech.powerjob.worker.core.processor.TaskResult;
@@ -37,10 +36,10 @@
log.info("============== TestMapReduceProcessor#process ==============");
log.info("isRootTask:{}", isRootTask());
- log.info("taskContext:{}", JsonUtils.toJSONString(context));
+ log.info("taskContext:{}", JsonUtils.toJsonString(context));
// 鏍规嵁鎺у埗鍙板弬鏁拌幏鍙朚R鎵规鍙婂瓙浠诲姟澶у皬
- final JSONObject jobParams = JSONObject.parseObject(context.getJobParams());
+ final Dict jobParams = JsonUtils.parseMap(context.getJobParams());
Integer batchSize = (Integer) jobParams.getOrDefault("batchSize", 100);
Integer batchNum = (Integer) jobParams.getOrDefault("batchNum", 10);
@@ -61,8 +60,8 @@
return new ProcessResult(true, "MAP_SUCCESS");
} else {
log.info("==== NORMAL_PROCESS ====");
- omsLogger.info("[DemoMRProcessor] process subTask: {}.", JSON.toJSONString(context.getSubTask()));
- log.info("subTask: {}", JsonUtils.toJSONString(context.getSubTask()));
+ omsLogger.info("[DemoMRProcessor] process subTask: {}.", JsonUtils.toJsonString(context.getSubTask()));
+ log.info("subTask: {}", JsonUtils.toJsonString(context.getSubTask()));
Thread.sleep(1000);
if (context.getCurrentRetryTimes() == 0) {
return new ProcessResult(false, "FIRST_FAILED");
@@ -75,8 +74,8 @@
@Override
public ProcessResult reduce(TaskContext context, List<TaskResult> taskResults) {
log.info("================ MapReduceProcessorDemo#reduce ================");
- log.info("TaskContext: {}", JSONObject.toJSONString(context));
- log.info("List<TaskResult>: {}", JSONObject.toJSONString(taskResults));
+ log.info("TaskContext: {}", JsonUtils.toJsonString(context));
+ log.info("List<TaskResult>: {}", JsonUtils.toJsonString(taskResults));
context.getOmsLogger().info("MapReduce job finished, result is {}.", taskResults);
boolean success = ThreadLocalRandom.current().nextBoolean();
diff --git a/script/sql/powerjob_demo.sql b/script/sql/powerjob_demo.sql
index 2e9738a..eb81601 100644
--- a/script/sql/powerjob_demo.sql
+++ b/script/sql/powerjob_demo.sql
@@ -1,4 +1,4 @@
-INSERT INTO `pj_app_info` (`id`, `app_name`, `current_server`, `gmt_create`, `gmt_modified`, `password`) VALUES (1, 'ruoyi-worker', '192.168.31.80:10010', '2023-06-13 16:32:59.263000', '2023-06-13 16:33:29.898000', 'ruoyi-worker');
+INSERT INTO `pj_app_info` (`id`, `app_name`, `current_server`, `gmt_create`, `gmt_modified`, `password`) VALUES (1, 'ruoyi-worker', '192.168.31.80:10010', '2023-06-13 16:32:59.263000', '2023-06-13 16:33:29.898000', '123456');
INSERT INTO `pj_job_info` (`id`, `alarm_config`, `app_id`, `concurrency`, `designated_workers`, `dispatch_strategy`, `execute_type`, `extra`, `gmt_create`, `gmt_modified`, `instance_retry_num`, `instance_time_limit`, `job_description`, `job_name`, `job_params`, `lifecycle`, `log_config`, `max_instance_num`, `max_worker_count`, `min_cpu_cores`, `min_disk_space`, `min_memory_space`, `next_trigger_time`, `notify_user_ids`, `processor_info`, `processor_type`, `status`, `tag`, `task_retry_num`, `time_expression`, `time_expression_type`) VALUES (1, '{\"alertThreshold\":0,\"silenceWindowLen\":0,\"statisticWindowLen\":0}', 1, 5, '', 2, 1, NULL, '2023-06-02 15:01:27.717000', '2023-06-02 16:03:19.462000', 1, 0, '', '鍗曟満澶勭悊鍣ㄦ墽琛屾祴璇�', NULL, '{}', '{\"type\":1}', 0, 0, 0, 0, 0, NULL, NULL, 'org.dromara.job.processors.StandaloneProcessorDemo', 1, 1, NULL, 1, '30000', 3);
INSERT INTO `pj_job_info` (`id`, `alarm_config`, `app_id`, `concurrency`, `designated_workers`, `dispatch_strategy`, `execute_type`, `extra`, `gmt_create`, `gmt_modified`, `instance_retry_num`, `instance_time_limit`, `job_description`, `job_name`, `job_params`, `lifecycle`, `log_config`, `max_instance_num`, `max_worker_count`, `min_cpu_cores`, `min_disk_space`, `min_memory_space`, `next_trigger_time`, `notify_user_ids`, `processor_info`, `processor_type`, `status`, `tag`, `task_retry_num`, `time_expression`, `time_expression_type`) VALUES (2, '{\"alertThreshold\":0,\"silenceWindowLen\":0,\"statisticWindowLen\":0}', 1, 5, '', 1, 2, NULL, '2023-06-02 15:04:45.342000', '2023-06-02 16:04:09.736000', 0, 0, NULL, '骞挎挱澶勭悊鍣ㄦ祴璇�', NULL, '{}', '{\"type\":1}', 0, 0, 0, 0, 0, NULL, NULL, 'org.dromara.job.processors.BroadcastProcessorDemo', 1, 1, NULL, 1, '30000', 3);
INSERT INTO `pj_job_info` (`id`, `alarm_config`, `app_id`, `concurrency`, `designated_workers`, `dispatch_strategy`, `execute_type`, `extra`, `gmt_create`, `gmt_modified`, `instance_retry_num`, `instance_time_limit`, `job_description`, `job_name`, `job_params`, `lifecycle`, `log_config`, `max_instance_num`, `max_worker_count`, `min_cpu_cores`, `min_disk_space`, `min_memory_space`, `next_trigger_time`, `notify_user_ids`, `processor_info`, `processor_type`, `status`, `tag`, `task_retry_num`, `time_expression`, `time_expression_type`) VALUES (3, '{\"alertThreshold\":0,\"silenceWindowLen\":0,\"statisticWindowLen\":0}', 1, 5, '', 1, 4, NULL, '2023-06-02 15:13:23.519000', '2023-06-02 16:03:22.421000', 0, 0, NULL, 'Map澶勭悊鍣ㄦ祴璇�', NULL, '{}', '{\"type\":1}', 0, 0, 0, 0, 0, NULL, NULL, 'org.dromara.job.processors.MapProcessorDemo', 1, 2, NULL, 1, '1000', 3);
diff --git a/script/sql/update/oracle/update_5.0-5.1.sql b/script/sql/update/oracle/update_5.0-5.1.sql
index 69fccd6..551e975 100644
--- a/script/sql/update/oracle/update_5.0-5.1.sql
+++ b/script/sql/update/oracle/update_5.0-5.1.sql
@@ -1,3 +1,5 @@
ALTER TABLE gen_table ADD (data_name VARCHAR2(200) DEFAULT '');
COMMENT ON COLUMN gen_table.data_name IS '鏁版嵁婧愬悕绉�';
+
+UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob鎺у埗鍙拌彍鍗�' WHERE menu_id = 120;
diff --git a/script/sql/update/postgres/update_5.0-5.1.sql b/script/sql/update/postgres/update_5.0-5.1.sql
index f802788..4fa7f2d 100644
--- a/script/sql/update/postgres/update_5.0-5.1.sql
+++ b/script/sql/update/postgres/update_5.0-5.1.sql
@@ -1,3 +1,5 @@
ALTER TABLE gen_table ADD data_name varchar(200) default ''::varchar;
COMMENT ON COLUMN gen_table.data_name IS '鏁版嵁婧愬悕绉�';
+
+UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob鎺у埗鍙拌彍鍗�' WHERE menu_id = 120;
diff --git a/script/sql/update/sqlserver/update_5.0-5.1.sql b/script/sql/update/sqlserver/update_5.0-5.1.sql
index 8fd249f..835ca20 100644
--- a/script/sql/update/sqlserver/update_5.0-5.1.sql
+++ b/script/sql/update/sqlserver/update_5.0-5.1.sql
@@ -7,3 +7,6 @@
'TABLE', N'gen_table',
'COLUMN', N'data_name'
GO
+
+UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob鎺у埗鍙拌彍鍗�' WHERE menu_id = 120
+GO
diff --git a/script/sql/update/update_5.0-5.1.sql b/script/sql/update/update_5.0-5.1.sql
index 897fb4c..2959520 100644
--- a/script/sql/update/update_5.0-5.1.sql
+++ b/script/sql/update/update_5.0-5.1.sql
@@ -1 +1,3 @@
ALTER TABLE gen_table ADD COLUMN data_name varchar(200) NULL DEFAULT '' COMMENT '鏁版嵁婧愬悕绉�' AFTER table_id;
+
+UPDATE sys_menu SET path = 'powerjob', component = 'monitor/powerjob/index', perms = 'monitor:powerjob:list', remark = 'powerjob鎺у埗鍙拌彍鍗�' WHERE menu_id = 120
--
Gitblit v1.9.3