feat: 生产线部署

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_PORT=3158
-MYSQL_SERVICE_USER=root
+MYSQL_SERVICE_USER=u_kicc_account
-MYSQL_SERVICE_PASSWORD=kanglai@2022
+MYSQL_SERVICE_PASSWORD=#KICC$(2023)&0215
 NACOS_AUTH_TOKEN_EXPIRE_SECONDS=18000

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}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml

@@ -7,9 +7,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        #ip: @profiles.ip@
+        ip: @profiles.ip@
-        server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+        #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}

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);
     }
 
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml

@@ -11,9 +11,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        #ip: @profiles.ip@
+        ip: @profiles.ip@
-        server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+        #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}

kicc-register/src/main/resources/bootstrap.yml

@@ -4,10 +4,10 @@ server:
 
 db:
   num: 1
-  user: ${MYSQL_USER:u_kanglai_account}
+  user: ${MYSQL_USER:root}
-  password: ${MYSQL_PWD:$kanglai.<2021>#}
+  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:

pom.xml

@@ -30,8 +30,8 @@
 		<spring.checkstyle.plugin>0.0.29</spring.checkstyle.plugin>
 		<apache.compiler.plugin>3.8.1</apache.compiler.plugin>
 		<docker.plugin.version>0.32.0</docker.plugin.version>
-		<docker.host>https://120.26.168.56:8062</docker.host>
+		<docker.host>https://139.9.72.189:2276</docker.host>
-		<docker.certPath>C:\Users\Administrator\Desktop\CA</docker.certPath>
+		<docker.certPath>/usr/local/docker-ssl-kicc</docker.certPath>
 	</properties>
 
 	<!-- 以下依赖 全局所有的模块都会引入  -->
@@ -98,8 +98,7 @@
 		<module>kicc-common</module>
 		<module>kicc-visual</module>
 		<module>kicc-common-demo</module>
-
+	</modules>
-    </modules>
 
 	<dependencyManagement>
 		<dependencies>
@@ -259,7 +258,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-prod</profiles.namespace>
 				<profiles.group>PROD-GROUP</profiles.group>
-				<profiles.ip>xxx.xxx.xxx.xxx</profiles.ip>
+				<profiles.ip>139.9.72.189</profiles.ip>
 			</properties>
 		</profile>
 		<profile>