From 854a9b3dc4a180203623e84752dcb9d2c6503cf2 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 16 Aug 2024 19:12:50 +0800 Subject: [PATCH] change profile --- scripts/deploy.sh | 68 +++---------------- scripts/pipeline.sh | 1 + 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 | 34 +--------- sgzb-gateway/pom.xml | 2 +- .../sgzb/gateway/SgzbGatewayApplication.java | 8 +++ .../resources/bootstrap-sgzb_cloud_dev.yml | 50 ++++++++++++++ .../resources/bootstrap-sgzb_cloud_local.yml | 50 ++++++++++++++ sgzb-gateway/src/main/resources/bootstrap.yml | 50 +------------- sgzb-modules/sgzb-material/pom.xml | 2 +- .../resources/bootstrap-sgzb_cloud_dev.yml | 31 +++++++++ .../resources/bootstrap-sgzb_cloud_local.yml | 31 +++++++++ .../src/main/resources/bootstrap.yml | 31 +-------- sgzb-modules/sgzb-system/pom.xml | 2 +- .../resources/bootstrap-sgzb_cloud_dev.yml | 46 +++++++++++++ .../resources/bootstrap-sgzb_cloud_local.yml | 45 ++++++++++++ .../src/main/resources/bootstrap.yml | 51 +------------- 19 files changed, 348 insertions(+), 224 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/resources/bootstrap-sgzb_cloud_dev.yml create mode 100644 sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml 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..f30a20e 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,38 +1,31 @@ #!/bin/sh -export deploy_path=/opt/builds/${JOB_NAME}/${BUILD_NUMBER} +#export deploy_path=/opt/builds/${JOB_NAME}/${BUILD_NUMBER} +export deploy_path=/opt/builds/${JOB_NAME} echo "--------moveFile start--------------" rm -rf $deploy_path mkdir -p $deploy_path cd $deploy_path 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-auth/target/sgzb-auth-cq1.0.jar $deploy_path +mv ${WORKSPACE}/sgzb-gateway/target/sgzb-gateway-cq1.0.jar $deploy_path +mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system-cq1.0.jar $deploy_path +mv ${WORKSPACE}/sgzb-modules/sgzb-material/target/sgzb-modules-material-cq1.0.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_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-cq1.0.jar +export sgzb_gateway_jar=sgzb-gateway-cq1.0.jar +export sgzb_modules_system_jar=sgzb-modules-system-cq1.0.jar +export sgzb_modules_material_jar=sgzb-modules-material-cq1.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 if($auth_service_enable);then @@ -102,47 +95,6 @@ if($sgzb_modules_system_enable);then 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 开始启动--------------" diff --git a/scripts/pipeline.sh b/scripts/pipeline.sh index 3583573..cfb8ab3 100644 --- a/scripts/pipeline.sh +++ b/scripts/pipeline.sh @@ -5,6 +5,7 @@ pipeline { JAVA_HOME = '/usr/lib/jvm/jdk1.8.0_381' JOBNAME="${JOB_NAME}" JENKINS_NODE_COOKIE = "dontKillMe" + SPRING_PROFILES_ACTIVE = "sgzb_cloud_dev" } stages { stage('Check out') { diff --git a/sgzb-auth/pom.xml b/sgzb-auth/pom.xml index 762a179..3b591db 100644 --- a/sgzb-auth/pom.xml +++ b/sgzb-auth/pom.xml @@ -8,7 +8,7 @@ 4.0.0 - sgzb-auth + sgzb-auth-cq1.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..416cf1c --- /dev/null +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_dev.yml @@ -0,0 +1,34 @@ +# Spring +spring: + 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-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..82f42c7 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -9,36 +9,4 @@ spring: name: sgzb-auth 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 + active: sgzb_cloud_local diff --git a/sgzb-gateway/pom.xml b/sgzb-gateway/pom.xml index f872844..8f083e4 100644 --- a/sgzb-gateway/pom.xml +++ b/sgzb-gateway/pom.xml @@ -8,7 +8,7 @@ 4.0.0 - sgzb-gateway + sgzb-gateway-cq1.0 sgzb-gateway网关模块 diff --git a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java index 99c66fd..50beecb 100644 --- a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java +++ b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java @@ -25,6 +25,14 @@ public class SgzbGatewayApplication implements CommandLineRunner { private StringEncryptor encryptor; @Override public void run(String... args) throws Exception { +// String nacos = encrypt("Jjsp@nacos2023" ); +// String mysqlNm = encrypt("prod_rental" ); +// String mysqlPs = encrypt("bx%RlBIJOyDzHShQpeWI" ); +// String redis = encrypt("Dszbns@Redis123!" ); +// System.err.println( "nacos原始明文密码加密后的结果为：" + nacos ); +// System.err.println( "mysqlNm原始明文密码加密后的结果为：" + mysqlNm ); +// System.err.println( "mysqlPs原始明文密码加密后的结果为：" + mysqlPs ); +// System.err.println( "redis原始明文密码加密后的结果为：" + redis ); } 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..129ce49 --- /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: 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 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..1c81051 --- /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: 192.168.0.14: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/sgzb-material/pom.xml b/sgzb-modules/sgzb-material/pom.xml index 49d2ab2..bb600d0 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-cq1.0 sgzb-modules-material diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml new file mode 100644 index 0000000..9c092b5 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml @@ -0,0 +1,31 @@ +# Spring +spring: + 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} + +# 多站点特殊配置 +sgzb: + site: cq + job: + settlementJobDay: 21 + settlementJobCron: "0 0 1 21 * ?" \ 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..af03a82 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml @@ -0,0 +1,31 @@ +# 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} + +# 多站点特殊配置 +sgzb: + site: cq + job: + settlementJobDay: 21 + settlementJobCron: "0 0 1 21 * ?" \ 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 cf08402..095266e 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -9,33 +9,4 @@ 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} - -# 多站点特殊配置 -sgzb: - site: cq - job: - settlementJobDay: 21 - settlementJobCron: "0 0 1 21 * ?" \ No newline at end of file + active: sgzb_cloud_local \ No newline at end of file diff --git a/sgzb-modules/sgzb-system/pom.xml b/sgzb-modules/sgzb-system/pom.xml index 3e9dd44..39d1eca 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-cq1.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..40adac1 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_dev.yml @@ -0,0 +1,46 @@ +# 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: 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 + 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..74632c1 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_local.yml @@ -0,0 +1,45 @@ +# 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..7a0e886 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -4,58 +4,9 @@ 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