打包自动分环境

.drone.yml

@@ -571,8 +571,9 @@ trigger:
       - pull_request
       - push
 
-#正式环境
+
 ---
+#正式环境
 kind: pipeline
 type: docker
 name: kxs-gateway-prod

kxs-gateway/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-gateway/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-gateway/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-gateway/src/main/resources/application.yml

@@ -1,22 +1,8 @@
-
 server:
   port: 9999
 
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-        watch:
-          enabled: true
-        watch-delay: 1000
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - optional:nacos:application-@profiles.active@.yml
-      - optional:nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@

kxs-product/kxs-product-biz/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-product/kxs-product-biz/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-product/kxs-product-biz/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-product/kxs-product-biz/src/main/resources/application.yml

@@ -4,18 +4,8 @@ server:
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - nacos:application-@profiles.active@.yml
-      - nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@
 
 
 

kxs-quartz/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-quartz/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-quartz/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-quartz/src/main/resources/application.yml

@@ -4,16 +4,11 @@ server:
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - nacos:application-@profiles.active@.yml
-      - nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@
+
+
+
+
+
 

kxs-store/kxs-store-biz/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-store/kxs-store-biz/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-store/kxs-store-biz/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-store/kxs-store-biz/src/main/resources/application.yml

@@ -4,18 +4,8 @@ server:
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - nacos:application-@profiles.active@.yml
-      - nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@
 
 
 

kxs-system/kxs-system-biz/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-system/kxs-system-biz/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-system/kxs-system-biz/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-system/kxs-system-biz/src/main/resources/application.yml

@@ -1,21 +1,11 @@
 server:
-  port: 8888
+  port: 8060
 
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - nacos:application-@profiles.active@.yml
-      - nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@
 
 
 

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineServiceImpl.java

@@ -63,11 +63,13 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                         machine.setStatus(0);
                     }
                     machine.setUserId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getUserId, userId);
                     break;
                 case "Status":
                     int status = Integer.parseInt(validFieldDataMap.get(field).toString());
                     if(status == -1){
                         machine.setStatus(status);
+                        lambda.set(KxsMachine::getStatus, status);
                     }
                     break;
                 case "PosSn":
@@ -78,21 +80,27 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                     KxsWarehouse warehouse = kxsWarehouseMapper.selectById(warehouseId);
                     if(warehouse != null){
                         machine.setWarehouseName(warehouse.getWarehouseName());
+                        lambda.set(KxsMachine::getWarehouseName, warehouse.getWarehouseName());
                     }
                     machine.setWarehouseId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getWarehouseId, warehouseId);
                     break;
                 case "BindMerchantId":
                     machine.setMerchantId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getMerchantId, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "PreUserId":
                     machine.setPreUserId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getPreUserId, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "BrandId":
                     machine.setBrandId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getBrandId, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "RecycEndDate":
                     if(validFieldDataMap.get(field) != null){
                         machine.setRecycleEndTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                        lambda.set(KxsMachine::getRecycleEndTime, LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     }else{
                         lambda.set(KxsMachine::getRecycleEndTime, null);
                     }
@@ -109,30 +117,40 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                     }
                     if(recycleEndTime == null ){
                         machine.setRecycleStatus(0);
+                        lambda.set(KxsMachine::getRecycleStatus, 0);
                         break;
                     }
                     if(isPurchase == 0 && recycleEndTime.isAfter(LocalDateTime.now())){
                         machine.setRecycleStatus(1);
+                        lambda.set(KxsMachine::getRecycleStatus, 1);
                     }else{
                         machine.setRecycleStatus(0);
+                        lambda.set(KxsMachine::getRecycleStatus, 0);
                     }
                     break;
                 case "PosSnType":
                     machine.setMachineType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getMachineType, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "PrizeParams":
                     if(validFieldDataMap.get(field) != null){
                         machine.setCashPledge(new BigDecimal(validFieldDataMap.get(field).toString()));
+                        lambda.set(KxsMachine::getCashPledge, new BigDecimal(validFieldDataMap.get(field).toString()));
                     }else{
                         machine.setCashPledge(new BigDecimal(299));
+                        lambda.set(KxsMachine::getCashPledge, new BigDecimal(299));
                     }
                     break;
                 case "SeoKeyword":
-                    BigDecimal bigDecimal = new BigDecimal(validFieldDataMap.get(field).toString());
-                    if(bigDecimal.intValue() > 1000){
-                        bigDecimal = NumberUtil.div(bigDecimal, 100);
+                    if(validFieldDataMap.get(field) != null){
+                        BigDecimal bigDecimal = new BigDecimal(validFieldDataMap.get(field).toString());
+                        if(bigDecimal.intValue() > 1000){
+                            bigDecimal = NumberUtil.div(bigDecimal, 100);
+                        }
+                        machine.setSourcePledge(bigDecimal);
+                    }else{
+                        lambda.set(KxsMachine::getSourcePledge, null);
                     }
-                    machine.setSourcePledge(bigDecimal);
                     break;
                 case "BindingTime":
                     if(validFieldDataMap.get(field) != null){
@@ -150,33 +168,43 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                     break;
                 case "DownFee":
                     machine.setMachineRatio(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getMachineRatio, new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;
                 case "ActivationState":
                     machine.setIsAct(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getIsAct, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "BindingState":
                     machine.setBindStatus(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getBindStatus, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "IsFirst":
                     machine.setIsFirst(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getIsFirst, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "LeaderUserId":
                     machine.setLeaderId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getLeaderId, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "OpId":
                     machine.setPartnerId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getPartnerId, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "UpFeeFlag":
                     machine.setUpFeeFlag(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getUpFeeFlag, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "DownFeeFlag":
                     machine.setDownFeeFlag(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getDownFeeFlag, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "IsSupplement":
                     machine.setIsSupply(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getIsSupply, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "IsOpAct":
                     machine.setIsOpAct(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    lambda.set(KxsMachine::getIsOpAct, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "TransferTime":
                     if(validFieldDataMap.get(field) != null){

kxs-transfer/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-transfer/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-transfer/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-transfer/src/main/resources/application.yml

@@ -5,18 +5,5 @@ server:
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-        watch:
-          enabled: true
-        watch-delay: 1000
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - optional:nacos:application-@profiles.active@.yml
-      - optional:nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@

kxs-user/kxs-user-biz/src/main/resources/application-dev.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-user/kxs-user-biz/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-user/kxs-user-biz/src/main/resources/application-test.yml

@@ -0,0 +1,17 @@
+
+spring:
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
+        watch:
+          enabled: true
+        watch-delay: 1000
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+  config:
+    import:
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml

kxs-user/kxs-user-biz/src/main/resources/application.yml

@@ -1,21 +1,11 @@
 server:
-  port: 8060
+  port: 8888
 
 spring:
   application:
     name: @artifactId@
-  cloud:
-    nacos:
-      username: @nacos.username@
-      password: @nacos.password@
-      discovery:
-        server-addr: ${NACOS_HOST:kxs-register}:${NACOS_PORT:8848}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-  config:
-    import:
-      - nacos:application-@profiles.active@.yml
-      - nacos:${spring.application.name}-@profiles.active@.yml
+  profiles:
+    active: @profiles.active@