From 040e07e6d8acc71d5ff009e5a4435fbcff66f013 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 11 Aug 2024 10:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=94=B9=E5=8A=A8+=E5=A4=9A?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
scripts/deploy.sh | 108 +++++-------------
sgzb-auth/pom.xml | 2 +-
.../resources/bootstrap-sgzb_cloud_dev.yml | 34 ++++++
.../resources/bootstrap-sgzb_cloud_local.yml | 34 ++++++
sgzb-auth/src/main/resources/bootstrap.yml | 32 ------
sgzb-gateway/pom.xml | 2 +-
.../resources/bootstrap-sgzb_cloud_dev.yml | 50 ++++++++
.../resources/bootstrap-sgzb_cloud_local.yml | 50 ++++++++
sgzb-gateway/src/main/resources/bootstrap.yml | 50 +-------
sgzb-modules/pom.xml | 1 -
.../src/main/resources/bootstrap.yml | 4 +-
.../sgzb-gen/src/main/resources/bootstrap.yml | 4 +-
.../sgzb-job/src/main/resources/bootstrap.yml | 4 +-
sgzb-modules/sgzb-material/pom.xml | 2 +-
.../controller/ToDoController_CQ.java | 59 ++++++++++
.../controller/ToDoController_GZ.java | 59 ++++++++++
.../sgzb/material/mapper/ToDoMapper_CQ.java | 22 ++++
.../sgzb/material/mapper/ToDoMapper_GZ.java | 22 ++++
.../service/impl/ToDoServiceImpl_CQ.java | 35 ++++++
.../service/impl/ToDoServiceImpl_GZ.java | 44 +++++++
.../resources/bootstrap-sgzb_cloud_dev.yml} | 25 ++--
.../resources/bootstrap-sgzb_cloud_local.yml | 24 ++++
.../src/main/resources/bootstrap.yml | 25 +---
.../mapper/material/ToDoMapper_CQ.xml | 18 +++
.../mapper/material/ToDoMapper_GZ.xml | 18 +++
sgzb-modules/sgzb-settlement/pom.xml | 107 -----------------
.../settlement/SgzbSettlementApplication.java | 36 ------
.../src/main/resources/banner.txt | 10 --
.../src/main/resources/logback.xml | 74 ------------
sgzb-modules/sgzb-system/pom.xml | 2 +-
.../resources/bootstrap-sgzb_cloud_dev.yml | 51 +++++++++
.../resources/bootstrap-sgzb_cloud_local.yml | 51 +++++++++
.../src/main/resources/bootstrap.yml | 50 +-------
.../src/main/resources/bootstrap.yml | 4 +-
34 files changed, 628 insertions(+), 485 deletions(-)
create mode 100644 sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_dev.yml
create mode 100644 sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_local.yml
create mode 100644 sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_dev.yml
create mode 100644 sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_local.yml
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_CQ.java
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_GZ.java
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java
create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java
rename sgzb-modules/{sgzb-settlement/src/main/resources/bootstrap.yml => sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml} (56%)
create mode 100644 sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml
create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_CQ.xml
create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_GZ.xml
delete mode 100644 sgzb-modules/sgzb-settlement/pom.xml
delete mode 100644 sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java
delete mode 100644 sgzb-modules/sgzb-settlement/src/main/resources/banner.txt
delete mode 100644 sgzb-modules/sgzb-settlement/src/main/resources/logback.xml
create mode 100644 sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_dev.yml
create mode 100644 sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_local.yml
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index f8eed87..58134c9 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -8,32 +8,25 @@ rm -rf *.jar
echo "workspace is ${WORKSPACE}"
mv ${WORKSPACE}/sgzb-auth/target/sgzb-auth.jar $deploy_path
mv ${WORKSPACE}/sgzb-gateway/target/sgzb-gateway.jar $deploy_path
-mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system.jar $deploy_path
-mv ${WORKSPACE}/sgzb-modules/sgzb-base/target/sgzb-modules-base.jar $deploy_path
-mv ${WORKSPACE}/sgzb-modules/sgzb-file/target/sgzb-modules-file.jar $deploy_path
mv ${WORKSPACE}/sgzb-modules/sgzb-material/target/sgzb-modules-material.jar $deploy_path
+mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system.jar $deploy_path
chmod 777 *.jar
echo "--------moveFile end--------------"
export sgzb_auth_enable=true
export sgzb_gateway_enable=true
-export sgzb_modules_system_enable=true
-export sgzb_modules_base_enable=false
-export sgzb_modules_file_enable=false
export sgzb_modules_material_enable=true
+export sgzb_modules_system_enable=true
-export sgzb_auth_jar=sgzb-auth.jar
-export sgzb_gateway_jar=sgzb-gateway.jar
-export sgzb_modules_system_jar=sgzb-modules-system.jar
-export sgzb_modules_base_jar=sgzb-modules-base.jar
-export sgzb_modules_file_jar=sgzb-modules-file.jar
-export sgzb_modules_material_jar=sgzb-modules-material.jar
+export sgzb_auth_jar=sgzb-auth-1.0.jar
+export sgzb_gateway_jar=sgzb-gateway-1.0.jar
+export sgzb_modules_material_jar=sgzb-modules-material-1.0.jar
+export sgzb_modules_system_jar=sgzb-modules-system-1.0.jar
export sgzb_auth_port=39200
export sgzb_gateway_port=39080
-export sgzb_modules_system_port=39201
-export sgzb_modules_base_port=39301
-export sgzb_modules_file_port=39300
export sgzb_modules_material_port=39302
+export sgzb_modules_system_port=39201
+
if($auth_service_enable);then
echo "--------auth开始启动--------------"
@@ -81,69 +74,6 @@ if($sgzb_gateway_enable);then
fi
-if($sgzb_modules_system_enable);then
- echo "--------sgzb_modules_system 开始启动--------------"
- echo "--------删除sgzb_modules_system开始--------------"
- P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
- if [ "$P_ID" == "" ]; then
- echo "===sgzb_modules_system process not exists or stop success"
- else
- kill -9 $P_ID
- echo "sgzb_modules_system killed success"
- fi
- echo "--------sgzb_modules_system开始部署--------------"
- nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
- sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
- until [ -n "$sgzb_modules_system_pid" ]
- do
- sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
- done
- echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
- echo "--------sgzb_modules_system 启动成功--------------"
-fi
-
-if($sgzb_modules_base_enable);then
- echo "--------sgzb_modules_base 开始启动--------------"
- echo "--------删除sgzb_modules_base开始--------------"
- P_ID=`ps -ef | grep -w $sgzb_modules_base_jar | grep -v "grep" | awk '{print $2}'`
- if [ "$P_ID" == "" ]; then
- echo "===sgzb_modules_base process not exists or stop success"
- else
- kill -9 $P_ID
- echo "sgzb_modules_base killed success"
- fi
- echo "--------sgzb_modules_base开始部署--------------"
- nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_base_jar >/dev/null 2>&1 &
- sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
- until [ -n "$sgzb_modules_base_pid" ]
- do
- sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
- done
- echo "sgzb_modules_base pid is $sgzb_modules_base_pid"
- echo "--------sgzb_modules_base 启动成功--------------"
-fi
-
-if($sgzb_modules_file_enable);then
- echo "--------sgzb_modules_file 开始启动--------------"
- echo "--------删除sgzb_modules_file开始--------------"
- P_ID=`ps -ef | grep -w $sgzb_modules_file_jar | grep -v "grep" | awk '{print $2}'`
- if [ "$P_ID" == "" ]; then
- echo "===sgzb_modules_file process not exists or stop success"
- else
- kill -9 $P_ID
- echo "sgzb_modules_file killed success"
- fi
- echo "--------sgzb_modules_file开始部署--------------"
- nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_file_jar >/dev/null 2>&1 &
- sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
- until [ -n "$sgzb_modules_file_pid" ]
- do
- sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
- done
- echo "sgzb_modules_file pid is $sgzb_modules_file_pid"
- echo "--------sgzb_modules_file 启动成功--------------"
-fi
-
if($sgzb_modules_material_enable);then
echo "--------sgzb_modules_material 开始启动--------------"
echo "--------删除sgzb_modules_material开始--------------"
@@ -163,4 +93,26 @@ if($sgzb_modules_material_enable);then
done
echo "sgzb_modules_material pid is $sgzb_modules_material_pid"
echo "--------sgzb_modules_material 启动成功--------------"
+fi
+
+
+if($sgzb_modules_system_enable);then
+ echo "--------sgzb_modules_system 开始启动--------------"
+ echo "--------删除sgzb_modules_system开始--------------"
+ P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
+ if [ "$P_ID" == "" ]; then
+ echo "===sgzb_modules_system process not exists or stop success"
+ else
+ kill -9 $P_ID
+ echo "sgzb_modules_system killed success"
+ fi
+ echo "--------sgzb_modules_system开始部署--------------"
+ nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
+ sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+ until [ -n "$sgzb_modules_system_pid" ]
+ do
+ sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+ done
+ echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
+ echo "--------sgzb_modules_system 启动成功--------------"
fi
\ No newline at end of file
diff --git a/sgzb-auth/pom.xml b/sgzb-auth/pom.xml
index 762a179..5d23651 100644
--- a/sgzb-auth/pom.xml
+++ b/sgzb-auth/pom.xml
@@ -8,7 +8,7 @@
4.0.0
- sgzb-auth
+ sgzb-auth-1.0
sgzb-auth认证授权中心
diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_dev.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_dev.yml
new file mode 100644
index 0000000..e637a63
--- /dev/null
+++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_dev.yml
@@ -0,0 +1,34 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+onlineApprove: /lbcloud-oauth/oauth/token
+wechatAppId: crhmaxnE
+wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
+getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
+baseUrl: https://test-sso.csgmall.com.cn
+appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
+personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
+h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
+h5AppId: G3NksDH2
+appsecret: 596e4863c8d112842ce820c130b236001297ea73
+appId: akvVFYgy
+appAppId: u8LLfynf
+getPersonDetailData: /lbcloud-user/api/user/queryById
+registerPhone: /lbcloud-user/api/user/registrationByPhone
+userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
+verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode
\ No newline at end of file
diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_local.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_local.yml
new file mode 100644
index 0000000..e637a63
--- /dev/null
+++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_local.yml
@@ -0,0 +1,34 @@
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+onlineApprove: /lbcloud-oauth/oauth/token
+wechatAppId: crhmaxnE
+wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
+getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
+baseUrl: https://test-sso.csgmall.com.cn
+appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
+personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
+h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
+h5AppId: G3NksDH2
+appsecret: 596e4863c8d112842ce820c130b236001297ea73
+appId: akvVFYgy
+appAppId: u8LLfynf
+getPersonDetailData: /lbcloud-user/api/user/queryById
+registerPhone: /lbcloud-user/api/user/registrationByPhone
+userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
+verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode
\ No newline at end of file
diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml
index 48e8942..f5c6e72 100644
--- a/sgzb-auth/src/main/resources/bootstrap.yml
+++ b/sgzb-auth/src/main/resources/bootstrap.yml
@@ -10,35 +10,3 @@ spring:
profiles:
# 环境配置
active: sgzb_cloud_dev
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- config:
- # 配置中心地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-onlineApprove: /lbcloud-oauth/oauth/token
-wechatAppId: crhmaxnE
-wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
-getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
-baseUrl: https://test-sso.csgmall.com.cn
-appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
-personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
-h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
-h5AppId: G3NksDH2
-appsecret: 596e4863c8d112842ce820c130b236001297ea73
-appId: akvVFYgy
-appAppId: u8LLfynf
-getPersonDetailData: /lbcloud-user/api/user/queryById
-registerPhone: /lbcloud-user/api/user/registrationByPhone
-userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
-verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode
\ No newline at end of file
diff --git a/sgzb-gateway/pom.xml b/sgzb-gateway/pom.xml
index f872844..2dbf1f1 100644
--- a/sgzb-gateway/pom.xml
+++ b/sgzb-gateway/pom.xml
@@ -8,7 +8,7 @@
4.0.0
- sgzb-gateway
+ sgzb-gateway-1.0
sgzb-gateway网关模块
diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_dev.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_dev.yml
new file mode 100644
index 0000000..d01288a
--- /dev/null
+++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_dev.yml
@@ -0,0 +1,50 @@
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+ endpoint:
+ env:
+ enabled: false
+
+# Spring
+spring:
+ cloud:
+ loadbalancer:
+ # 关闭Ribbon的负载均衡器
+ ribbon:
+ enabled: false
+ # 开启Nacos的负载均衡器
+ nacos:
+ enabled: true
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ sentinel:
+ # 取消控制台懒加载
+ eager: true
+ transport:
+ # 控制台地址
+ dashboard: 127.0.0.1:8718
+ # nacos配置持久化
+ datasource:
+ ds1:
+ nacos:
+ server-addr: 127.0.0.1:8848
+ dataId: sentinel-sgzb-gateway
+ groupId: DEFAULT_GROUP
+ data-type: json
+ rule-type: gw-flow
+
+#加密组件
+jasypt:
+ encryptor:
+ password: Encrypt
diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_local.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_local.yml
new file mode 100644
index 0000000..d01288a
--- /dev/null
+++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_local.yml
@@ -0,0 +1,50 @@
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+ endpoint:
+ env:
+ enabled: false
+
+# Spring
+spring:
+ cloud:
+ loadbalancer:
+ # 关闭Ribbon的负载均衡器
+ ribbon:
+ enabled: false
+ # 开启Nacos的负载均衡器
+ nacos:
+ enabled: true
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ sentinel:
+ # 取消控制台懒加载
+ eager: true
+ transport:
+ # 控制台地址
+ dashboard: 127.0.0.1:8718
+ # nacos配置持久化
+ datasource:
+ ds1:
+ nacos:
+ server-addr: 127.0.0.1:8848
+ dataId: sentinel-sgzb-gateway
+ groupId: DEFAULT_GROUP
+ data-type: json
+ rule-type: gw-flow
+
+#加密组件
+jasypt:
+ encryptor:
+ password: Encrypt
diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml
index 7789f78..6ffe4e5 100644
--- a/sgzb-gateway/src/main/resources/bootstrap.yml
+++ b/sgzb-gateway/src/main/resources/bootstrap.yml
@@ -2,12 +2,6 @@
server:
port: 39080
-# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
-management:
- endpoint:
- env:
- enabled: false
-
# Spring
spring:
application:
@@ -15,46 +9,4 @@ spring:
name: sgzb-gateway
profiles:
# 环境配置
- active: sgzb_cloud_dev
- cloud:
- loadbalancer:
- # 关闭Ribbon的负载均衡器
- ribbon:
- enabled: false
- # 开启Nacos的负载均衡器
- nacos:
- enabled: true
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- config:
- # 配置中心地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- sentinel:
- # 取消控制台懒加载
- eager: true
- transport:
- # 控制台地址
- dashboard: 127.0.0.1:8718
- # nacos配置持久化
- datasource:
- ds1:
- nacos:
- server-addr: 192.168.0.14:8848
- dataId: sentinel-sgzb-gateway
- groupId: DEFAULT_GROUP
- data-type: json
- rule-type: gw-flow
-
-#加密组件
-jasypt:
- encryptor:
- password: Encrypt
+ active: sgzb_cloud_local
diff --git a/sgzb-modules/pom.xml b/sgzb-modules/pom.xml
index bbe03a3..44b7146 100644
--- a/sgzb-modules/pom.xml
+++ b/sgzb-modules/pom.xml
@@ -14,7 +14,6 @@
sgzb-job
sgzb-file
sgzb-material
- sgzb-settlement
sgzb-modules
diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
index ee4bc7f..d3dcf93 100644
--- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
@@ -36,11 +36,11 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
config:
# 配置中心地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
# 配置文件格式
file-extension: yml
diff --git a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
index 73625c0..ce7cd6f 100644
--- a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
@@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
config:
# 配置中心地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
# 配置文件格式
file-extension: yml
diff --git a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
index 1fd14e5..6b1be11 100644
--- a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
@@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
config:
# 配置中心地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
# 配置文件格式
file-extension: yml
diff --git a/sgzb-modules/sgzb-material/pom.xml b/sgzb-modules/sgzb-material/pom.xml
index 1298bb9..dd7c9b1 100644
--- a/sgzb-modules/sgzb-material/pom.xml
+++ b/sgzb-modules/sgzb-material/pom.xml
@@ -9,7 +9,7 @@
4.0.0
- sgzb-modules-material
+ sgzb-modules-material-1.0
sgzb-modules-material
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java
new file mode 100644
index 0000000..cdcc077
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java
@@ -0,0 +1,59 @@
+package com.bonus.sgzb.material.controller;
+
+import com.bonus.sgzb.common.core.web.controller.BaseController;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.common.core.web.page.TableDataInfo;
+import com.bonus.sgzb.material.domain.ToDoBean;
+import com.bonus.sgzb.material.service.ToDoService;
+import com.bonus.sgzb.material.vo.NoticeInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+* @description 首页--代办事项
+* @author hay
+* @date 2024/1/15 17:16
+*/
+@Api(tags = " 代办事项")
+@RestController
+@RequestMapping("/cq/todo")
+public class ToDoController_CQ extends BaseController {
+ @Autowired
+ private ToDoService toDoService;
+
+ /**
+ * 代办事项列表
+ */
+ @ApiOperation(value = "代办事项列表")
+ @GetMapping("/getToDoList")
+ public TableDataInfo getToDoList(ToDoBean bean)
+ {
+ startPage();
+ List list = toDoService.getToDoList(bean);
+ return getDataTable(list);
+ }
+
+ @ApiOperation(value = "代办事件下拉")
+ @PostMapping("/getTaskType")
+ public AjaxResult getTaskType(ToDoBean bean){
+ return toDoService.getTaskType(bean);
+ }
+
+
+ /**
+ * 发送催办短信
+ * @param noticeInfoVO
+ * @return
+ */
+ @ApiOperation(value = "催办")
+ @PostMapping("/urgentProcessing")
+ public AjaxResult urgentProcessing(@RequestBody NoticeInfoVO noticeInfoVO){
+ return toAjax(toDoService.urgentProcessing(noticeInfoVO));
+ }
+
+
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java
new file mode 100644
index 0000000..73b9634
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java
@@ -0,0 +1,59 @@
+package com.bonus.sgzb.material.controller;
+
+import com.bonus.sgzb.common.core.web.controller.BaseController;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.common.core.web.page.TableDataInfo;
+import com.bonus.sgzb.material.domain.ToDoBean;
+import com.bonus.sgzb.material.service.ToDoService;
+import com.bonus.sgzb.material.vo.NoticeInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+* @description 首页--代办事项
+* @author hay
+* @date 2024/1/15 17:16
+*/
+@Api(tags = " 代办事项")
+@RestController
+@RequestMapping("/gz/todo")
+public class ToDoController_GZ extends BaseController {
+ @Autowired
+ private ToDoService toDoService;
+
+ /**
+ * 代办事项列表
+ */
+ @ApiOperation(value = "代办事项列表")
+ @GetMapping("/getToDoList")
+ public TableDataInfo getToDoList(ToDoBean bean)
+ {
+ startPage();
+ List list = toDoService.getToDoList(bean);
+ return getDataTable(list);
+ }
+
+ @ApiOperation(value = "代办事件下拉")
+ @PostMapping("/getTaskType")
+ public AjaxResult getTaskType(ToDoBean bean){
+ return toDoService.getTaskType(bean);
+ }
+
+
+ /**
+ * 发送催办短信
+ * @param noticeInfoVO
+ * @return
+ */
+ @ApiOperation(value = "催办")
+ @PostMapping("/urgentProcessing")
+ public AjaxResult urgentProcessing(@RequestBody NoticeInfoVO noticeInfoVO){
+ return toAjax(toDoService.urgentProcessing(noticeInfoVO));
+ }
+
+
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_CQ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_CQ.java
new file mode 100644
index 0000000..251e944
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_CQ.java
@@ -0,0 +1,22 @@
+package com.bonus.sgzb.material.mapper;
+
+import com.bonus.sgzb.material.domain.ToDoBean;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author 阮世耀
+ * @Create 2023/12/13 15:45
+ * @Version 1.0
+ */
+@Mapper
+public interface ToDoMapper_CQ {
+
+ /**
+ * 获取TaskType
+ * @param bean
+ * @return ToDoBean
+ */
+ List getTaskType(ToDoBean bean);
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_GZ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_GZ.java
new file mode 100644
index 0000000..fd518a1
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ToDoMapper_GZ.java
@@ -0,0 +1,22 @@
+package com.bonus.sgzb.material.mapper;
+
+import com.bonus.sgzb.material.domain.ToDoBean;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author 阮世耀
+ * @Create 2023/12/13 15:45
+ * @Version 1.0
+ */
+@Mapper
+public interface ToDoMapper_GZ {
+
+ /**
+ * 获取TaskType
+ * @param bean
+ * @return ToDoBean
+ */
+ List getTaskType(ToDoBean bean);
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java
new file mode 100644
index 0000000..29a0c54
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java
@@ -0,0 +1,35 @@
+package com.bonus.sgzb.material.service.impl;
+
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.material.domain.ToDoBean;
+import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
+import com.bonus.sgzb.material.mapper.ToDoMapper;
+import com.bonus.sgzb.material.mapper.ToDoMapper_CQ;
+import com.bonus.sgzb.material.mapper.ToDoMapper_GZ;
+import com.bonus.sgzb.material.service.ToDoService;
+import com.bonus.sgzb.system.api.RemoteUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+public class ToDoServiceImpl_CQ extends ToDoServiceImpl implements ToDoService {
+ @Resource
+ private ToDoMapper_CQ toDoMapper_cq;
+
+ @Override
+ public AjaxResult getTaskType(ToDoBean bean) {
+ List list =new ArrayList<>();
+ try {
+ list = toDoMapper_cq.getTaskType(bean);
+ } catch (Exception e) {
+ log.error("重庆机具-代办事件-查询失败", e);
+ }
+ return AjaxResult.success(list);
+ }
+
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java
new file mode 100644
index 0000000..fb69dc4
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java
@@ -0,0 +1,44 @@
+package com.bonus.sgzb.material.service.impl;
+
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.material.domain.ToDoBean;
+import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
+import com.bonus.sgzb.material.mapper.ToDoMapper;
+import com.bonus.sgzb.material.mapper.ToDoMapper_CQ;
+import com.bonus.sgzb.material.mapper.ToDoMapper_GZ;
+import com.bonus.sgzb.material.service.ToDoService;
+import com.bonus.sgzb.system.api.RemoteUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+public class ToDoServiceImpl_GZ extends ToDoServiceImpl implements ToDoService {
+
+ @Resource
+ private ToDoMapper toDoMapper;
+ @Resource
+ private ToDoMapper_GZ toDoMapper_gz;
+
+
+ @Resource
+ private PurchaseCheckInfoMapper purchaseCheckInfoMapper;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @Override
+ public AjaxResult getTaskType(ToDoBean bean) {
+ List list =new ArrayList<>();
+ try {
+ list = toDoMapper_gz.getTaskType(bean);
+ } catch (Exception e) {
+ log.error("南网仓储-代办事件-查询失败", e);
+ }
+ return AjaxResult.success(list);
+ }
+
+}
diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
similarity index 56%
rename from sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml
rename to sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
index 15884a9..485b754 100644
--- a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
@@ -1,27 +1,24 @@
-# Tomcat
-server:
- port: 9304
-
# Spring
-spring:
- application:
- # 应用名称
- name: sgzb-settlement
- profiles:
- # 环境配置
- active: sgzb_cloud_dev
+spring:
cloud:
+ loadbalancer:
+ # 关闭Ribbon的负载均衡器
+ ribbon:
+ enabled: false
+ # 开启Nacos的负载均衡器
+ nacos:
+ enabled: true
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
config:
# 配置中心地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_cqjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml
new file mode 100644
index 0000000..485b754
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml
@@ -0,0 +1,24 @@
+# Spring
+spring:
+ cloud:
+ loadbalancer:
+ # 关闭Ribbon的负载均衡器
+ ribbon:
+ enabled: false
+ # 开启Nacos的负载均衡器
+ nacos:
+ enabled: true
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
index eac5f63..fdc4a10 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
@@ -9,26 +9,5 @@ spring:
name: sgzb-material
profiles:
# 环境配置
- active: sgzb_cloud_dev
- cloud:
- loadbalancer:
- # 关闭Ribbon的负载均衡器
- ribbon:
- enabled: false
- # 开启Nacos的负载均衡器
- nacos:
- enabled: true
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- config:
- # 配置中心地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ active: sgzb_cloud_local
+
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_CQ.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_CQ.xml
new file mode 100644
index 0000000..d1016a8
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_CQ.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_GZ.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_GZ.xml
new file mode 100644
index 0000000..3de10fc
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ToDoMapper_GZ.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-settlement/pom.xml b/sgzb-modules/sgzb-settlement/pom.xml
deleted file mode 100644
index ddf9921..0000000
--- a/sgzb-modules/sgzb-settlement/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
- sgzb-modules
- com.bonus.sgzb
- 3.6.3
-
- 4.0.0
-
- sgzb-modules-settlement
-
-
- sgzb-modules-settlement
-
-
-
- com.bonus.sgzb
- sgzb-common-core
-
-
- com.bonus.sgzb
- sgzb-common-security
-
-
- com.bonus.sgzb
- sgzb-common-swagger
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-discovery
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-sentinel
-
-
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
-
-
- io.springfox
- springfox-swagger-ui
- ${swagger.fox.version}
-
-
-
-
- com.mysql
- mysql-connector-j
-
-
-
-
- com.bonus.sgzb
- sgzb-common-datasource
-
-
-
-
- com.bonus.sgzb
- sgzb-common-datascope
-
-
-
-
- com.bonus.sgzb
- sgzb-common-log
-
-
-
-
-
- com.bonus.sgzb
- sgzb-common-swagger
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
- org.projectlombok
- lombok
-
-
-
-
- 8
- 8
-
-
-
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java b/sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java
deleted file mode 100644
index f246b26..0000000
--- a/sgzb-modules/sgzb-settlement/src/main/java/com/bonus/sgzb/settlement/SgzbSettlementApplication.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.bonus.sgzb.settlement;
-
-
-import com.bonus.sgzb.common.security.annotation.EnableCustomConfig;
-import com.bonus.sgzb.common.security.annotation.EnableRyFeignClients;
-import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 结算服务
- *
- * @author ruoyi
- */
-@EnableCustomSwagger2
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@EnableCustomConfig
-@EnableRyFeignClients
-public class SgzbSettlementApplication
-{
- public static void main(String[] args)
- {
- SpringApplication.run(SgzbSettlementApplication.class, args);
- System.out.println("(♥◠‿◠)ﾉﾞ 结算模块启动成功 ლ(´ڡ`ლ)ﾞ \n" +
- " .-------. ____ __ \n" +
- " | _ _ \\ \\ \\ / / \n" +
- " | ( ' ) | \\ _. / ' \n" +
- " |(_ o _) / _( )_ .' \n" +
- " | (_,_).' __ ___(_ o _)' \n" +
- " | |\\ \\ | || |(_,_)' \n" +
- " | | \\ `' /| `-' / \n" +
- " | | \\ / \\ / \n" +
- " ''-' `'-' `-..-' ");
- }
-}
diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/banner.txt b/sgzb-modules/sgzb-settlement/src/main/resources/banner.txt
deleted file mode 100644
index 27cacb9..0000000
--- a/sgzb-modules/sgzb-settlement/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ __ _ _
- (_) / _|(_)| |
- _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
-| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
-| | | |_| || (_) || |_| || | | | | || || __/
-|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
- __/ |
- |___/
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/logback.xml b/sgzb-modules/sgzb-settlement/src/main/resources/logback.xml
deleted file mode 100644
index ed6c17d..0000000
--- a/sgzb-modules/sgzb-settlement/src/main/resources/logback.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- ${log.pattern}
-
-
-
-
-
- ${log.path}/info.log
-
-
-
- ${log.path}/info.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
- INFO
-
- ACCEPT
-
- DENY
-
-
-
-
- ${log.path}/error.log
-
-
-
- ${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
- ERROR
-
- ACCEPT
-
- DENY
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-system/pom.xml b/sgzb-modules/sgzb-system/pom.xml
index 3e9dd44..1134279 100644
--- a/sgzb-modules/sgzb-system/pom.xml
+++ b/sgzb-modules/sgzb-system/pom.xml
@@ -9,7 +9,7 @@
4.0.0
- sgzb-modules-system
+ sgzb-modules-system-1.0
sgzb-modules-system系统模块
diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_dev.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_dev.yml
new file mode 100644
index 0000000..0544be2
--- /dev/null
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_dev.yml
@@ -0,0 +1,51 @@
+# Spring
+spring:
+ servlet:
+ multipart:
+ max-request-size: 50MB
+ max-file-size: 30MB
+ cloud:
+ loadbalancer:
+ # 关闭Ribbon的负载均衡器
+ ribbon:
+ enabled: false
+ # 开启Nacos的负载均衡器
+ nacos:
+ enabled: true
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#腾讯云sms
+tencent:
+ sms:
+ #api秘钥标识
+ accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
+ #api秘钥
+ accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
+ #请求域名
+ endpoint: sms.tencentcloudapi.com
+ #所属区域
+ region: ap-guangzhou
+ #腾讯云申请应用id
+ sdkAppId: 1400494336
+ #签名
+ smsSign: 南方电网互联网
+ #云平台模板id 2116937-验收通知 2115503-登录验证
+ templateId: 2116937,2115503
+
+
+
+
+
+
diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_local.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_local.yml
new file mode 100644
index 0000000..0544be2
--- /dev/null
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_local.yml
@@ -0,0 +1,51 @@
+# Spring
+spring:
+ servlet:
+ multipart:
+ max-request-size: 50MB
+ max-file-size: 30MB
+ cloud:
+ loadbalancer:
+ # 关闭Ribbon的负载均衡器
+ ribbon:
+ enabled: false
+ # 开启Nacos的负载均衡器
+ nacos:
+ enabled: true
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ config:
+ # 配置中心地址
+ server-addr: 127.0.0.1:8848
+ namespace: sgzb_cloud_dev_cqjj
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#腾讯云sms
+tencent:
+ sms:
+ #api秘钥标识
+ accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
+ #api秘钥
+ accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
+ #请求域名
+ endpoint: sms.tencentcloudapi.com
+ #所属区域
+ region: ap-guangzhou
+ #腾讯云申请应用id
+ sdkAppId: 1400494336
+ #签名
+ smsSign: 南方电网互联网
+ #云平台模板id 2116937-验收通知 2115503-登录验证
+ templateId: 2116937,2115503
+
+
+
+
+
+
diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
index 7d592b9..3294f3e 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
@@ -4,58 +4,10 @@ server:
# Spring
spring:
- servlet:
- multipart:
- max-request-size: 50MB
- max-file-size: 30MB
application:
# 应用名称
name: sgzb-system
profiles:
# 环境配置
- active: sgzb_cloud_dev
- cloud:
- loadbalancer:
- # 关闭Ribbon的负载均衡器
- ribbon:
- enabled: false
- # 开启Nacos的负载均衡器
- nacos:
- enabled: true
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- config:
- # 配置中心地址
- server-addr: 192.168.0.14:8848
- namespace: sgzb_cloud_dev_cqjj
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-#腾讯云sms
-tencent:
- sms:
- #api秘钥标识
- accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
- #api秘钥
- accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
- #请求域名
- endpoint: sms.tencentcloudapi.com
- #所属区域
- region: ap-guangzhou
- #腾讯云申请应用id
- sdkAppId: 1400494336
- #签名
- smsSign: 南方电网互联网
- #云平台模板id 2116937-验收通知 2115503-登录验证
- templateId: 2116937,2115503
-
-
-
-
-
+ active: sgzb_cloud_local
diff --git a/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml b/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml
index 2a74104..00aade5 100644
--- a/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml
+++ b/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
config:
# 配置中心地址
- server-addr: 192.168.0.14:8848
+ server-addr: 127.0.0.1:8848
# 配置文件格式
file-extension: yml
# 共享配置