nacos鉴权调整

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

@@ -22,8 +22,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-        #username: nacos
-        #password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         server-addr: 127.0.0.1:8848  # 配置中心地址
         file-extension: yml  # 配置文件格式
@@ -31,8 +31,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        #username: ${spring.cloud.nacos.discovery.username}
-        #password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -25,8 +25,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-        #username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -37,8 +37,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-admin-server/src/main/resources/bootstrap.yml

@@ -35,8 +35,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        #username: nacos
-        #password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -47,8 +47,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        #username: ${spring.cloud.nacos.discovery.username}
-        #password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/proofread/mapper/xml/ProofreadIssuedMapper.xml

@@ -36,7 +36,7 @@
 		FROM
 			proofread_issued a
 			LEFT JOIN program_project_list_info b ON a.project_id = b.id
-			LEFT JOIN program_report_no c ON b.id = c.program_id
+			LEFT JOIN program_report_no c ON b.id = c.program_id and c.del_flag = 0
 			LEFT JOIN sys_user d ON b.project_manager = d.id
 			LEFT JOIN sys_office e ON d.office_id = e.id
 		WHERE
@@ -56,7 +56,7 @@
 			b.report_type
 		FROM
 			program_project_list_info b
-			LEFT JOIN program_report_no c ON b.id = c.program_id
+			LEFT JOIN program_report_no c ON b.id = c.program_id and c.del_flag = 0
 			LEFT JOIN sys_user d ON b.project_manager = d.id
 			LEFT JOIN sys_office e ON d.office_id = e.id
 		WHERE

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -201,7 +201,7 @@ public class ReimbursementInfoService {
         }
         // 发票号
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
-            queryWrapper.inSql("a.id","SELECT info_id FROM reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+            queryWrapper.inSql("a.id","SELECT info_id FROM reimbursement_amount_info WHERE number = '"+ dto.getFinanceNumber() +"' AND del_flag = 0");
         }
         //获取当前登录人信息
         /*UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));

jeeplus-modules/jeeplus-assess/src/main/resources/bootstrap.yml

@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -215,7 +215,7 @@ public class CcpmReimbursementInfoService {
         }
         // 发票号
         if (StringUtils.isNotEmpty(dto.getFinanceNumber())) {
-            queryWrapper.inSql("a.id","SELECT info_id FROM ccpm_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+            queryWrapper.inSql("a.id","SELECT info_id FROM ccpm_reimbursement_amount_info WHERE number = '"+ dto.getFinanceNumber() +"' AND del_flag = 0");
         }
         /*//获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));

jeeplus-modules/jeeplus-ccpm/src/main/resources/bootstrap.yml

@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -214,7 +214,7 @@ public class ZsReimbursementInfoService {
         }
         // 发票号
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
-            queryWrapper.inSql("a.id","SELECT info_id FROM zs_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+            queryWrapper.inSql("a.id","SELECT info_id FROM zs_reimbursement_amount_info WHERE number = '"+ dto.getFinanceNumber() +"' AND del_flag = 0");
         }
         /*//获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));

jeeplus-modules/jeeplus-centrecareful/src/main/resources/bootstrap.yml

@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -213,7 +213,7 @@ public class ConsultancyReimbursementInfoService {
         }
         // 发票号
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
-            queryWrapper.inSql("a.id","SELECT info_id FROM consultancy_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+            queryWrapper.inSql("a.id","SELECT info_id FROM consultancy_reimbursement_amount_info WHERE number = '"+ dto.getFinanceNumber() +"' AND del_flag = 0");
         }
         /*//获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));

jeeplus-modules/jeeplus-consult/src/main/resources/bootstrap.yml

@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

jeeplus-modules/jeeplus-devtools/src/main/resources/bootstrap.yml

@@ -37,8 +37,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-file/src/main/resources/bootstrap.yml

@@ -39,8 +39,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -51,8 +51,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -59,6 +59,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -1251,4 +1252,31 @@ public class CwProjectReportController {
         return flag;
     }
 
+    /**
+     * 处理报告号模板下载（调整为指定年度的报告号）
+     * @return
+     */
+    @RequestMapping(value = "importDetail/template")
+    public void importFileTemplate(HttpServletResponse response, HttpServletRequest request) {
+        try {
+            InputStream inputStream = this.getClass().getResourceAsStream("/dot/报告号调整模板.xlsx");
+            //强制下载不打开
+            response.setContentType("application/force-download");
+            OutputStream out = response.getOutputStream();
+            //使用URLEncoder来防止文件名乱码或者读取错误
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("finance_invoice_detail_template.xlsx", "UTF-8"));
+            int b = 0;
+            byte[] buffer = new byte[1000000];
+            while (b != -1) {
+                b = inputStream.read(buffer);
+                if (b != -1) out.write(buffer, 0, b);
+            }
+            inputStream.close();
+            out.close();
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -227,7 +227,7 @@ public class CwReimbursementInfoService {
         }
         // 发票号
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
-            queryWrapper.inSql("a.id","SELECT info_id FROM cw_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+            queryWrapper.inSql("a.id","SELECT info_id FROM cw_reimbursement_amount_info WHERE number = '"+ dto.getFinanceNumber() +"' AND del_flag = 0");
         }
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目

jeeplus-modules/jeeplus-finance/src/main/resources/bootstrap.yml

@@ -38,8 +38,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-#        username: nacos
-#        password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -50,8 +50,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-flowable/src/main/resources/bootstrap.yml

@@ -25,8 +25,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.pro.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -37,8 +37,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.pro.active}
-        #username: ${spring.cloud.nacos.discovery.username}
-        #password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-human/src/main/resources/bootstrap.yml

@@ -38,8 +38,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-#        username: nacos
-#        password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -50,8 +50,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-public-modules/src/main/resources/bootstrap.yml

@@ -3,18 +3,6 @@ server:
   port: 9245
   servlet:
     context-path:
-#mybatis-plus配置
-#mybatis-plus:
-#  mapper-locations:
-#    - classpath*:com/jeeplus/modules/**/*Mapper.xml
-#    - classpath:/META-INF/admin-mybatis-mappings/*.xml
-#    - classpath:/META-INF/modeler-mybatis-mappings/*.xml
-#  #实体扫描，多个package用逗号或者分号分隔
-#  typeAliasesPackage: com.jeeplus.modules.**.entity
-#  configuration-properties:
-#    prefix:
-#    boolValue: TRUE
-#    blobType: BLOB
 
 # Spring
 spring:
@@ -37,8 +25,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        #username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +37,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

jeeplus-modules/jeeplus-system/src/main/resources/bootstrap.yml

@@ -39,8 +39,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-#        username: nacos
-#        password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -51,8 +51,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-test/src/main/resources/bootstrap.yml

@@ -36,8 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        #username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -48,8 +48,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-ureport/src/main/resources/bootstrap.yml

@@ -36,8 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        #username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -48,8 +48,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-wps/src/main/resources/bootstrap.yml

@@ -36,8 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -48,8 +48,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-xxl-job-admin/src/main/resources/bootstrap.yml

@@ -22,8 +22,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -34,8 +34,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/resources/bootstrap.yml

@@ -16,8 +16,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: nacos
-        # password: nacos
+        username: nacos
+        password: jsxgpassword
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -28,8 +28,14 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        # username: ${spring.cloud.nacos.discovery.username}
-        # password: ${spring.cloud.nacos.discovery.password}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
+      auth:
+        plugin:
+          nacos:
+            token:
+              secret:
+                key: cCtJSWRxbW1xT3FmZkh1RTBpdTltYkM5ZlNSaTRyQ1RiSzJzV1pweEYycz0=
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)