diff --git a/docker-cloud/nacos/.env b/docker-cloud/nacos/.env
index 8dce7148..bc6cbdd4 100644
--- a/docker-cloud/nacos/.env
+++ b/docker-cloud/nacos/.env
@@ -2,9 +2,9 @@ MODE=standalone
PREFER_HOST_MODE=hostname
NACOS_APPLICATION_PORT=8848
SPRING_DATASOURCE_PLATFORM=mysql
-MYSQL_SERVICE_HOST=192.168.3.10
+MYSQL_SERVICE_HOST=124.71.99.36
MYSQL_SERVICE_DB_NAME=kicc_config
-MYSQL_SERVICE_PORT=8052
-MYSQL_SERVICE_USER=root
-MYSQL_SERVICE_PASSWORD=kanglai@2022
+MYSQL_SERVICE_PORT=3158
+MYSQL_SERVICE_USER=u_kicc_account
+MYSQL_SERVICE_PASSWORD=#KICC$(2023)&0215
NACOS_AUTH_TOKEN_EXPIRE_SECONDS=18000
diff --git a/kicc-auth/src/main/resources/bootstrap.yml b/kicc-auth/src/main/resources/bootstrap.yml
index 1c48fb51..cf9eb044 100644
--- a/kicc-auth/src/main/resources/bootstrap.yml
+++ b/kicc-auth/src/main/resources/bootstrap.yml
@@ -8,8 +8,7 @@ spring:
nacos:
discovery:
ip: @profiles.ip@
- server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
- #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
index 3245e7c3..d9a4b29e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
@@ -7,9 +7,9 @@ spring:
cloud:
nacos:
discovery:
- #ip: @profiles.ip@
- server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
- #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+ ip: @profiles.ip@
+ #server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
index a00c90f3..4f8bea4f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
@@ -151,7 +151,7 @@ public class UserController {
SecurityContextHolder.getContext().setAuthentication(authentication);
externalUser.setPassword(ENCODER.encode(externalUser.getPassword()));
userService.saveUser(externalUser);
- return R.ok();
+ return R.ok(externalUser);
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
index 9f7f904c..eea2f501 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
@@ -11,9 +11,9 @@ spring:
cloud:
nacos:
discovery:
- #ip: @profiles.ip@
- server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
- #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+ ip: @profiles.ip@
+ #server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-register/src/main/resources/bootstrap.yml b/kicc-register/src/main/resources/bootstrap.yml
index e16e2a04..d7d5b8bd 100644
--- a/kicc-register/src/main/resources/bootstrap.yml
+++ b/kicc-register/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
db:
num: 1
- user: ${MYSQL_USER:u_kanglai_account}
- password: ${MYSQL_PWD:$kanglai.<2021>#}
+ user: ${MYSQL_USER:root}
+ password: ${MYSQL_PWD:kanglai@2022}
url:
- 0: jdbc:mysql://${MYSQL_HOST:47.111.191.224}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ 0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
nacos:
core:
diff --git a/pom.xml b/pom.xml
index 6c027e30..9af39a32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
0.0.29
3.8.1
0.32.0
- https://120.26.168.56:8062
- C:\Users\Administrator\Desktop\CA
+ https://139.9.72.189:2276
+ /usr/local/docker-ssl-kicc
@@ -98,8 +98,7 @@
kicc-common
kicc-visual
kicc-common-demo
-
-
+
@@ -259,7 +258,7 @@
kicc-prod
PROD-GROUP
- xxx.xxx.xxx.xxx
+ 139.9.72.189