所有模块开启nacos鉴权

pqs-advance/advance-boot/src/main/resources/bootstrap.yml

@@ -22,15 +22,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   servlet:
     multipart:
@@ -43,7 +47,7 @@ spring:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-auth/src/main/resources/bootstrap.yml

@@ -23,15 +23,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
@@ -39,7 +43,7 @@ spring:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-bpm/bpm-boot/src/main/resources/bootstrap.yml

@@ -25,15 +25,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: bpm-config.yaml
+          - data-id: bpm-config.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
@@ -51,7 +55,7 @@ flowable:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-common/common-microservice/src/main/java/com/njcn/microservice/listener/NacosLogbackConfigLoader.java

@@ -34,7 +34,7 @@ public class NacosLogbackConfigLoader implements SpringApplicationRunListener, A
 
     @Override
     public void environmentPrepared(ConfigurableEnvironment environment) {
-     /*   String serverAddr = environment.getProperty("spring.cloud.nacos.config.server-addr");
+        String serverAddr = environment.getProperty("spring.cloud.nacos.config.server-addr");
         String namespace = environment.getProperty("spring.cloud.nacos.config.namespace");
         String projectName = environment.getProperty("microservice.ename");
         String logLevel = environment.getProperty("logging.level.root");
@@ -51,7 +51,7 @@ public class NacosLogbackConfigLoader implements SpringApplicationRunListener, A
             logbackConfigContent = logbackConfigContent.replace("logDefaultLevel",logLevel);
             // 应用获取到的Logback配置
             applyLogbackConfig(logbackConfigContent);
-        }*/
+        }
     }
 
     private void applyLogbackConfig(String logbackConfigContent) {

pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java

@@ -59,6 +59,7 @@ public class Knife4jSwaggerConfig {
                 "com.njcn.prepare.harmonic.controller",
                 "com.njcn.prepare.event.controller",
                 "com.njcn.device.pq.controller",
+                "com.njcn.device.terminal.controller",
                 "com.njcn.device.pms.controller",
                 "com.njcn.auth.controller",
                 "com.njcn.system.controller",

pqs-device/device-boot/src/main/resources/bootstrap.yml

@@ -24,15 +24,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
@@ -43,10 +47,10 @@ spring:
       #上传文件的最大值
       max-file-size: 200MB
 
-#项目日志的配置
+
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-event/event-boot/src/main/resources/bootstrap.yml

@@ -23,21 +23,25 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 #mybatis配置信息

pqs-gateway/src/main/resources/bootstrap.yml

@@ -20,15 +20,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
     gateway:
       globalcors:
@@ -196,7 +200,7 @@ spring:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml

@@ -23,19 +23,19 @@ spring:
         ip: @service.server.url@
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
-        #username: @nacos.username@
+        username: @nacos.username@
-        #password: @nacos.password@
+        password: @nacos.password@
       config:
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
-        #username: @nacos.username@
+        username: @nacos.username@
-        #password: @nacos.password@
+        password: @nacos.password@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
             #数据中心使用
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
             #PMS使用
 #          - data-Id: share-config-harmonic-db.yaml
@@ -52,7 +52,7 @@ spring:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-supervision/supervision-boot/src/main/resources/bootstrap.yml

@@ -23,21 +23,25 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 #mybatis配置信息

pqs-system/system-boot/src/main/resources/bootstrap.yml

@@ -22,15 +22,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
@@ -44,7 +48,7 @@ spring:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info
 

pqs-user/user-boot/src/main/resources/bootstrap.yml

@@ -49,15 +49,19 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
             refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-id: share-config-datasource-db.yaml
             refresh: true
   main:
     allow-bean-definition-overriding: true
@@ -65,7 +69,7 @@ spring:
 
 #项目日志的配置
 logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: info