Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

itc-pcitc-dependencies/itc-pcitc-dependencies-service/target/classes/META-INF/spring.factories

@@ -1,5 +0,0 @@
-# src/main/resources/META-INF/spring.factories
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.pictc.config.PcitcAutoConfig,\
-com.pictc.config.JdbcConfig,\
-com.pictc.config.PEventListenerConfig

itc-pcitc-dependencies/itc-pcitc-dependencies-service/target/classes/auto-scan.txt

@@ -1 +0,0 @@
-component=com.pictc

itc-pcitc-dependencies/itc-pcitc-dependencies-service/target/classes/t-banner.txt

@@ -1,9 +0,0 @@
-
- ███████    ██████  ██ ██████████   ██████ 			
-░██░░░░██  ██░░░░██░██░░░░░██░░░   ██░░░░██			
-░██   ░██ ██    ░░ ░██    ░██     ██    ░░ 			服务名称：${serverName}
-░███████ ░██       ░██    ░██    ░██       			启动环境：${profiles}
-░██░░░░  ░██       ░██    ░██    ░██       			启动耗时：${time}s
-░██      ░░██    ██░██    ░██    ░░██    ██			访问地址：${url}
-░██       ░░██████ ░██    ░██     ░░██████ 
-░░         ░░░░░░  ░░     ░░       ░░░░░░  

itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-local.yml

@@ -2,11 +2,11 @@ spring:
   cloud:
     nacos: #nacos监控
       config:
-        server-addr: 10.10.2.101:8848 # nacos 配置中心地址
+        server-addr: 127.0.0.1:8848 # nacos 配置中心地址
         namespace: ITC-MS
         group: DNE
         username: nacos
-        password: Lng@123
+        password: nacos
         extension-configs:
           - data-id: global-local.yml
             refresh: true

itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml

@@ -7,11 +7,11 @@ spring:
   main:
     allow-bean-definition-overriding: true
   profiles: 
-    active: dev
+    active: local
   cloud:
     nacos: #nacos监控
       config:
-        server-addr: 10.0.252.1:8848 # nacos 配置中心地址
+        server-addr: 10.10.2.101:8848 # nacos 配置中心地址
         namespace: ITC-MS
         group: DNE
         username: nacos