From 47af02a912c8d6441d5bcca97db71d378daf48ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 11 Apr 2020 15:31:44 +0800 Subject: [PATCH 01/11] :bookmark: Releasing / Version tags. 3.8.0 :bookmark: Releasing / Version tags. 3.8.0 --- docker-compose.yml | 2 +- pigx-auth/pom.xml | 2 +- pigx-common/pigx-common-bom/pom.xml | 4 +- pigx-common/pigx-common-core/pom.xml | 2 +- pigx-common/pigx-common-data/pom.xml | 2 +- pigx-common/pigx-common-datasource/pom.xml | 2 +- pigx-common/pigx-common-feign/pom.xml | 2 +- pigx-common/pigx-common-gateway/pom.xml | 2 +- pigx-common/pigx-common-gray/pom.xml | 2 +- pigx-common/pigx-common-job/pom.xml | 2 +- pigx-common/pigx-common-log/pom.xml | 2 +- pigx-common/pigx-common-minio/pom.xml | 2 +- pigx-common/pigx-common-security/pom.xml | 2 +- pigx-common/pigx-common-sentinel/pom.xml | 2 +- pigx-common/pigx-common-sequence/pom.xml | 2 +- pigx-common/pigx-common-swagger/pom.xml | 2 +- pigx-common/pigx-common-transaction/pom.xml | 2 +- pigx-common/pom.xml | 2 +- pigx-gateway/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-register/pom.xml | 2 +- pigx-upms/pigx-upms-api/pom.xml | 2 +- pigx-upms/pigx-upms-biz/pom.xml | 2 +- pigx-upms/pom.xml | 2 +- pigx-visual/pigx-codegen/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-visual/pigx-daemon-elastic-job/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-visual/pigx-daemon-quartz/pom.xml | 2 +- pigx-visual/pigx-monitor/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-visual/pigx-mp-platform/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-visual/pigx-oa-platform/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-visual/pigx-pay-platform/pom.xml | 2 +- pigx-visual/pigx-sentinel-dashboard/pom.xml | 2 +- pigx-visual/pigx-sso-client-demo/pom.xml | 2 +- pigx-visual/pigx-tx-manager/pom.xml | 2 +- .../src/main/resources/logback-spring.xml | 87 +++++++++++++++++++ pigx-visual/pom.xml | 2 +- pom.xml | 2 +- 42 files changed, 645 insertions(+), 36 deletions(-) create mode 100644 pigx-gateway/src/main/resources/logback-spring.xml create mode 100644 pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml create mode 100644 pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml create mode 100644 pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml create mode 100644 pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml create mode 100644 pigx-visual/pigx-oa-platform/src/main/resources/logback-spring.xml create mode 100644 pigx-visual/pigx-tx-manager/src/main/resources/logback-spring.xml diff --git a/docker-compose.yml b/docker-compose.yml index 7c2beeb21..9374d51ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -# 使用说明 V3.7.0 +# 使用说明 V3.8.0 # 1. 使用docker-compose 宿主机不需要配置host来发现 # 2. 无需修改源码，根目录 docker-compose up 即可 # 3. 静静等待服务启动 diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index a22bc5a7a..6870cbda8 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-auth diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 0c3ac8634..0075d27d3 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -6,7 +6,7 @@ pigx-cloud-dependencies-parent com.pig4cloud - Hoxton.SR2 + Hoxton.SR3 @@ -17,7 +17,7 @@ pigx 公共版本控制 - 3.8.0.BUILD-SNAPSHOT + 3.8.0 3.3.1 3.0.0 1.1.21 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 084dada03..457f88467 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index fe15dec66..c001743d5 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 9939cfb2a..a5b239680 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 3.8.0.BUILD-SNAPSHOT + 3.8.0 4.0.0 diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index f8abf6e20..121b839a7 100755 --- a/pigx-common/pigx-common-feign/pom.xml +++ b/pigx-common/pigx-common-feign/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index 7ff016d96..1081eecbe 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index e4e9fa72b..86f0dfdc4 100644 --- a/pigx-common/pigx-common-gray/pom.xml +++ b/pigx-common/pigx-common-gray/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-gray diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index c788784af..d170ecf9f 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 24df9e0e8..f7a1a9545 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-log diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml index 070a0919b..653e3ea18 100755 --- a/pigx-common/pigx-common-minio/pom.xml +++ b/pigx-common/pigx-common-minio/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-minio diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 124da511c..f029ee442 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 923ffc88c..cf1821694 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 02b35bbdb..51842ad2a 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 872fbc7a4..fdc0ea89b 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 368bd20a6..5540e2eed 100644 --- a/pigx-common/pigx-common-transaction/pom.xml +++ b/pigx-common/pigx-common-transaction/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common-transaction diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 0edb67b4e..c72b88ae1 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-common diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index ec25e46b4..2adf63193 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-gateway diff --git a/pigx-gateway/src/main/resources/logback-spring.xml b/pigx-gateway/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-gateway/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index ac22eca49..62f3e0979 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index c061c349c..e25a6c7a5 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 3300a5188..f842ee1a1 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index c2576ae40..19dda991b 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-upms diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 6ecaee12b..7a7c09fc5 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-codegen diff --git a/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml b/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 3c7a80849..b42662148 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index 31afb1ae9..1d283cd42 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 4.0.0 diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 73fc5bf39..8dc237e88 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-monitor diff --git a/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml b/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index b12fb60e5..31529eb22 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-mp-platform diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index c999de93b..a7f3234fb 100644 --- a/pigx-visual/pigx-oa-platform/pom.xml +++ b/pigx-visual/pigx-oa-platform/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-oa-platform diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-oa-platform/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-visual/pigx-oa-platform/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 39b7afb45..27bcf0e48 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-pay-platform diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index 5dfefe461..b1519f7c0 100755 --- a/pigx-visual/pigx-sentinel-dashboard/pom.xml +++ b/pigx-visual/pigx-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-sentinel-dashboard diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index 7a3a25fb2..86b03d7b8 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -29,7 +29,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index f9a25fd77..569d90215 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-tx-manager diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/logback-spring.xml b/pigx-visual/pigx-tx-manager/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..998f18b5c --- /dev/null +++ b/pigx-visual/pigx-tx-manager/src/main/resources/logback-spring.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + + + diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 09b5c7aaa..56fd5df01 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 pigx-visual diff --git a/pom.xml b/pom.xml index 5312a3e7f..054c9944a 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.8.0.BUILD-SNAPSHOT + 3.8.0 ${project.artifactId} pom From 96e0aa80e9bb322746bf0b47bcdb14d695bb9925 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 15 Apr 2020 22:09:01 +0800 Subject: [PATCH 02/11] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.?= =?UTF-8?q?=E5=8D=87=E7=BA=A7xxl-job2.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/4pigxx_job.sql | 15 +++----------- db/6pigxx_config.sql | 2 +- .../common/job/XxlJobAutoConfiguration.java | 5 ++++- .../job/properties/XxlExecutorProperties.java | 9 ++++++++- .../job/{DemoJobHandler.java => DemoJob.java} | 14 ++++++------- .../resources/mapper/ExecutionLogMapper.xml | 20 ------------------- .../resources/mapper/StatusTraceLogMapper.xml | 20 ------------------- pom.xml | 4 ++-- 8 files changed, 24 insertions(+), 65 deletions(-) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/{DemoJobHandler.java => DemoJob.java} (84%) delete mode 100644 pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml delete mode 100644 pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml diff --git a/db/4pigxx_job.sql b/db/4pigxx_job.sql index 412825e15..4fb89347c 100644 --- a/db/4pigxx_job.sql +++ b/db/4pigxx_job.sql @@ -282,7 +282,7 @@ CREATE TABLE `xxl_job_group` ( -- Records of xxl_job_group -- ---------------------------- BEGIN; -INSERT INTO `xxl_job_group` VALUES (1, 'xxl-job-executor-sample', '示例执行器', 1, 0, NULL); +INSERT INTO `xxl_job_group` VALUES (1, 'xxl-job-executor', '示例执行器', 1, 0, NULL); COMMIT; -- ---------------------------- @@ -319,7 +319,7 @@ CREATE TABLE `xxl_job_info` ( -- Records of xxl_job_info -- ---------------------------- BEGIN; -INSERT INTO `xxl_job_info` VALUES (1, 1, '0 0 0 * * ? *', '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '', 0, 0, 0); +INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`, `trigger_status`, `trigger_last_time`, `trigger_next_time`) VALUES (1, 1, '0 0 0 * * ? *', '测试任务1', '2018-11-03 22:21:31', '2020-04-15 13:58:35', 'lengleng', '', 'ROUND', 'demoJobHandler', '', 'DISCARD_LATER', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '', 0, 0, 0); COMMIT; -- ---------------------------- @@ -375,16 +375,7 @@ CREATE TABLE `xxl_job_log_report` ( `fail_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', PRIMARY KEY (`id`), UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of xxl_job_log_report --- ---------------------------- -BEGIN; -INSERT INTO `xxl_job_log_report` VALUES (1, '2019-12-09 00:00:00', 0, 0, 0); -INSERT INTO `xxl_job_log_report` VALUES (2, '2019-12-08 00:00:00', 0, 0, 0); -INSERT INTO `xxl_job_log_report` VALUES (3, '2019-12-07 00:00:00', 0, 0, 0); -COMMIT; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -- ---------------------------- -- Table structure for xxl_job_logglue diff --git a/db/6pigxx_config.sql b/db/6pigxx_config.sql index bccfae29e..4441ba0ef 100644 --- a/db/6pigxx_config.sql +++ b/db/6pigxx_config.sql @@ -35,7 +35,7 @@ BEGIN; INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'jasypt:\n encryptor:\n password: pigx\n \nspring:\n redis:\n host: pigx-redis\n servlet:\n multipart:\n max-file-size: 100MB\n max-request-size: 100MB\n cloud:\n sentinel:\n eager: true\n filter:\n url-patterns: /** \n transport:\n dashboard: pigx-sentinel:5020\n \nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n#开启灰度\ngray:\n rule:\n enabled: true\n\nmybatis-plus:\n tenant-enable: ture\n mapper-locations: classpath:/mapper/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: auto\n field-strategy: NOT_EMPTY\n type-handlers-package: com.pig4cloud.pigx.common.data.handler\n\nswagger:\n title: PigX Swagger API\n license: Powered By PigX\n licenseUrl: https://pig4cloud.com/\n terms-of-service-url: https://pig4cloud.com/\n contact:\n email: wangiegie@gmail.com\n url: https://pig4cloud.com/about.html\n authorization:\n name: pigX OAuth\n auth-regex: ^.*$\n authorization-scope-list:\n - scope: server\n description: server all\n token-url-list:\n - http://${GATEWAY_HOST:pigx-gateway}:${GATEWAY_PORT:9999}/auth/oauth/token\n\nsecurity:\n oauth2:\n client:\n ignore-urls:\n - /actuator/**\n - /v2/api-docs\n resource:\n loadBalanced: true\n token-info-uri: http://pigx-auth/oauth/check_token', '954b56ac77f2691529aad5c497591b28', '2019-04-18 02:10:20', '2020-02-24 13:58:21', NULL, '172.17.0.125', '', '', '通用配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n freemarker:\n allow-request-override: false\n allow-session-override: false\n cache: true\n charset: UTF-8\n check-template-location: true\n content-type: text/html\n enabled: true\n expose-request-attributes: false\n expose-session-attributes: false\n expose-spring-macro-helpers: true\n prefer-file-system-access: true\n suffix: .ftl\n template-loader-path: classpath:/templates/', 'a6674e6747c1a0bb6c6d78e13706f8f0', '2019-04-18 02:11:32', '2019-08-27 18:24:04', NULL, '127.0.0.1', '', '', '认证中心配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\npigx:\n tenant:\n column: tenant_id\n tables:\n - gen_datasource_conf', 'b7d132a3ecdfac4252c994adbb65b23a', '2019-04-18 02:12:10', '2019-08-27 18:24:18', NULL, '127.0.0.1', '', '', '代码生成', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nxxl:\n job:\n admin:\n addresses: http://${XXL-HOST:pigx-xxl}:${XXL-HOST:9080}/xxl-job-admin\n executor:\n port: 9988\n appName: test-xxl', '9ce58242d57b57f737dcb59a41ee6e55', '2019-04-18 02:12:57', '2019-10-04 11:22:56', NULL, '127.0.0.1', '', '', '定时任务-elastic-job配置', 'null', 'null', 'yaml', 'null'); +INSERT INTO `config_info` VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nxxl:\n job:\n admin:\n addresses: http://${XXL_HOST:pigx-xxl}:${XXL_HOST:9080}/xxl-job-admin', 'af2d24afd75cbd73c3bbc8297ca65bc9', '2019-04-18 02:12:57', '2020-04-15 21:56:37', NULL, '127.0.0.1', '', '', '定时任务-elastic-job配置', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'security:\n encode:\n key: \'pigxpigxpigxpigx\'\n\nignore:\n clients:\n - test\n swagger-providers:\n - pigx-auth\n - pigx-tx-manager\n\nribbon:\n rule:\n gray-enabled: true', '24403a5b205b1e9d320078e309584bbc', '2019-04-18 02:13:52', '2019-10-20 17:07:42', NULL, '127.0.0.1', '', '', '网关配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx\n password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n boot:\n admin:\n ui:\n title: \'pigx 服务状态监控\'\n brand: \'pigx 服务状态监控\'\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: ALWAYS #显示详细信息', '7925a0c734460526262319b6a189e39d', '2019-04-18 02:14:17', '2019-12-31 19:04:00', NULL, '172.17.0.157', '', '', '监控配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n scope: server\n ignore-urls:\n - /druid/**\n - /actuator/**\n - /v2/api-docs\n\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n stat-view-servlet:\n enabled: true\n url-pattern: /druid/*\n #login-username: admin\n #login-password: admin\n filter:\n stat:\n enabled: true\n log-slow-sql: true\n slow-sql-millis: 10000\n merge-sql: false\n wall:\n config:\n multi-statement-allow: true\n\n# 文件系统 (提供测试环境，不要乱传)\nminio:\n url: http://minio.pig4cloud.com\n access-key: lengleng\n secret-key: lengleng\n\n# Logger Config\nlogging:\n level:\n com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_user\n - sys_role\n - sys_menu\n - sys_dept\n - sys_log\n - sys_social_details\n - sys_dict\n - sys_dict_item\n - sys_public_param\n - sys_log\n - sys_file\n - sys_oauth_client_details', 'fab3a6b4cb292954d9841b22a41e3dab', '2019-04-18 02:32:44', '2019-11-01 12:22:38', NULL, '127.0.0.1', '', '', 'admin 服务配置', 'null', 'null', 'yaml', 'null'); diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java index 443b22b73..8f6361b95 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java @@ -20,6 +20,7 @@ package com.pig4cloud.pigx.common.job; import com.pig4cloud.pigx.common.job.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -34,10 +35,12 @@ import org.springframework.context.annotation.Configuration; @ComponentScan("com.pig4cloud.pigx.common.job.properties") public class XxlJobAutoConfiguration { + @Bean public XxlJobSpringExecutor xxlJobSpringExecutor(XxlJobProperties xxlJobProperties) { XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); xxlJobSpringExecutor.setAdminAddresses(xxlJobProperties.getAdmin().getAddresses()); - xxlJobSpringExecutor.setAppName(xxlJobProperties.getExecutor().getAppName()); + xxlJobSpringExecutor.setAppname(xxlJobProperties.getExecutor().getAppname()); + xxlJobSpringExecutor.setAddress(xxlJobProperties.getExecutor().getAddress()); xxlJobSpringExecutor.setIp(xxlJobProperties.getExecutor().getIp()); xxlJobSpringExecutor.setPort(xxlJobProperties.getExecutor().getPort()); xxlJobSpringExecutor.setAccessToken(xxlJobProperties.getExecutor().getAccessToken()); diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java index 09f56cec7..405998b14 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java @@ -28,7 +28,14 @@ public class XxlExecutorProperties { /** * 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 */ - private String appName = "xxl-job-executor"; + private String appname = "xxl-job-executor"; + + /** + * 服务注册地址,优先使用该配置作为注册地址 + * 为空时使用内嵌服务 ”IP:PORT“ 作为注册地址 + * 从而更灵活的支持容器类型执行器动态IP和动态映射端口问题 + */ + private String address; /** * 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/DemoJobHandler.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/DemoJob.java similarity index 84% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/DemoJobHandler.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/DemoJob.java index 7f8c2b957..fc3ca49a6 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/DemoJobHandler.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/DemoJob.java @@ -18,27 +18,25 @@ package com.pig4cloud.pigx.daemon.elastic.job; import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.IJobHandler; -import com.xxl.job.core.handler.annotation.JobHandler; +import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.log.XxlJobLogger; import com.xxl.job.core.util.ShardingUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + /** * @author lengleng * @date 2019-09-18 */ @Slf4j @Component -@JobHandler("demoJobHandler") -public class DemoJobHandler extends IJobHandler { +public class DemoJob { - @Override - public ReturnT execute(String s) { + @XxlJob("demoJobHandler") + public ReturnT demoJobHandler(String s) { ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo(); - - XxlJobLogger.log("This is a demo job." + shardingVO); return SUCCESS; } diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml deleted file mode 100644 index 81088fdfb..000000000 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml deleted file mode 100644 index 98fa36a18..000000000 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 66300f23d..1ecbd0fec 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,8 @@ 4.1.0 2.1.1 2.11.2 - 6.0.11 - 2.1.1 + 6.0.13 + 2.2.0 2.3.6.RELEASE 5.22.0 172.17.0.111 From 7e91c816f090c8879c6fb12580eadce4d1d9bc47 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 15 Apr 2020 22:13:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.?= =?UTF-8?q?=E5=8D=87=E7=BA=A7xxl-job2.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9374d51ef..239af71fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: pigx-xxl: container_name: pigx-xxl - image: pig4cloud/xxl-job-admin:2.1.1 + image: pig4cloud/xxl-job-admin:2.2.0 restart: always environment: PARAMS: "--server.port=9080 --spring.datasource.url=jdbc:mysql://pigx-mysql:3306/pigxx_job?Unicode=true&characterEncoding=UTF-8 --spring.datasource.username=root --spring.datasource.password=root" From 7b5a465065c6f6eec391c0215be95f9c1a1c46db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 15 Apr 2020 23:01:06 +0800 Subject: [PATCH 04/11] =?UTF-8?q?:whale:=20Work=20about=20Docker.=20?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20xxl-job=20=E7=9A=84docker=20=E5=9D=90?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 239af71fe..8d150d272 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: pigx-xxl: container_name: pigx-xxl - image: pig4cloud/xxl-job-admin:2.2.0 + image: xuxueli/xxl-job-admin:2.2.0 restart: always environment: PARAMS: "--server.port=9080 --spring.datasource.url=jdbc:mysql://pigx-mysql:3306/pigxx_job?Unicode=true&characterEncoding=UTF-8 --spring.datasource.username=root --spring.datasource.password=root" From fa7fe40ddae26fee6b02eec25380ef7c6e19f1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 16 Apr 2020 10:23:34 +0800 Subject: [PATCH 05/11] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96.=20=E4=BC=98=E5=8C=96=E5=A2=9E=E9=87=8F=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/增量3.7_3.8.sql | 525 +-------------------------------------------- 1 file changed, 11 insertions(+), 514 deletions(-) diff --git a/db/增量3.7_3.8.sql b/db/增量3.7_3.8.sql index 56297a6a6..f1aa5545a 100644 --- a/db/增量3.7_3.8.sql +++ b/db/增量3.7_3.8.sql @@ -35,7 +35,7 @@ BEGIN; INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'jasypt:\n encryptor:\n password: pigx\n \nspring:\n redis:\n host: pigx-redis\n servlet:\n multipart:\n max-file-size: 100MB\n max-request-size: 100MB\n cloud:\n sentinel:\n eager: true\n filter:\n url-patterns: /** \n transport:\n dashboard: pigx-sentinel:5020\n \nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n#开启灰度\ngray:\n rule:\n enabled: true\n\nmybatis-plus:\n tenant-enable: ture\n mapper-locations: classpath:/mapper/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: auto\n field-strategy: NOT_EMPTY\n type-handlers-package: com.pig4cloud.pigx.common.data.handler\n\nswagger:\n title: PigX Swagger API\n license: Powered By PigX\n licenseUrl: https://pig4cloud.com/\n terms-of-service-url: https://pig4cloud.com/\n contact:\n email: wangiegie@gmail.com\n url: https://pig4cloud.com/about.html\n authorization:\n name: pigX OAuth\n auth-regex: ^.*$\n authorization-scope-list:\n - scope: server\n description: server all\n token-url-list:\n - http://${GATEWAY_HOST:pigx-gateway}:${GATEWAY_PORT:9999}/auth/oauth/token\n\nsecurity:\n oauth2:\n client:\n ignore-urls:\n - /actuator/**\n - /v2/api-docs\n resource:\n loadBalanced: true\n token-info-uri: http://pigx-auth/oauth/check_token', '954b56ac77f2691529aad5c497591b28', '2019-04-18 02:10:20', '2020-02-24 13:58:21', NULL, '172.17.0.125', '', '', '通用配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n freemarker:\n allow-request-override: false\n allow-session-override: false\n cache: true\n charset: UTF-8\n check-template-location: true\n content-type: text/html\n enabled: true\n expose-request-attributes: false\n expose-session-attributes: false\n expose-spring-macro-helpers: true\n prefer-file-system-access: true\n suffix: .ftl\n template-loader-path: classpath:/templates/', 'a6674e6747c1a0bb6c6d78e13706f8f0', '2019-04-18 02:11:32', '2019-08-27 18:24:04', NULL, '127.0.0.1', '', '', '认证中心配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\npigx:\n tenant:\n column: tenant_id\n tables:\n - gen_datasource_conf', 'b7d132a3ecdfac4252c994adbb65b23a', '2019-04-18 02:12:10', '2019-08-27 18:24:18', NULL, '127.0.0.1', '', '', '代码生成', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nxxl:\n job:\n admin:\n addresses: http://${XXL-HOST:pigx-xxl}:${XXL-HOST:9080}/xxl-job-admin\n executor:\n port: 9988\n appName: test-xxl', '9ce58242d57b57f737dcb59a41ee6e55', '2019-04-18 02:12:57', '2019-10-04 11:22:56', NULL, '127.0.0.1', '', '', '定时任务-elastic-job配置', 'null', 'null', 'yaml', 'null'); +INSERT INTO `config_info` VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nxxl:\n job:\n admin:\n addresses: http://${XXL_HOST:pigx-xxl}:${XXL_HOST:9080}/xxl-job-admin', 'af2d24afd75cbd73c3bbc8297ca65bc9', '2019-04-18 02:12:57', '2020-04-15 21:56:37', NULL, '127.0.0.1', '', '', '定时任务-elastic-job配置', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'security:\n encode:\n key: \'pigxpigxpigxpigx\'\n\nignore:\n clients:\n - test\n swagger-providers:\n - pigx-auth\n - pigx-tx-manager\n\nribbon:\n rule:\n gray-enabled: true', '24403a5b205b1e9d320078e309584bbc', '2019-04-18 02:13:52', '2019-10-20 17:07:42', NULL, '127.0.0.1', '', '', '网关配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx\n password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n boot:\n admin:\n ui:\n title: \'pigx 服务状态监控\'\n brand: \'pigx 服务状态监控\'\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: ALWAYS #显示详细信息', '7925a0c734460526262319b6a189e39d', '2019-04-18 02:14:17', '2019-12-31 19:04:00', NULL, '172.17.0.157', '', '', '监控配置文件', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n scope: server\n ignore-urls:\n - /druid/**\n - /actuator/**\n - /v2/api-docs\n\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n stat-view-servlet:\n enabled: true\n url-pattern: /druid/*\n #login-username: admin\n #login-password: admin\n filter:\n stat:\n enabled: true\n log-slow-sql: true\n slow-sql-millis: 10000\n merge-sql: false\n wall:\n config:\n multi-statement-allow: true\n\n# 文件系统 (提供测试环境，不要乱传)\nminio:\n url: http://minio.pig4cloud.com\n access-key: lengleng\n secret-key: lengleng\n\n# Logger Config\nlogging:\n level:\n com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_user\n - sys_role\n - sys_menu\n - sys_dept\n - sys_log\n - sys_social_details\n - sys_dict\n - sys_dict_item\n - sys_public_param\n - sys_log\n - sys_file\n - sys_oauth_client_details', 'fab3a6b4cb292954d9841b22a41e3dab', '2019-04-18 02:32:44', '2019-11-01 12:22:38', NULL, '127.0.0.1', '', '', 'admin 服务配置', 'null', 'null', 'yaml', 'null'); @@ -248,514 +248,10 @@ BEGIN; INSERT INTO `users` VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); COMMIT; -SET FOREIGN_KEY_CHECKS = 1; -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; +ALTER TABLE `pigxx`.`sys_menu` ADD COLUMN `tenant_id` int(11) UNSIGNED NULL DEFAULT 1 COMMENT '租户ID' AFTER `del_flag`; --- ---------------------------- --- Table structure for config_info --- ---------------------------- -DROP TABLE IF EXISTS `config_info`; -CREATE TABLE `config_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(255) COLLATE utf8_bin DEFAULT NULL, - `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', - `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', - `src_user` text COLLATE utf8_bin COMMENT 'source user', - `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL, - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) COLLATE utf8_bin DEFAULT NULL, - `c_use` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `effect` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `type` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `c_schema` text COLLATE utf8_bin, - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; - --- ---------------------------- --- Records of config_info --- ---------------------------- -BEGIN; -INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'jasypt:\n encryptor:\n password: pigx\n \nspring:\n redis:\n host: pigx-redis\n servlet:\n multipart:\n max-file-size: 100MB\n max-request-size: 100MB\n cloud:\n sentinel:\n eager: true\n filter:\n url-patterns: /** \n transport:\n dashboard: pigx-sentinel:5020\n \nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n#开启灰度\ngray:\n rule:\n enabled: true\n\nmybatis-plus:\n tenant-enable: ture\n mapper-locations: classpath:/mapper/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: auto\n field-strategy: NOT_EMPTY\n type-handlers-package: com.pig4cloud.pigx.common.data.handler\n\nswagger:\n title: PigX Swagger API\n license: Powered By PigX\n licenseUrl: https://pig4cloud.com/\n terms-of-service-url: https://pig4cloud.com/\n contact:\n email: wangiegie@gmail.com\n url: https://pig4cloud.com/about.html\n authorization:\n name: pigX OAuth\n auth-regex: ^.*$\n authorization-scope-list:\n - scope: server\n description: server all\n token-url-list:\n - http://${GATEWAY_HOST:pigx-gateway}:${GATEWAY_PORT:9999}/auth/oauth/token\n\nsecurity:\n oauth2:\n client:\n ignore-urls:\n - /actuator/**\n - /v2/api-docs\n resource:\n loadBalanced: true\n token-info-uri: http://pigx-auth/oauth/check_token', '954b56ac77f2691529aad5c497591b28', '2019-04-18 02:10:20', '2020-02-24 13:58:21', NULL, '172.17.0.125', '', '', '通用配置文件', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (2, 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n freemarker:\n allow-request-override: false\n allow-session-override: false\n cache: true\n charset: UTF-8\n check-template-location: true\n content-type: text/html\n enabled: true\n expose-request-attributes: false\n expose-session-attributes: false\n expose-spring-macro-helpers: true\n prefer-file-system-access: true\n suffix: .ftl\n template-loader-path: classpath:/templates/', 'a6674e6747c1a0bb6c6d78e13706f8f0', '2019-04-18 02:11:32', '2019-08-27 18:24:04', NULL, '127.0.0.1', '', '', '认证中心配置文件', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (3, 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_codegen}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\npigx:\n tenant:\n column: tenant_id\n tables:\n - gen_datasource_conf', 'b7d132a3ecdfac4252c994adbb65b23a', '2019-04-18 02:12:10', '2019-08-27 18:24:18', NULL, '127.0.0.1', '', '', '代码生成', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (4, 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nxxl:\n job:\n admin:\n addresses: http://${XXL-HOST:pigx-xxl}:${XXL-HOST:9080}/xxl-job-admin\n executor:\n port: 9988\n appName: test-xxl', '9ce58242d57b57f737dcb59a41ee6e55', '2019-04-18 02:12:57', '2019-10-04 11:22:56', NULL, '127.0.0.1', '', '', '定时任务-elastic-job配置', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (5, 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'security:\n encode:\n key: \'pigxpigxpigxpigx\'\n\nignore:\n clients:\n - test\n swagger-providers:\n - pigx-auth\n - pigx-tx-manager\n\nribbon:\n rule:\n gray-enabled: true', '24403a5b205b1e9d320078e309584bbc', '2019-04-18 02:13:52', '2019-10-20 17:07:42', NULL, '127.0.0.1', '', '', '网关配置文件', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (6, 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx\n password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n boot:\n admin:\n ui:\n title: \'pigx 服务状态监控\'\n brand: \'pigx 服务状态监控\'\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: ALWAYS #显示详细信息', '7925a0c734460526262319b6a189e39d', '2019-04-18 02:14:17', '2019-12-31 19:04:00', NULL, '172.17.0.157', '', '', '监控配置文件', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (7, 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n scope: server\n ignore-urls:\n - /druid/**\n - /actuator/**\n - /v2/api-docs\n\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n stat-view-servlet:\n enabled: true\n url-pattern: /druid/*\n #login-username: admin\n #login-password: admin\n filter:\n stat:\n enabled: true\n log-slow-sql: true\n slow-sql-millis: 10000\n merge-sql: false\n wall:\n config:\n multi-statement-allow: true\n\n# 文件系统 (提供测试环境，不要乱传)\nminio:\n url: http://minio.pig4cloud.com\n access-key: lengleng\n secret-key: lengleng\n\n# Logger Config\nlogging:\n level:\n com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_user\n - sys_role\n - sys_menu\n - sys_dept\n - sys_log\n - sys_social_details\n - sys_dict\n - sys_dict_item\n - sys_public_param\n - sys_log\n - sys_file\n - sys_oauth_client_details', 'fab3a6b4cb292954d9841b22a41e3dab', '2019-04-18 02:32:44', '2019-11-01 12:22:38', NULL, '127.0.0.1', '', '', 'admin 服务配置', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (8, 'pigx-tx-manager-dev.yml', 'DEFAULT_GROUP', '# 页面配置\nspring:\n mvc:\n static-path-pattern: /**\n resources:\n static-locations: classpath:/static/\n\n\n# LCN 配置\ntm:\n transaction:\n netty:\n delaytime: 5 # 客户端链接最大通讯时间 （秒）\n hearttime: 15 # 客户端心跳时间 （秒）\n redis:\n savemaxtime: 30 # redis 保存时间 （秒）\n socket:\n port: 9998 # 通讯端口\n maxconnection: 1000 #最大链接数\n compensate:\n auto: false #是否自动补偿\n notifyUrl: http://ip:port/path #补偿结果通知（配消息总线里面）\n tryTime: 30 # z再次重试时间间隔\n maxWaitTime: 5000 # 请求超时的最大时间 (毫秒)', '885f5c125f2df7a08692929ccce154be', '2019-04-18 02:54:03', '2019-04-18 02:54:03', NULL, '127.0.0.1', '', '', '分布式事务协调模块', NULL, NULL, 'yaml', NULL); -INSERT INTO `config_info` VALUES (9, 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n resources:\n static-locations: classpath:/static/,classpath:/views/\n quartz:\n #相关属性配置\n properties:\n org:\n quartz:\n scheduler:\n instanceName: clusteredScheduler\n instanceId: AUTO\n jobStore:\n class: org.quartz.impl.jdbcjobstore.JobStoreTX\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n clusterCheckinInterval: 10000\n useProperties: false\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 50\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n #数据库方式\n job-store-type: jdbc\n #初始化表结构\n #jdbc:\n #initialize-schema: never\n\n', '276cf549fb8b084e35dc07d1eb309932', '2019-04-18 03:08:34', '2019-08-27 18:25:41', NULL, '127.0.0.1', '', '', 'quartz 配置文件', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (10, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_pay}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\n# 租户表维护\npigx:\n pay:\n test: lengleng\n aliPayConfig:\n expire-time: 30\n return-url: http://pig4cloud.com\n notify-url: https://admin.pig4cloud.com/pay/notify/ali/callbak\n wxPayConfig:\n notify-url: https://admin.pig4cloud.com/pay/notify/wx/callbak\n xsequence: #发号器相关配置\n db:\n retry-times: 3\n table-name: pay_sequence\n tenant:\n column: tenant_id\n tables:\n - pay_channel\n - pay_trade_order\n - pay_goods_order\n - pay_notify_record', 'bf185a74bb9af224bfe7f8f52ae3c9cb', '2019-05-28 11:46:27', '2019-08-27 18:26:01', NULL, '127.0.0.1', '', '', '支付模块配置', 'null', 'null', 'yaml', 'null'); -INSERT INTO `config_info` VALUES (11, 'pigx-oa-platform-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n ignore-urls:\n - \'/actuator/**\'\n - \'/v2/api-docs\'\n - \'/editor-app/**\'\n - \'/modeler.html\'\n - \'/ws/**\'\nspring:\n autoconfigure:\n exclude: org.activiti.spring.boot.SecurityAutoConfiguration\n activiti:\n check-process-definitions: false\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_ac}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - oa_leave_bill', 'bb2ee29e458875b0334e9f204f958272', '2019-10-16 16:38:52', '2019-10-16 16:38:52', NULL, '127.0.0.1', '', '', NULL, NULL, NULL, 'yaml', NULL); -INSERT INTO `config_info` VALUES (12, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(vW+Nup9LaTfIFwgufUBsYg==)\n client-secret: ENC(vW+Nup9LaTfIFwgufUBsYg==)\n scope: server\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - wx_mp_menu\n - wx_account\n - wx_account_fans\n - wx_fans_msg_res', 'bf4f6943566ce47a98551923bc4c4f80', '2019-10-21 08:58:24', '2019-10-21 08:58:24', NULL, '127.0.0.1', '', '', NULL, NULL, NULL, 'yaml', NULL); -COMMIT; - --- ---------------------------- --- Table structure for config_info_aggr --- ---------------------------- -DROP TABLE IF EXISTS `config_info_aggr`; -CREATE TABLE `config_info_aggr` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'datum_id', - `content` longtext COLLATE utf8_bin NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL, - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - --- ---------------------------- --- Table structure for config_info_beta --- ---------------------------- -DROP TABLE IF EXISTS `config_info_beta`; -CREATE TABLE `config_info_beta` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', - `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', - `src_user` text COLLATE utf8_bin COMMENT 'source user', - `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - --- ---------------------------- --- Table structure for config_info_tag --- ---------------------------- -DROP TABLE IF EXISTS `config_info_tag`; -CREATE TABLE `config_info_tag` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', - `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', - `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', - `src_user` text COLLATE utf8_bin COMMENT 'source user', - `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; - --- ---------------------------- --- Table structure for config_tags_relation --- ---------------------------- -DROP TABLE IF EXISTS `config_tags_relation`; -CREATE TABLE `config_tags_relation` ( - `id` bigint(20) NOT NULL COMMENT 'id', - `tag_name` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'tag_name', - `tag_type` varchar(64) COLLATE utf8_bin DEFAULT NULL COMMENT 'tag_type', - `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', - `group_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_id', - `nid` bigint(20) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`nid`), - UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), - KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; - --- ---------------------------- --- Table structure for group_capacity --- ---------------------------- -DROP TABLE IF EXISTS `group_capacity`; -CREATE TABLE `group_capacity` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `group_id` varchar(128) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', - `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', - `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', - `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', - `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', - `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', - `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; - --- ---------------------------- --- Table structure for his_config_info --- ---------------------------- -DROP TABLE IF EXISTS `his_config_info`; -CREATE TABLE `his_config_info` ( - `id` bigint(64) unsigned NOT NULL, - `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `data_id` varchar(255) COLLATE utf8_bin NOT NULL, - `group_id` varchar(128) COLLATE utf8_bin NOT NULL, - `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', - `content` longtext COLLATE utf8_bin NOT NULL, - `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL, - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00', - `src_user` text COLLATE utf8_bin, - `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL, - `op_type` char(10) COLLATE utf8_bin DEFAULT NULL, - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`nid`), - KEY `idx_gmt_create` (`gmt_create`), - KEY `idx_gmt_modified` (`gmt_modified`), - KEY `idx_did` (`data_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; - --- ---------------------------- --- Table structure for permissions --- ---------------------------- -DROP TABLE IF EXISTS `permissions`; -CREATE TABLE `permissions` ( - `role` varchar(50) NOT NULL, - `resource` varchar(512) NOT NULL, - `action` varchar(8) NOT NULL, - UNIQUE KEY `uk_role_permission` (`role`,`resource`,`action`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - --- ---------------------------- --- Table structure for roles --- ---------------------------- -DROP TABLE IF EXISTS `roles`; -CREATE TABLE `roles` ( - `username` varchar(50) NOT NULL, - `role` varchar(50) NOT NULL, - UNIQUE KEY `uk_username_role` (`username`,`role`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - --- ---------------------------- --- Records of roles --- ---------------------------- -BEGIN; -INSERT INTO `roles` VALUES ('nacos', 'ROLE_ADMIN'); -COMMIT; - --- ---------------------------- --- Table structure for tenant_capacity --- ---------------------------- -DROP TABLE IF EXISTS `tenant_capacity`; -CREATE TABLE `tenant_capacity` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `tenant_id` varchar(128) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Tenant ID', - `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', - `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', - `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', - `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', - `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', - `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; - --- ---------------------------- --- Table structure for tenant_info --- ---------------------------- -DROP TABLE IF EXISTS `tenant_info`; -CREATE TABLE `tenant_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `kp` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'kp', - `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_id', - `tenant_name` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_name', - `tenant_desc` varchar(256) COLLATE utf8_bin DEFAULT NULL COMMENT 'tenant_desc', - `create_source` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'create_source', - `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', - `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), - KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; - --- ---------------------------- --- Table structure for users --- ---------------------------- -DROP TABLE IF EXISTS `users`; -CREATE TABLE `users` ( - `username` varchar(50) NOT NULL, - `password` varchar(500) NOT NULL, - `enabled` tinyint(1) NOT NULL, - PRIMARY KEY (`username`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - --- ---------------------------- --- Records of users --- ---------------------------- -BEGIN; -INSERT INTO `users` VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); -COMMIT; - -SET FOREIGN_KEY_CHECKS = 1; - - -ALTER TABLE `pigxx`.`sys_menu` ADD COLUMN `tenant_id` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '租户ID' AFTER `del_flag`; - -UPDATE `pigxx`.`sys_menu` SET `name` = '权限管理', `permission` = NULL, `path` = '/user', `parent_id` = -1, `icon` = 'icon-quanxianguanli', `sort` = 0, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-28 08:29:53', `update_time` = '2020-03-24 08:56:32', `del_flag` = '0' WHERE `menu_id` = 1000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '用户管理', `permission` = NULL, `path` = '/admin/user/index', `parent_id` = 1000, `icon` = 'icon-yonghuguanli', `sort` = 1, `keep_alive` = '1', `type` = '0', `create_time` = '2017-11-02 22:24:37', `update_time` = '2020-03-24 08:56:33', `del_flag` = '0' WHERE `menu_id` = 1100; - -UPDATE `pigxx`.`sys_menu` SET `name` = '用户新增', `permission` = 'sys_user_add', `path` = NULL, `parent_id` = 1100, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 09:52:09', `update_time` = '2020-03-24 08:56:34', `del_flag` = '0' WHERE `menu_id` = 1101; - -UPDATE `pigxx`.`sys_menu` SET `name` = '用户修改', `permission` = 'sys_user_edit', `path` = NULL, `parent_id` = 1100, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 09:52:48', `update_time` = '2020-03-24 08:56:35', `del_flag` = '0' WHERE `menu_id` = 1102; - -UPDATE `pigxx`.`sys_menu` SET `name` = '用户删除', `permission` = 'sys_user_del', `path` = NULL, `parent_id` = 1100, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 09:54:01', `update_time` = '2020-03-24 08:56:37', `del_flag` = '0' WHERE `menu_id` = 1103; - -UPDATE `pigxx`.`sys_menu` SET `name` = '菜单管理', `permission` = NULL, `path` = '/admin/menu/index', `parent_id` = 1000, `icon` = 'icon-caidanguanli', `sort` = 2, `keep_alive` = '0', `type` = '0', `create_time` = '2017-11-08 09:57:27', `update_time` = '2020-03-24 08:56:38', `del_flag` = '0' WHERE `menu_id` = 1200; - -UPDATE `pigxx`.`sys_menu` SET `name` = '菜单新增', `permission` = 'sys_menu_add', `path` = NULL, `parent_id` = 1200, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 10:15:53', `update_time` = '2020-03-24 08:56:39', `del_flag` = '0' WHERE `menu_id` = 1201; - -UPDATE `pigxx`.`sys_menu` SET `name` = '菜单修改', `permission` = 'sys_menu_edit', `path` = NULL, `parent_id` = 1200, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 10:16:23', `update_time` = '2020-03-24 08:56:40', `del_flag` = '0' WHERE `menu_id` = 1202; - -UPDATE `pigxx`.`sys_menu` SET `name` = '菜单删除', `permission` = 'sys_menu_del', `path` = NULL, `parent_id` = 1200, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 10:16:43', `update_time` = '2020-03-24 08:56:41', `del_flag` = '0' WHERE `menu_id` = 1203; - -UPDATE `pigxx`.`sys_menu` SET `name` = '角色管理', `permission` = NULL, `path` = '/admin/role/index', `parent_id` = 1000, `icon` = 'icon-jiaoseguanli', `sort` = 3, `keep_alive` = '0', `type` = '0', `create_time` = '2017-11-08 10:13:37', `update_time` = '2020-03-24 08:56:42', `del_flag` = '0' WHERE `menu_id` = 1300; - -UPDATE `pigxx`.`sys_menu` SET `name` = '角色新增', `permission` = 'sys_role_add', `path` = NULL, `parent_id` = 1300, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 10:14:18', `update_time` = '2020-03-24 08:56:43', `del_flag` = '0' WHERE `menu_id` = 1301; - -UPDATE `pigxx`.`sys_menu` SET `name` = '角色修改', `permission` = 'sys_role_edit', `path` = NULL, `parent_id` = 1300, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 10:14:41', `update_time` = '2020-03-24 08:56:43', `del_flag` = '0' WHERE `menu_id` = 1302; - -UPDATE `pigxx`.`sys_menu` SET `name` = '角色删除', `permission` = 'sys_role_del', `path` = NULL, `parent_id` = 1300, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-08 10:14:59', `update_time` = '2020-03-24 08:56:45', `del_flag` = '0' WHERE `menu_id` = 1303; - -UPDATE `pigxx`.`sys_menu` SET `name` = '分配权限', `permission` = 'sys_role_perm', `path` = NULL, `parent_id` = 1300, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-04-20 07:22:55', `update_time` = '2020-03-24 08:56:46', `del_flag` = '0' WHERE `menu_id` = 1304; - -UPDATE `pigxx`.`sys_menu` SET `name` = '部门管理', `permission` = NULL, `path` = '/admin/dept/index', `parent_id` = 1000, `icon` = 'icon-web-icon-', `sort` = 4, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:56:47', `del_flag` = '0' WHERE `menu_id` = 1400; - -UPDATE `pigxx`.`sys_menu` SET `name` = '部门新增', `permission` = 'sys_dept_add', `path` = NULL, `parent_id` = 1400, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-01-20 14:56:16', `update_time` = '2020-03-24 08:56:48', `del_flag` = '0' WHERE `menu_id` = 1401; - -UPDATE `pigxx`.`sys_menu` SET `name` = '部门修改', `permission` = 'sys_dept_edit', `path` = NULL, `parent_id` = 1400, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-01-20 14:56:59', `update_time` = '2020-03-24 08:56:48', `del_flag` = '0' WHERE `menu_id` = 1402; - -UPDATE `pigxx`.`sys_menu` SET `name` = '部门删除', `permission` = 'sys_dept_del', `path` = NULL, `parent_id` = 1400, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-01-20 14:57:28', `update_time` = '2020-03-24 08:56:51', `del_flag` = '0' WHERE `menu_id` = 1403; - -UPDATE `pigxx`.`sys_menu` SET `name` = '租户管理', `permission` = '', `path` = '/admin/tenant/index', `parent_id` = 1000, `icon` = 'icon-erji-zuhushouye', `sort` = 5, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:56:49', `del_flag` = '0' WHERE `menu_id` = 1500; - -UPDATE `pigxx`.`sys_menu` SET `name` = '租户新增', `permission` = 'admin_systenant_add', `path` = NULL, `parent_id` = 1500, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:56:52', `del_flag` = '0' WHERE `menu_id` = 1501; - -UPDATE `pigxx`.`sys_menu` SET `name` = '租户修改', `permission` = 'admin_systenant_edit', `path` = NULL, `parent_id` = 1500, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:56:53', `del_flag` = '0' WHERE `menu_id` = 1502; - -UPDATE `pigxx`.`sys_menu` SET `name` = '租户删除', `permission` = 'admin_systenant_del', `path` = NULL, `parent_id` = 1500, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:56:54', `del_flag` = '0' WHERE `menu_id` = 1503; - -UPDATE `pigxx`.`sys_menu` SET `name` = '系统管理', `permission` = NULL, `path` = '/admin', `parent_id` = -1, `icon` = 'icon-xitongguanli', `sort` = 1, `keep_alive` = '0', `type` = '0', `create_time` = '2017-11-07 20:56:00', `update_time` = '2020-03-24 08:56:55', `del_flag` = '0' WHERE `menu_id` = 2000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '日志管理', `permission` = NULL, `path` = '/admin/log/index', `parent_id` = 2000, `icon` = 'icon-rizhiguanli', `sort` = 5, `keep_alive` = '0', `type` = '0', `create_time` = '2017-11-20 14:06:22', `update_time` = '2020-03-24 08:56:56', `del_flag` = '0' WHERE `menu_id` = 2100; - -UPDATE `pigxx`.`sys_menu` SET `name` = '日志删除', `permission` = 'sys_log_del', `path` = NULL, `parent_id` = 2100, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-20 20:37:37', `update_time` = '2020-03-24 08:56:58', `del_flag` = '0' WHERE `menu_id` = 2101; - -UPDATE `pigxx`.`sys_menu` SET `name` = '字典管理', `permission` = NULL, `path` = '/admin/dict/index', `parent_id` = 2000, `icon` = 'icon-navicon-zdgl', `sort` = 6, `keep_alive` = '0', `type` = '0', `create_time` = '2017-11-29 11:30:52', `update_time` = '2020-03-24 08:56:58', `del_flag` = '0' WHERE `menu_id` = 2200; - -UPDATE `pigxx`.`sys_menu` SET `name` = '字典删除', `permission` = 'sys_dict_del', `path` = NULL, `parent_id` = 2200, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2017-11-29 11:30:11', `update_time` = '2020-03-24 08:56:59', `del_flag` = '0' WHERE `menu_id` = 2201; - -UPDATE `pigxx`.`sys_menu` SET `name` = '字典新增', `permission` = 'sys_dict_add', `path` = NULL, `parent_id` = 2200, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-11 22:34:55', `update_time` = '2020-03-24 08:57:01', `del_flag` = '0' WHERE `menu_id` = 2202; - -UPDATE `pigxx`.`sys_menu` SET `name` = '字典修改', `permission` = 'sys_dict_edit', `path` = NULL, `parent_id` = 2200, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-11 22:36:03', `update_time` = '2020-03-24 08:57:09', `del_flag` = '0' WHERE `menu_id` = 2203; - -UPDATE `pigxx`.`sys_menu` SET `name` = '参数管理', `permission` = NULL, `path` = '/admin/param/index', `parent_id` = 2000, `icon` = 'icon-canshu', `sort` = 7, `keep_alive` = '1', `type` = '0', `create_time` = '2019-04-29 22:16:50', `update_time` = '2020-03-24 08:57:10', `del_flag` = '0' WHERE `menu_id` = 2210; - -UPDATE `pigxx`.`sys_menu` SET `name` = '参数新增', `permission` = 'admin_syspublicparam_add', `path` = NULL, `parent_id` = 2210, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-04-29 22:17:36', `update_time` = '2020-03-24 08:57:11', `del_flag` = '0' WHERE `menu_id` = 2211; - -UPDATE `pigxx`.`sys_menu` SET `name` = '参数删除', `permission` = 'admin_syspublicparam_del', `path` = NULL, `parent_id` = 2210, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-04-29 22:17:55', `update_time` = '2020-03-24 08:57:12', `del_flag` = '0' WHERE `menu_id` = 2212; - -UPDATE `pigxx`.`sys_menu` SET `name` = '参数编辑', `permission` = 'admin_syspublicparam_edit', `path` = NULL, `parent_id` = 2210, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-04-29 22:18:14', `update_time` = '2020-03-24 08:57:13', `del_flag` = '0' WHERE `menu_id` = 2213; - -UPDATE `pigxx`.`sys_menu` SET `name` = '代码生成', `permission` = '', `path` = '/gen/index', `parent_id` = 10006, `icon` = 'icon-weibiaoti46', `sort` = 1, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:57:14', `del_flag` = '0' WHERE `menu_id` = 2300; - -UPDATE `pigxx`.`sys_menu` SET `name` = '终端管理', `permission` = '', `path` = '/admin/client/index', `parent_id` = 2000, `icon` = 'icon-shouji', `sort` = 9, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:57:15', `del_flag` = '0' WHERE `menu_id` = 2400; - -UPDATE `pigxx`.`sys_menu` SET `name` = '客户端新增', `permission` = 'sys_client_add', `path` = NULL, `parent_id` = 2400, `icon` = '1', `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:16', `del_flag` = '0' WHERE `menu_id` = 2401; - -UPDATE `pigxx`.`sys_menu` SET `name` = '客户端修改', `permission` = 'sys_client_edit', `path` = NULL, `parent_id` = 2400, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:37:06', `update_time` = '2020-03-24 08:57:16', `del_flag` = '0' WHERE `menu_id` = 2402; - -UPDATE `pigxx`.`sys_menu` SET `name` = '客户端删除', `permission` = 'sys_client_del', `path` = NULL, `parent_id` = 2400, `icon` = NULL, `sort` = NULL, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:39:16', `update_time` = '2020-03-24 08:57:17', `del_flag` = '0' WHERE `menu_id` = 2403; - -UPDATE `pigxx`.`sys_menu` SET `name` = '密钥管理', `permission` = '', `path` = '/admin/social/index', `parent_id` = 2000, `icon` = 'icon-miyue', `sort` = 10, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:57:18', `del_flag` = '0' WHERE `menu_id` = 2500; - -UPDATE `pigxx`.`sys_menu` SET `name` = '密钥新增', `permission` = 'sys_social_details_add', `path` = NULL, `parent_id` = 2500, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:19', `del_flag` = '0' WHERE `menu_id` = 2501; - -UPDATE `pigxx`.`sys_menu` SET `name` = '密钥修改', `permission` = 'sys_social_details_edit', `path` = NULL, `parent_id` = 2500, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:19', `del_flag` = '0' WHERE `menu_id` = 2502; - -UPDATE `pigxx`.`sys_menu` SET `name` = '密钥删除', `permission` = 'sys_social_details_del', `path` = NULL, `parent_id` = 2500, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:23', `del_flag` = '0' WHERE `menu_id` = 2503; - -UPDATE `pigxx`.`sys_menu` SET `name` = '令牌管理', `permission` = NULL, `path` = '/admin/token/index', `parent_id` = 2000, `icon` = 'icon-denglvlingpai', `sort` = 11, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-04 05:58:41', `update_time` = '2020-03-24 08:57:24', `del_flag` = '0' WHERE `menu_id` = 2600; - -UPDATE `pigxx`.`sys_menu` SET `name` = '令牌删除', `permission` = 'sys_token_del', `path` = NULL, `parent_id` = 2600, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-09-04 05:59:50', `update_time` = '2020-03-24 08:57:24', `del_flag` = '0' WHERE `menu_id` = 2601; - -UPDATE `pigxx`.`sys_menu` SET `name` = '动态路由', `permission` = NULL, `path` = '/admin/route/index', `parent_id` = 2000, `icon` = 'icon-luyou', `sort` = 12, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-04 05:58:41', `update_time` = '2020-03-24 08:57:25', `del_flag` = '0' WHERE `menu_id` = 2700; - -UPDATE `pigxx`.`sys_menu` SET `name` = 'Quartz管理', `permission` = '', `path` = '/daemon/job-manage/index', `parent_id` = 2000, `icon` = 'icon-guanwangfangwen', `sort` = 8, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:57:26', `del_flag` = '0' WHERE `menu_id` = 2800; - -UPDATE `pigxx`.`sys_menu` SET `name` = '任务新增', `permission` = 'job_sys_job_add', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:26', `del_flag` = '0' WHERE `menu_id` = 2810; - -UPDATE `pigxx`.`sys_menu` SET `name` = '任务修改', `permission` = 'job_sys_job_edit', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:27', `del_flag` = '0' WHERE `menu_id` = 2820; - -UPDATE `pigxx`.`sys_menu` SET `name` = '任务删除', `permission` = 'job_sys_job_del', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:28', `del_flag` = '0' WHERE `menu_id` = 2830; - -UPDATE `pigxx`.`sys_menu` SET `name` = '任务暂停', `permission` = 'job_sys_job_shutdown_job', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:28', `del_flag` = '0' WHERE `menu_id` = 2840; - -UPDATE `pigxx`.`sys_menu` SET `name` = '任务开始', `permission` = 'job_sys_job_start_job', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:29', `del_flag` = '0' WHERE `menu_id` = 2850; - -UPDATE `pigxx`.`sys_menu` SET `name` = '任务刷新', `permission` = 'job_sys_job_refresh_job', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:30', `del_flag` = '0' WHERE `menu_id` = 2860; - -UPDATE `pigxx`.`sys_menu` SET `name` = '执行任务', `permission` = 'job_sys_job_run_job', `path` = NULL, `parent_id` = 2800, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2019-08-08 15:35:18', `update_time` = '2020-03-24 08:57:31', `del_flag` = '0' WHERE `menu_id` = 2870; - -UPDATE `pigxx`.`sys_menu` SET `name` = '系统监控', `permission` = NULL, `path` = '/daemon', `parent_id` = -1, `icon` = 'icon-msnui-supervise', `sort` = 2, `keep_alive` = '0', `type` = '0', `create_time` = '2018-07-27 01:13:21', `update_time` = '2020-03-24 08:57:31', `del_flag` = '0' WHERE `menu_id` = 3000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '服务监控', `permission` = NULL, `path` = 'http://127.0.0.1:5001', `parent_id` = 3000, `icon` = 'icon-server', `sort` = 0, `keep_alive` = '0', `type` = '0', `create_time` = '2018-06-26 10:50:32', `update_time` = '2020-03-24 08:57:32', `del_flag` = '0' WHERE `menu_id` = 3100; - -UPDATE `pigxx`.`sys_menu` SET `name` = '缓存监控', `permission` = NULL, `path` = '/monitor/redis/index', `parent_id` = 3000, `icon` = 'icon-qingchuhuancun', `sort` = 1, `keep_alive` = '1', `type` = '0', `create_time` = '2019-05-08 23:51:27', `update_time` = '2020-03-24 08:57:33', `del_flag` = '0' WHERE `menu_id` = 3110; - -UPDATE `pigxx`.`sys_menu` SET `name` = '接口文档', `permission` = NULL, `path` = 'http://127.0.0.1:9999/swagger-ui.html', `parent_id` = 3000, `icon` = 'icon-wendang', `sort` = 1, `keep_alive` = '0', `type` = '0', `create_time` = '2018-06-26 10:50:32', `update_time` = '2020-03-24 08:57:34', `del_flag` = '0' WHERE `menu_id` = 3200; - -UPDATE `pigxx`.`sys_menu` SET `name` = '事务监控', `permission` = NULL, `path` = '/tx/index', `parent_id` = 3000, `icon` = 'icon-gtsquanjushiwufuwuGTS', `sort` = 5, `keep_alive` = '0', `type` = '0', `create_time` = '2018-08-19 11:02:39', `update_time` = '2020-03-24 08:57:34', `del_flag` = '0' WHERE `menu_id` = 3300; - -UPDATE `pigxx`.`sys_menu` SET `name` = '在线事务', `permission` = NULL, `path` = '/tx/model', `parent_id` = 3000, `icon` = 'icon-online', `sort` = 6, `keep_alive` = '0', `type` = '0', `create_time` = '2018-08-19 11:32:04', `update_time` = '2020-03-24 08:57:35', `del_flag` = '0' WHERE `menu_id` = 3400; - -UPDATE `pigxx`.`sys_menu` SET `name` = '文档扩展', `permission` = NULL, `path` = 'http://127.0.0.1:9999/doc.html', `parent_id` = 3000, `icon` = 'icon-wendang', `sort` = 2, `keep_alive` = '0', `type` = '0', `create_time` = '2018-06-26 10:50:32', `update_time` = '2020-03-24 08:57:36', `del_flag` = '0' WHERE `menu_id` = 3500; - -UPDATE `pigxx`.`sys_menu` SET `name` = 'Quartz日志', `permission` = '', `path` = '/daemon/job-log/index', `parent_id` = 3000, `icon` = 'icon-gtsquanjushiwufuwuGTS', `sort` = 8, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:57:37', `del_flag` = '0' WHERE `menu_id` = 3600; - -UPDATE `pigxx`.`sys_menu` SET `name` = '注册配置', `permission` = NULL, `path` = '', `parent_id` = 3000, `icon` = 'icon-line', `sort` = 10, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-25 11:08:52', `update_time` = '2020-03-24 08:57:37', `del_flag` = '1' WHERE `menu_id` = 3700; - -UPDATE `pigxx`.`sys_menu` SET `name` = '协同管理', `permission` = NULL, `path` = '/activti', `parent_id` = -1, `icon` = 'icon-kuaisugongzuoliu_o', `sort` = 3, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-26 01:38:13', `update_time` = '2020-03-24 08:57:39', `del_flag` = '0' WHERE `menu_id` = 4000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '模型管理', `permission` = NULL, `path` = '/activiti/index', `parent_id` = 4000, `icon` = 'icon-weibiaoti13', `sort` = 1, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-26 01:39:07', `update_time` = '2020-03-24 08:57:40', `del_flag` = '0' WHERE `menu_id` = 4100; - -UPDATE `pigxx`.`sys_menu` SET `name` = '模型管理', `permission` = 'act_model_manage', `path` = NULL, `parent_id` = 4100, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:41', `del_flag` = '0' WHERE `menu_id` = 4101; - -UPDATE `pigxx`.`sys_menu` SET `name` = '流程管理', `permission` = '/activiti/process', `path` = '/activiti/process', `parent_id` = 4000, `icon` = 'icon-liucheng', `sort` = 2, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-26 06:41:05', `update_time` = '2020-03-24 08:57:42', `del_flag` = '0' WHERE `menu_id` = 4200; - -UPDATE `pigxx`.`sys_menu` SET `name` = '流程管理', `permission` = 'act_process_manage', `path` = NULL, `parent_id` = 4200, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:42', `del_flag` = '0' WHERE `menu_id` = 4201; - -UPDATE `pigxx`.`sys_menu` SET `name` = '请假管理', `permission` = '/activiti/leave', `path` = '/activiti/leave', `parent_id` = 4000, `icon` = 'icon-qingjia', `sort` = 3, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:57:43', `del_flag` = '0' WHERE `menu_id` = 4300; - -UPDATE `pigxx`.`sys_menu` SET `name` = '请假新增', `permission` = 'act_leavebill_add', `path` = NULL, `parent_id` = 4300, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:44', `del_flag` = '0' WHERE `menu_id` = 4301; - -UPDATE `pigxx`.`sys_menu` SET `name` = '请假修改', `permission` = 'act_leavebill_edit', `path` = NULL, `parent_id` = 4300, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:45', `del_flag` = '0' WHERE `menu_id` = 4302; - -UPDATE `pigxx`.`sys_menu` SET `name` = '请假删除', `permission` = 'act_leavebill_del', `path` = NULL, `parent_id` = 4300, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:46', `del_flag` = '0' WHERE `menu_id` = 4303; - -UPDATE `pigxx`.`sys_menu` SET `name` = '待办任务', `permission` = '/activiti/task', `path` = '/activiti/task', `parent_id` = 4000, `icon` = 'icon-renwu', `sort` = 4, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-27 09:52:31', `update_time` = '2020-03-24 08:57:48', `del_flag` = '0' WHERE `menu_id` = 4400; - -UPDATE `pigxx`.`sys_menu` SET `name` = '流程管理', `permission` = 'act_task_manage', `path` = NULL, `parent_id` = 4400, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:57:50', `del_flag` = '0' WHERE `menu_id` = 4401; - -UPDATE `pigxx`.`sys_menu` SET `name` = '支付管理', `permission` = NULL, `path` = '/pay', `parent_id` = -1, `icon` = 'icon-pay6zhifu', `sort` = 4, `keep_alive` = '1', `type` = '0', `create_time` = '2019-05-30 15:28:03', `update_time` = '2020-03-24 08:57:51', `del_flag` = '0' WHERE `menu_id` = 5000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '渠道管理', `permission` = NULL, `path` = '/pay/paychannel/index', `parent_id` = 5000, `icon` = 'icon-zhifuqudaoguanli', `sort` = 1, `keep_alive` = '1', `type` = '0', `create_time` = '2019-05-30 15:32:17', `update_time` = '2020-03-24 08:57:52', `del_flag` = '0' WHERE `menu_id` = 5100; - -UPDATE `pigxx`.`sys_menu` SET `name` = '增加渠道', `permission` = 'pay_paychannel_add', `path` = NULL, `parent_id` = 5100, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-05-30 15:46:14', `update_time` = '2020-03-24 08:58:07', `del_flag` = '0' WHERE `menu_id` = 5110; - -UPDATE `pigxx`.`sys_menu` SET `name` = '编辑渠道', `permission` = 'pay_paychannel_edit', `path` = NULL, `parent_id` = 5100, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-05-30 15:46:35', `update_time` = '2020-03-24 08:58:08', `del_flag` = '0' WHERE `menu_id` = 5120; - -UPDATE `pigxx`.`sys_menu` SET `name` = '删除渠道', `permission` = 'pay_paychannel_del', `path` = NULL, `parent_id` = 5100, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-05-30 15:47:08', `update_time` = '2020-03-24 08:58:09', `del_flag` = '0' WHERE `menu_id` = 5130; - -UPDATE `pigxx`.`sys_menu` SET `name` = '收银台', `permission` = NULL, `path` = '/pay/cd/index', `parent_id` = 5000, `icon` = 'icon-shouyintai', `sort` = 0, `keep_alive` = '1', `type` = '0', `create_time` = '2019-05-30 19:44:00', `update_time` = '2020-03-24 08:58:09', `del_flag` = '0' WHERE `menu_id` = 5200; - -UPDATE `pigxx`.`sys_menu` SET `name` = '商品订单', `permission` = '', `path` = '/pay/goods/index', `parent_id` = 5000, `icon` = 'icon-dingdan', `sort` = 2, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:10', `del_flag` = '0' WHERE `menu_id` = 5300; - -UPDATE `pigxx`.`sys_menu` SET `name` = '商品订单新增', `permission` = 'generator_paygoodsorder_add', `path` = NULL, `parent_id` = 5300, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:11', `del_flag` = '0' WHERE `menu_id` = 5310; - -UPDATE `pigxx`.`sys_menu` SET `name` = '商品订单修改', `permission` = 'generator_paygoodsorder_edit', `path` = NULL, `parent_id` = 5300, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:13', `del_flag` = '0' WHERE `menu_id` = 5320; - -UPDATE `pigxx`.`sys_menu` SET `name` = '商品订单删除', `permission` = 'generator_paygoodsorder_del', `path` = NULL, `parent_id` = 5300, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:14', `del_flag` = '0' WHERE `menu_id` = 5330; - -UPDATE `pigxx`.`sys_menu` SET `name` = '支付订单', `permission` = '', `path` = '/pay/orders/index', `parent_id` = 5000, `icon` = 'icon-zhifu', `sort` = 3, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:14', `del_flag` = '0' WHERE `menu_id` = 5400; - -UPDATE `pigxx`.`sys_menu` SET `name` = '支付订单新增', `permission` = 'generator_paytradeorder_add', `path` = NULL, `parent_id` = 5400, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:15', `del_flag` = '0' WHERE `menu_id` = 5410; - -UPDATE `pigxx`.`sys_menu` SET `name` = '支付订单修改', `permission` = 'generator_paytradeorder_edit', `path` = NULL, `parent_id` = 5400, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:16', `del_flag` = '0' WHERE `menu_id` = 5420; - -UPDATE `pigxx`.`sys_menu` SET `name` = '支付订单删除', `permission` = 'generator_paytradeorder_del', `path` = NULL, `parent_id` = 5400, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:18', `del_flag` = '0' WHERE `menu_id` = 5430; - -UPDATE `pigxx`.`sys_menu` SET `name` = '回调记录', `permission` = '', `path` = '/pay/notify/index', `parent_id` = 5000, `icon` = 'icon-huitiao', `sort` = 4, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:19', `del_flag` = '0' WHERE `menu_id` = 5500; - -UPDATE `pigxx`.`sys_menu` SET `name` = '记录新增', `permission` = 'generator_paynotifyrecord_add', `path` = NULL, `parent_id` = 5500, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:19', `del_flag` = '0' WHERE `menu_id` = 5510; - -UPDATE `pigxx`.`sys_menu` SET `name` = '记录修改', `permission` = 'generator_paynotifyrecord_edit', `path` = NULL, `parent_id` = 5500, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:20', `del_flag` = '0' WHERE `menu_id` = 5520; - -UPDATE `pigxx`.`sys_menu` SET `name` = '记录删除', `permission` = 'generator_paynotifyrecord_del', `path` = NULL, `parent_id` = 5500, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:21', `del_flag` = '0' WHERE `menu_id` = 5530; - -UPDATE `pigxx`.`sys_menu` SET `name` = '微信管理', `permission` = NULL, `path` = '/mp', `parent_id` = -1, `icon` = 'icon-gongzhonghao', `sort` = 4, `keep_alive` = '0', `type` = '0', `create_time` = '2018-09-26 01:38:13', `update_time` = '2020-03-24 08:58:21', `del_flag` = '0' WHERE `menu_id` = 6000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '账号管理', `permission` = '', `path` = '/mp/wxaccount/index', `parent_id` = 6000, `icon` = 'icon-weixincaidan', `sort` = 8, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:22', `del_flag` = '0' WHERE `menu_id` = 6100; - -UPDATE `pigxx`.`sys_menu` SET `name` = '公众号新增', `permission` = 'mp_wxaccount_add', `path` = '', `parent_id` = 6100, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:23', `del_flag` = '0' WHERE `menu_id` = 6101; - -UPDATE `pigxx`.`sys_menu` SET `name` = '公众号修改', `permission` = 'mp_wxaccount_edit', `path` = NULL, `parent_id` = 6100, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:23', `del_flag` = '0' WHERE `menu_id` = 6102; - -UPDATE `pigxx`.`sys_menu` SET `name` = '公众号删除', `permission` = 'mp_wxaccount_del', `path` = NULL, `parent_id` = 6100, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:25', `del_flag` = '0' WHERE `menu_id` = 6103; - -UPDATE `pigxx`.`sys_menu` SET `name` = '粉丝管理', `permission` = '', `path` = '/mp/wxaccountfans/index', `parent_id` = 6000, `icon` = 'icon-fensiguanli', `sort` = 8, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:26', `del_flag` = '0' WHERE `menu_id` = 6200; - -UPDATE `pigxx`.`sys_menu` SET `name` = '粉丝新增', `permission` = 'mp_wxaccountfans_add', `path` = NULL, `parent_id` = 6200, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:27', `del_flag` = '0' WHERE `menu_id` = 6201; - -UPDATE `pigxx`.`sys_menu` SET `name` = '粉丝修改', `permission` = 'mp_wxaccountfans_edit', `path` = NULL, `parent_id` = 6200, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:30', `del_flag` = '0' WHERE `menu_id` = 6202; - -UPDATE `pigxx`.`sys_menu` SET `name` = '粉丝删除', `permission` = 'mp_wxaccountfans_del', `path` = NULL, `parent_id` = 6200, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:31', `del_flag` = '0' WHERE `menu_id` = 6203; - -UPDATE `pigxx`.`sys_menu` SET `name` = '消息管理', `permission` = '', `path` = '/mp/wxfansmsg/index', `parent_id` = 6000, `icon` = 'icon-xiaoxiguanli', `sort` = 8, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:31', `del_flag` = '0' WHERE `menu_id` = 6300; - -UPDATE `pigxx`.`sys_menu` SET `name` = '消息新增', `permission` = 'mp_wxfansmsg_add', `path` = NULL, `parent_id` = 6300, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:32', `del_flag` = '0' WHERE `menu_id` = 6301; - -UPDATE `pigxx`.`sys_menu` SET `name` = '消息修改', `permission` = 'mp_wxfansmsg_edit', `path` = NULL, `parent_id` = 6300, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:33', `del_flag` = '0' WHERE `menu_id` = 6302; - -UPDATE `pigxx`.`sys_menu` SET `name` = '消息删除', `permission` = 'mp_wxfansmsg_del', `path` = NULL, `parent_id` = 6300, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:33', `del_flag` = '0' WHERE `menu_id` = 6303; - -UPDATE `pigxx`.`sys_menu` SET `name` = '消息回复', `permission` = 'mp_wxfansmsgres_add', `path` = NULL, `parent_id` = 6300, `icon` = '1', `sort` = 3, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:37', `del_flag` = '0' WHERE `menu_id` = 6304; - -UPDATE `pigxx`.`sys_menu` SET `name` = '回复删除', `permission` = 'mp_wxfansmsgres_del', `path` = NULL, `parent_id` = 6300, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-03-28 22:53:49', `update_time` = '2020-03-24 08:58:35', `del_flag` = '0' WHERE `menu_id` = 6305; - -UPDATE `pigxx`.`sys_menu` SET `name` = '菜单设置', `permission` = NULL, `path` = '/mp/wxmenu/index', `parent_id` = 6000, `icon` = 'icon-anniu_weixincaidanlianjie', `sort` = 6, `keep_alive` = '1', `type` = '0', `create_time` = '2019-03-29 15:20:12', `update_time` = '2020-03-24 08:58:38', `del_flag` = '0' WHERE `menu_id` = 6400; - -UPDATE `pigxx`.`sys_menu` SET `name` = '保存', `permission` = 'mp_wxmenu_add', `path` = NULL, `parent_id` = 6400, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-03-29 15:43:22', `update_time` = '2020-03-24 08:58:38', `del_flag` = '0' WHERE `menu_id` = 6401; - -UPDATE `pigxx`.`sys_menu` SET `name` = '发布', `permission` = 'mp_wxmenu_push', `path` = NULL, `parent_id` = 6400, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-03-29 15:43:54', `update_time` = '2020-03-24 08:58:39', `del_flag` = '0' WHERE `menu_id` = 6402; - -UPDATE `pigxx`.`sys_menu` SET `name` = '运营数据', `permission` = NULL, `path` = '/mp/wxstatistics/index', `parent_id` = 6000, `icon` = 'icon-zhexiantu', `sort` = 7, `keep_alive` = '1', `type` = '0', `create_time` = '2019-04-14 00:15:35', `update_time` = '2020-03-24 08:58:40', `del_flag` = '0' WHERE `menu_id` = 6500; - -UPDATE `pigxx`.`sys_menu` SET `name` = '文件管理', `permission` = NULL, `path` = '/admin/file/index', `parent_id` = 2000, `icon` = 'icon-wenjianguanli', `sort` = 6, `keep_alive` = '1', `type` = '0', `create_time` = '2019-06-25 12:44:46', `update_time` = '2020-03-24 08:58:41', `del_flag` = '0' WHERE `menu_id` = 10000; - -UPDATE `pigxx`.`sys_menu` SET `name` = '删除文件', `permission` = 'sys_file_del', `path` = NULL, `parent_id` = 10000, `icon` = NULL, `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2019-06-25 13:41:41', `update_time` = '2020-03-24 08:58:42', `del_flag` = '0' WHERE `menu_id` = 10001; - -UPDATE `pigxx`.`sys_menu` SET `name` = '表单管理', `permission` = '', `path` = '/gen/form', `parent_id` = 10006, `icon` = 'icon-record', `sort` = 3, `keep_alive` = '0', `type` = '0', `create_time` = '2018-01-20 13:17:19', `update_time` = '2020-03-24 08:58:44', `del_flag` = '0' WHERE `menu_id` = 10002; - -UPDATE `pigxx`.`sys_menu` SET `name` = '表单新增', `permission` = 'gen_form_add', `path` = NULL, `parent_id` = 10002, `icon` = '1', `sort` = 0, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:45', `del_flag` = '0' WHERE `menu_id` = 10003; - -UPDATE `pigxx`.`sys_menu` SET `name` = '表单修改', `permission` = 'gen_form_edit', `path` = NULL, `parent_id` = 10002, `icon` = '1', `sort` = 1, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:46', `del_flag` = '0' WHERE `menu_id` = 10004; - -UPDATE `pigxx`.`sys_menu` SET `name` = '表单删除', `permission` = 'gen_form_del', `path` = NULL, `parent_id` = 10002, `icon` = '1', `sort` = 2, `keep_alive` = '0', `type` = '1', `create_time` = '2018-05-15 21:35:18', `update_time` = '2020-03-24 08:58:47', `del_flag` = '0' WHERE `menu_id` = 10005; - -UPDATE `pigxx`.`sys_menu` SET `name` = '开发平台', `permission` = NULL, `path` = '/gen', `parent_id` = -1, `icon` = 'icon-shejiyukaifa-', `sort` = 9, `keep_alive` = '1', `type` = '0', `create_time` = '2019-08-12 09:35:16', `update_time` = '2020-03-24 08:58:48', `del_flag` = '0' WHERE `menu_id` = 10006; - -UPDATE `pigxx`.`sys_menu` SET `name` = '数据源管理', `permission` = NULL, `path` = '/gen/datasource', `parent_id` = 10006, `icon` = 'icon-mysql', `sort` = 0, `keep_alive` = '1', `type` = '0', `create_time` = '2019-08-12 09:42:11', `update_time` = '2020-03-24 08:58:49', `del_flag` = '0' WHERE `menu_id` = 10007; - -UPDATE `pigxx`.`sys_menu` SET `name` = '表单设计', `permission` = NULL, `path` = '/gen/design', `parent_id` = 10006, `icon` = 'icon-biaodanbiaoqian', `sort` = 2, `keep_alive` = '1', `type` = '0', `create_time` = '2019-08-16 10:08:56', `update_time` = '2020-03-24 08:58:53', `del_flag` = '0' WHERE `menu_id` = 10008; - -DELETE FROM `pigxx`.`sys_menu` WHERE `menu_id` = 3601; - -DELETE FROM `pigxx`.`sys_menu` WHERE `menu_id` = 3620; - -DELETE FROM `pigxx`.`sys_menu` WHERE `menu_id` = 3630; - -DELETE FROM `pigxx`.`sys_menu` WHERE `menu_id` = 3631; - -DELETE FROM `pigxx`.`sys_role_menu` WHERE `role_id` = 1 AND `menu_id` = 3601; - -DELETE FROM `pigxx`.`sys_role_menu` WHERE `role_id` = 1 AND `menu_id` = 3620; - -DELETE FROM `pigxx`.`sys_role_menu` WHERE `role_id` = 1 AND `menu_id` = 3630; - -DROP TABLE IF EXISTS `sys_oauth_client_details`; -CREATE TABLE `sys_oauth_client_details` ( +DROP TABLE IF EXISTS `pigxx`.`sys_oauth_client_details`; +CREATE TABLE `pigxx`.`sys_oauth_client_details` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `client_id` varchar(32) NOT NULL, `resource_ids` varchar(256) DEFAULT NULL, @@ -777,14 +273,15 @@ CREATE TABLE `sys_oauth_client_details` ( -- Records of sys_oauth_client_details -- ---------------------------- BEGIN; -INSERT INTO `sys_oauth_client_details` VALUES (1, 'app', NULL, 'app', 'server', 'password,refresh_token,authorization_code,client_credentials,implicit', NULL, NULL, 43200, 2592001, NULL, 'true', '0', 1); -INSERT INTO `sys_oauth_client_details` VALUES (2, 'daemon', NULL, 'daemon', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); -INSERT INTO `sys_oauth_client_details` VALUES (3, 'gen', NULL, 'gen', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); -INSERT INTO `sys_oauth_client_details` VALUES (4, 'mp', NULL, 'mp', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); -INSERT INTO `sys_oauth_client_details` VALUES (5, 'pig', NULL, 'pig', 'server', 'password,refresh_token,authorization_code,client_credentials', 'http://localhost:4040/sso1/login,http://localhost:4041/sso1/login,http://localhost:8080/renren-admin/sys/oauth2-sso,http://localhost:8090/sys/oauth2-sso', NULL, NULL, NULL, NULL, 'false', '0', 1); -INSERT INTO `sys_oauth_client_details` VALUES (6, 'test', NULL, 'test', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); +INSERT INTO `pigxx`.`sys_oauth_client_details` VALUES (1, 'app', NULL, 'app', 'server', 'password,refresh_token,authorization_code,client_credentials,implicit', NULL, NULL, 43200, 2592001, NULL, 'true', '0', 1); +INSERT INTO `pigxx`.`sys_oauth_client_details` VALUES (2, 'daemon', NULL, 'daemon', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); +INSERT INTO `pigxx`.`sys_oauth_client_details` VALUES (3, 'gen', NULL, 'gen', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); +INSERT INTO `pigxx`.`sys_oauth_client_details` VALUES (4, 'mp', NULL, 'mp', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); +INSERT INTO `pigxx`.`sys_oauth_client_details` VALUES (5, 'pig', NULL, 'pig', 'server', 'password,refresh_token,authorization_code,client_credentials', 'http://localhost:4040/sso1/login,http://localhost:4041/sso1/login,http://localhost:8080/renren-admin/sys/oauth2-sso,http://localhost:8090/sys/oauth2-sso', NULL, NULL, NULL, NULL, 'false', '0', 1); +INSERT INTO `pigxx`.`sys_oauth_client_details` VALUES (6, 'test', NULL, 'test', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', '0', 1); COMMIT; +UPDATE `pigxx_job`.`xxl_job_group` SET `app_name` = 'xxl-job-executor', `title` = '示例执行器', `order` = 1, `address_type` = 0, `address_list` = NULL WHERE `id` = 1; DROP TABLE `pigxx_job`.`job_execution_log`; From f7ef5091ea7a12ab51bdbe6b75bcc37dd46f0459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 16 Apr 2020 10:23:58 +0800 Subject: [PATCH 06/11] =?UTF-8?q?:recycle:=20Refactoring=20code.=20?= =?UTF-8?q?=E9=87=8D=E6=9E=84@Cacheable=20unless=20=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/common/security/service/PigxUser.java | 6 +++++- .../pig4cloud/pigx/admin/controller/SysDictController.java | 2 +- .../pigx/admin/service/impl/SysMenuServiceImpl.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java index c23546035..74590d23e 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java @@ -20,16 +20,20 @@ package com.pig4cloud.pigx.common.security.service; import lombok.Getter; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.SpringSecurityCoreVersion; import org.springframework.security.core.userdetails.User; import java.util.Collection; /** * @author lengleng - * @date 2018/8/20 + * @date 2020/4/16 * 扩展用户信息 */ public class PigxUser extends User { + + private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + /** * 用户ID */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java index dcd6cfaf2..92608c884 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java @@ -84,7 +84,7 @@ public class SysDictController { * @return 同类型字典 */ @GetMapping("/type/{type}") - @Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.size() == 0") + @Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.isEmpty()") public R getDictByType(@PathVariable String type) { return R.ok(sysDictItemService.list(Wrappers .query().lambda() diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index 910b15f9a..afac06805 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -60,7 +60,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private final SysRoleMenuMapper sysRoleMenuMapper; @Override - @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId + '_menu'") + @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId + '_menu'", unless = "#result.isEmpty()") public List findMenuByRoleId(Integer roleId) { return baseMapper.listMenusByRoleId(roleId); } @@ -114,8 +114,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl /** * 查询菜单 * - * @param all 全部菜单 - * @param type 类型 + * @param all 全部菜单 + * @param type 类型 * @param parentId 父节点ID * @return */ From 3c5278af924ee0f353708cd06daf8e84bf50a2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 18 Apr 2020 18:29:49 +0800 Subject: [PATCH 07/11] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=20=E5=B7=B2?= =?UTF-8?q?=E5=90=88=E5=B9=B6=20!52=20=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86validation=20Exception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GlobalExceptionHandlerResolver.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java index 185fff514..dbb8fe397 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java @@ -75,11 +75,25 @@ public class GlobalExceptionHandlerResolver { * @param exception * @return R */ - @ExceptionHandler({MethodArgumentNotValidException.class, BindException.class}) + @ExceptionHandler({MethodArgumentNotValidException.class}) @ResponseStatus(HttpStatus.BAD_REQUEST) public R handleBodyValidException(MethodArgumentNotValidException exception) { List fieldErrors = exception.getBindingResult().getFieldErrors(); - log.error("参数绑定异常,ex = {}", fieldErrors.get(0).getDefaultMessage()); + log.warn("参数绑定异常,ex = {}", fieldErrors.get(0).getDefaultMessage()); + return R.failed(fieldErrors.get(0).getDefaultMessage()); + } + + /** + * validation Exception (以form-data形式传参) + * + * @param exception + * @return R + */ + @ExceptionHandler({BindException.class}) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public R bindExceptionHandler(BindException exception) { + List fieldErrors = exception.getBindingResult().getFieldErrors(); + log.warn("参数绑定异常,ex = {}", fieldErrors.get(0).getDefaultMessage()); return R.failed(fieldErrors.get(0).getDefaultMessage()); } } From 8f4fd336262f623acaa30fb050e6da36ea400264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 18 Apr 2020 18:30:38 +0800 Subject: [PATCH 08/11] =?UTF-8?q?:whale:=20Work=20about=20Docker.=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80docker=20base=20=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-auth/Dockerfile | 2 +- pigx-gateway/Dockerfile | 2 +- pigx-register/Dockerfile | 2 +- pigx-upms/pigx-upms-biz/Dockerfile | 2 +- pigx-visual/pigx-codegen/Dockerfile | 2 +- pigx-visual/pigx-daemon-elastic-job/Dockerfile | 2 +- pigx-visual/pigx-daemon-quartz/Dockerfile | 2 +- pigx-visual/pigx-monitor/Dockerfile | 2 +- pigx-visual/pigx-mp-platform/Dockerfile | 2 +- pigx-visual/pigx-pay-platform/Dockerfile | 2 +- pigx-visual/pigx-sentinel-dashboard/Dockerfile | 2 +- pigx-visual/pigx-tx-manager/Dockerfile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pigx-auth/Dockerfile b/pigx-auth/Dockerfile index c570176d3..f22275d15 100644 --- a/pigx-auth/Dockerfile +++ b/pigx-auth/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-gateway/Dockerfile b/pigx-gateway/Dockerfile index 63aa59b15..1725e6062 100644 --- a/pigx-gateway/Dockerfile +++ b/pigx-gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-register/Dockerfile b/pigx-register/Dockerfile index 91bc34faa..29f74fb74 100644 --- a/pigx-register/Dockerfile +++ b/pigx-register/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-upms/pigx-upms-biz/Dockerfile b/pigx-upms/pigx-upms-biz/Dockerfile index 7a20fc804..714a83554 100644 --- a/pigx-upms/pigx-upms-biz/Dockerfile +++ b/pigx-upms/pigx-upms-biz/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-codegen/Dockerfile b/pigx-visual/pigx-codegen/Dockerfile index 0c7b4da73..b0548b143 100644 --- a/pigx-visual/pigx-codegen/Dockerfile +++ b/pigx-visual/pigx-codegen/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-daemon-elastic-job/Dockerfile b/pigx-visual/pigx-daemon-elastic-job/Dockerfile index a07f1eeb2..5331e6f17 100644 --- a/pigx-visual/pigx-daemon-elastic-job/Dockerfile +++ b/pigx-visual/pigx-daemon-elastic-job/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-daemon-quartz/Dockerfile b/pigx-visual/pigx-daemon-quartz/Dockerfile index e114f60de..5c6f79e00 100644 --- a/pigx-visual/pigx-daemon-quartz/Dockerfile +++ b/pigx-visual/pigx-daemon-quartz/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-monitor/Dockerfile b/pigx-visual/pigx-monitor/Dockerfile index b59f6f983..3706552e8 100644 --- a/pigx-visual/pigx-monitor/Dockerfile +++ b/pigx-visual/pigx-monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-mp-platform/Dockerfile b/pigx-visual/pigx-mp-platform/Dockerfile index 24d3921ad..efa941838 100644 --- a/pigx-visual/pigx-mp-platform/Dockerfile +++ b/pigx-visual/pigx-mp-platform/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-pay-platform/Dockerfile b/pigx-visual/pigx-pay-platform/Dockerfile index b1ccc45a8..2ad3c72a8 100644 --- a/pigx-visual/pigx-pay-platform/Dockerfile +++ b/pigx-visual/pigx-pay-platform/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-sentinel-dashboard/Dockerfile b/pigx-visual/pigx-sentinel-dashboard/Dockerfile index 9cf73c1cd..f3116cb8c 100644 --- a/pigx-visual/pigx-sentinel-dashboard/Dockerfile +++ b/pigx-visual/pigx-sentinel-dashboard/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com diff --git a/pigx-visual/pigx-tx-manager/Dockerfile b/pigx-visual/pigx-tx-manager/Dockerfile index af7dc41b5..1b78d54f2 100644 --- a/pigx-visual/pigx-tx-manager/Dockerfile +++ b/pigx-visual/pigx-tx-manager/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8-jre +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com From bd7bb907a5bfc276b504084d8f5a40d687a2bb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 19 Apr 2020 22:42:19 +0800 Subject: [PATCH 09/11] :arrow_up: Upgrading dependencies. #1083 up hutool 5.3.1 :arrow_up: Upgrading dependencies. #1083 up hutool 5.3.1 --- .../pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java index e0cbf6955..4b5f8d3bb 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java @@ -49,8 +49,8 @@ import reactor.core.publisher.Mono; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.nio.charset.StandardCharsets; -import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.Function; /** @@ -126,7 +126,7 @@ public class PasswordDecoderFilter extends AbstractGatewayFilterFactory { new IvParameterSpec(encodeKey.getBytes())); // 获取请求密码并解密 - HashMap inParamsMap = HttpUtil.decodeParamMap((String) s, CharsetUtil.UTF_8); + Map inParamsMap = HttpUtil.decodeParamMap((String) s, CharsetUtil.CHARSET_UTF_8); byte[] result = aes.decrypt(Base64.decode(inParamsMap.get(PASSWORD) .getBytes(StandardCharsets.UTF_8))); String password = new String(result, StandardCharsets.UTF_8); diff --git a/pom.xml b/pom.xml index 1ecbd0fec..fd0b4bcb0 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 1.8 1.8 2.2.2 - 5.2.5 + 5.3.1 1.6.2 2.9.2 2.0.2 From 357e2d8ab271e8dcd457f365ffdf8ef82986e0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 19 Apr 2020 23:11:22 +0800 Subject: [PATCH 10/11] :arrow_up: Upgrading dependencies. #1084 up transmittable-thread-local 2.11.4 --- pigx-visual/pigx-daemon-elastic-job/pom.xml | 11 ----------- pom.xml | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index b42662148..a45574975 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -70,17 +70,6 @@ com.alibaba druid-spring-boot-starter - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-recipes - ${curator.version} - com.pig4cloud diff --git a/pom.xml b/pom.xml index fd0b4bcb0..56a62248f 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,10 @@ 1.6.2 2.9.2 2.0.2 - 2.10.0 1.7 4.1.0 2.1.1 - 2.11.2 + 2.11.4 6.0.13 2.2.0 2.3.6.RELEASE From e470d9f6ed30f1a2fb5e4e4b87995ccf7b9b3d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 20 Apr 2020 09:22:32 +0800 Subject: [PATCH 11/11] =?UTF-8?q?:lipstick:=20Updating=20the=20UI=20and=20?= =?UTF-8?q?style=20files.=20#1054=20=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91?= =?UTF-8?q?=20=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E7=AE=80=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=87=8F=E5=B0=91DB=20=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :lipstick: Updating the UI and style files. #1054 【重构】 登录流程简化，减少DB 访问 --- .../pigx/common/security/component/PigxTokenEnhancer.java | 2 ++ .../pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java index c23931c4b..98536ece1 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java @@ -52,6 +52,8 @@ public class PigxTokenEnhancer implements TokenEnhancer { final Map additionalInfo = new HashMap<>(8); PigxUser pigxUser = (PigxUser) authentication.getUserAuthentication().getPrincipal(); additionalInfo.put(SecurityConstants.DETAILS_USER, pigxUser); + additionalInfo.put(SecurityConstants.DETAILS_USER_ID, pigxUser.getId()); + additionalInfo.put(SecurityConstants.DETAILS_USERNAME, pigxUser.getUsername()); additionalInfo.put(SecurityConstants.DETAILS_LICENSE, SecurityConstants.PIGX_LICENSE); additionalInfo.put(SecurityConstants.ACTIVE, Boolean.TRUE); ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 208988b6c..7c28f041e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -170,8 +170,8 @@ public class SysUserServiceImpl extends ServiceImpl impl if (ENCODER.matches(userDto.getPassword(), userVO.getPassword())) { sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1())); } else { - log.warn("原密码错误，修改密码失败:{}", userDto.getUsername()); - return R.ok(Boolean.FALSE, "原密码错误，修改失败"); + log.info("原密码错误，修改密码失败:{}", userDto.getUsername()); + return R.failed("原密码错误，修改失败"); } } sysUser.setPhone(userDto.getPhone());