diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/PhoneOtpWorkerLoginStrategy.java b/bonus-auth/src/main/java/com/bonus/auth/service/PhoneOtpWorkerLoginStrategy.java index 161eace..a4de905 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/PhoneOtpWorkerLoginStrategy.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/PhoneOtpWorkerLoginStrategy.java @@ -26,7 +26,7 @@ public class PhoneOtpWorkerLoginStrategy implements LoginStrategy { @Resource private PasswordValidatorService passwordValidatorService; - @Value("${worker.phone}") +// @Value("${worker.phone}") private String workerPhone; @Override diff --git a/bonus-auth/src/main/resources/bootstrap-dev.yml b/bonus-auth/src/main/resources/bootstrap-dev.yml index 254898d..6055fd3 100644 --- a/bonus-auth/src/main/resources/bootstrap-dev.yml +++ b/bonus-auth/src/main/resources/bootstrap-dev.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38081 + port: 37081 # Spring spring: @@ -9,11 +9,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: huadong_realname_local + namespace: gansu_realname_local config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: huadong_realname_local + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-auth/src/main/resources/bootstrap-local.yml b/bonus-auth/src/main/resources/bootstrap-local.yml index 01cddbb..413d2db 100644 --- a/bonus-auth/src/main/resources/bootstrap-local.yml +++ b/bonus-auth/src/main/resources/bootstrap-local.yml @@ -1,26 +1,26 @@ # Tomcat -server: - port: 38081 +server: + port: 37081 # Spring spring: cloud: nacos: + username: nacos + password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:18848 - namespace: rela_name_system + server-addr: 192.168.0.14:8848 + namespace: gansu_realname_local config: # 配置中心地址 - server-addr: 127.0.0.1:18848 - namespace: rela_name_system + server-addr: 192.168.0.14:8848 + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - username: nacos - password: Jjsp@nacos2023 #加密组件 jasypt: encryptor: diff --git a/bonus-gateway/src/main/resources/bootstrap-dev.yml b/bonus-gateway/src/main/resources/bootstrap-dev.yml index 5d90749..f1d0171 100644 --- a/bonus-gateway/src/main/resources/bootstrap-dev.yml +++ b/bonus-gateway/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ # Tomcat server: - port: 38080 + port: 37080 servlet: - context-path: hd-real-name + context-path: gs-real-name # Spring spring: diff --git a/bonus-gateway/src/main/resources/bootstrap-local.yml b/bonus-gateway/src/main/resources/bootstrap-local.yml index 77970cb..4bd99a1 100644 --- a/bonus-gateway/src/main/resources/bootstrap-local.yml +++ b/bonus-gateway/src/main/resources/bootstrap-local.yml @@ -1,28 +1,29 @@ # Tomcat server: - port: 38080 + port: 37080 servlet: - context-path: hd-real-name + context-path: gs-real-name # Spring spring: cloud: nacos: + username: nacos + password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: huadong_realname_local + namespace: gansu_realname_local config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: huadong_realname_local + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - username: nacos - password: nacos + sentinel: # 取消控制台懒加载 eager: true diff --git a/bonus-modules/bonus-bmw/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-bmw/src/main/resources/bootstrap-dev.yml index c8874a6..6d41e0f 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/bootstrap-dev.yml +++ b/bonus-modules/bonus-bmw/src/main/resources/bootstrap-dev.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38083 + port: 37083 # Spring spring: diff --git a/bonus-modules/bonus-bmw/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-bmw/src/main/resources/bootstrap-local.yml index 8932389..db9d0ad 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/bootstrap-local.yml +++ b/bonus-modules/bonus-bmw/src/main/resources/bootstrap-local.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38083 + port: 37083 # Spring spring: @@ -11,11 +11,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: fangliang_test + namespace: gansu_realname_local config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: fangliang_test + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 @@ -26,3 +26,6 @@ spring: jasypt: encryptor: password: Encrypt + +face: + path: http://112.29.103.165:1616/faceIdentification diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap-dev.yml index b99d88d..244ff95 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap-dev.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap-dev.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 39300 + port: 37300 # Spring spring: diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap-local.yml index 7bdf6aa..bff67fe 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap-local.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap-local.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 39300 + port: 37084 # Spring spring: @@ -11,11 +11,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: fangliang_test + namespace: gansu_realname_local config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: fangliang_test + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml index e3065e9..6c09a29 100644 --- a/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml +++ b/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9203 + port: 37901 spring: cloud: diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml index 39a968c..6f5d19d 100644 --- a/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml +++ b/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml @@ -1,23 +1,23 @@ # Tomcat server: - port: 9203 + port: 37085 spring: cloud: - nacos: + username: nacos + password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:18848 - namespace: rela_name_system + server-addr: 192.168.0.14:8848 + namespace: gansu_realname_local config: # 配置中心地址 - server-addr: 127.0.0.1:18848 - namespace: rela_name_system + server-addr: 192.168.0.14:8848 + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - username: nacos - password: Jjsp@nacos2023 + diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml index 19049f9..4cecd11 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38082 + port: 37082 # Spring spring: diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml index 2e6d855..87dbe56 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38082 + port: 37082 # Spring spring: @@ -11,11 +11,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: huadong_realname_local + namespace: gansu_realname_local config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: huadong_realname_local + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 790dc0d..ef68a21 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -1,11 +1,11 @@ # Spring -spring: +spring: application: # 应用名称 name: bonus-system profiles: # 环境配置 - active: dev + active: local task: scheduling: pool: diff --git a/bonus-modules/bonus-urk/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-urk/src/main/resources/bootstrap-local.yml index c7c02b8..8f213cc 100644 --- a/bonus-modules/bonus-urk/src/main/resources/bootstrap-local.yml +++ b/bonus-modules/bonus-urk/src/main/resources/bootstrap-local.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38085 + port: 37091 # Spring spring: cloud: @@ -10,11 +10,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: fangliang_test + namespace: gansu_realname_local config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: fangliang_test + namespace: gansu_realname_local # 配置文件格式 file-extension: yml # 共享配置