苏州分布签章完成后给徐珊发送通知，签章保存文件丢失bug修复

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/factory/WorkAttachmentApiFallbackFactory.java

@@ -116,6 +116,10 @@ public class WorkAttachmentApiFallbackFactory implements FallbackFactory <IWorkA
             public String uploadFile2OSS(InputStream inStream, String fileDir, String fileName) {
                 return null;
             }
+            @Override
+            public String uploadFileSignatureOSS(String filePath, String fileDir, String fileName) {
+                return null;
+            }
 
             @Override
             public void saveMsg2(Map<String, String> map) {

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/feign/IWorkAttachmentApi.java

@@ -173,6 +173,18 @@ public interface IWorkAttachmentApi {
                           @RequestParam(value = "fileName")String fileName);
 
     /**
+     * 上传到OSS服务器  如果同名文件会覆盖服务器上的(签章文件上传)
+     * @param filePath
+     * @param fileDir
+     * @param fileName
+     * @return
+     */
+    @RequestMapping(value = "/oss/file/uploadFileSignatureOSS", method = RequestMethod.POST)
+    String uploadFileSignatureOSS(@RequestParam(value = "filePath")String filePath,
+                          @RequestParam(value = "fileDir")String fileDir,
+                          @RequestParam(value = "fileName")String fileName);
+
+    /**
      * 保存附件信息
      * @param map
      */

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

@@ -14,7 +14,7 @@ spring:
       client:
         url: http://localhost:8989
   profiles:
-    active: dev # 环境配置
+    active: pro # 环境配置
   cloud:
     nacos:
       discovery:
@@ -22,8 +22,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-        username: nacos
-        password: nacos
+        #username: nacos
+        #password: nacos
       config:
         server-addr: 127.0.0.1:8848  # 配置中心地址
         file-extension: yml  # 配置文件格式
@@ -31,8 +31,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -14,7 +14,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   main:
     allow-bean-definition-overriding: true
   cloud:
@@ -25,8 +25,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-        username: nacos
-        password: nacos
+        #username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -37,8 +37,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -27,7 +27,7 @@ spring:
     name: jeeplus-admin-service
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -35,8 +35,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        #username: nacos
+        #password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -47,8 +47,8 @@ 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}
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)

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

@@ -29,7 +29,7 @@ spring:
     name: jeeplus-assess
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,8 @@ 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}
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)
@@ -89,7 +89,7 @@ config:
       endpoint: http://oss-cn-hangzhou.aliyuncs.com
       accessKeyId: LTAI5tQDWoM9c1WyJNPs86rX
       accessKeySecret: 84dDIx4edT1n78KUOqqSmDZ35pchJv
-      bucketName: xgxm-test
+      bucketName: xg-pg
     minIO:
       endpoint:
       accessKey:

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

@@ -29,7 +29,7 @@ spring:
     name: jeeplus-centrecareful
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,8 @@ 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}
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)
@@ -89,7 +89,7 @@ config:
       endpoint: http://oss-cn-hangzhou.aliyuncs.com
       accessKeyId: LTAI5tQDWoM9c1WyJNPs86rX
       accessKeySecret: 84dDIx4edT1n78KUOqqSmDZ35pchJv
-      bucketName: xgxm-test
+      bucketName: xg-pg
     minIO:
       endpoint:
       accessKey:

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

@@ -28,7 +28,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -37,8 +37,8 @@ spring:
         # 命名空间
         namespace: ${spring.profiles.active}
         ip: 127.0.0.1
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -31,7 +31,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -39,8 +39,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -51,8 +51,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -302,13 +302,12 @@ public class CwProjectReportSignatureCallBackController {
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
                         String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
-//                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(StringUtils.isNotBlank(newName)){
                             newName = newName.substring(13, newName.length());
-                            SpringUtil.getBean ( IWorkAttachmentApi.class ).uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
-//                            ossClientService.uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
+                            //SpringUtil.getBean ( IWorkAttachmentApi.class ).uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
+                            SpringUtil.getBean ( IWorkAttachmentApi.class ).uploadFileSignatureOSS(f.getPath(),realPath,newName);
                             filepath = "/" + realPath + newName;
                         }
                     }

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

@@ -30,7 +30,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -50,8 +50,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858
@@ -90,7 +90,7 @@ config:
       endpoint: http://oss-cn-hangzhou.aliyuncs.com
       accessKeyId: LTAI5tQDWoM9c1WyJNPs86rX
       accessKeySecret: 84dDIx4edT1n78KUOqqSmDZ35pchJv
-      bucketName: xgxm-test
+      bucketName: xg-pg
     minIO:
       endpoint:
       accessKey:

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

@@ -17,7 +17,7 @@ spring:
         url: http://localhost:8989
   pro:
     # 环境配置 请勿使用dev，规避bug
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -25,8 +25,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.pro.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -37,8 +37,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-public-modules/pom.xml

@@ -145,6 +145,10 @@
             <version>9.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/controller/OssFileController.java

@@ -414,6 +414,11 @@ public class OssFileController {
         return ossClientService.uploadFile2OSS(inStream, fileDir, fileName);
     }
 
+    @RequestMapping(value = "/uploadFileSignatureOSS", method = RequestMethod.POST)
+    public String uploadFileSignatureOSS(String filePath,String fileDir,String fileName) {
+        return ossClientService.uploadFileSignatureOSS(filePath, fileDir, fileName);
+    }
+
     /**
      * 保存附件操作
      * @param map

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/feign/WorkAttachmentApiImpl.java

@@ -115,6 +115,11 @@ public class WorkAttachmentApiImpl implements IWorkAttachmentApi {
     }
 
     @Override
+    public String uploadFileSignatureOSS(String filePath, String fileDir, String fileName) {
+        return null;
+    }
+
+    @Override
     public void saveMsg2(Map<String, String> map) {
 
     }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/service/OSSClientService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.pubmodules.oss.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
@@ -7,9 +8,13 @@ import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.PutObjectResult;
 import com.aliyun.oss.model.SimplifiedObjectMeta;
 //import com.jeeplus.sys.utils.Global;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.mock.web.MockMultipartFile;
 
 import java.io.*;
 import java.net.URL;
@@ -66,6 +71,47 @@ public class OSSClientService {
         log.info("上传文件到云服务器成功，文件名：{}，耗时：{}ms",fileName,end-start);
         return ret;
     }
+    /**
+     * 上传到OSS服务器  如果同名文件会覆盖服务器上的
+     *
+     * @param fileName 文件名称 包括后缀名
+     * @return 出错返回"" ,唯一MD5数字签名
+     */
+    public String uploadFileSignatureOSS(String filePath, String fileDir, String fileName) {
+        //初始化OSSClient
+        OSSClient ossClient = new OSSClient(endpoint,accessKeyId,accessKeySecret);
+        File f = new File(filePath);
+
+        try {
+        MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
+        if (!cMultiFile.isEmpty()) {
+            //文件原名称
+            String newName = cMultiFile.getOriginalFilename();
+            InputStream inStream = cMultiFile.getInputStream();
+            if(StringUtils.isNotBlank(newName)){
+
+                long start = System.currentTimeMillis();
+                //上传文件
+                PutObjectResult putResult = ossClient.putObject(bucketName, fileDir + fileName, inStream);
+                String ret = putResult.getETag();
+
+                try {
+                    if (inStream != null) {
+                        inStream.close();
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                long end = System.currentTimeMillis();
+                log.info("上传文件到云服务器成功，文件名：{}，耗时：{}ms",fileName,end-start);
+                return ret;
+            }
+        }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
     /**
      * 获得url链接

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

@@ -29,7 +29,7 @@ spring:
     name: jeeplus-public-modules
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -37,8 +37,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        #username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -49,8 +49,8 @@ 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}
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)
@@ -89,7 +89,7 @@ config:
       endpoint: http://oss-cn-hangzhou.aliyuncs.com
       accessKeyId: LTAI5tQDWoM9c1WyJNPs86rX
       accessKeySecret: 84dDIx4edT1n78KUOqqSmDZ35pchJv
-      bucketName: xgxm-test
+      bucketName: xg-pg
     minIO:
       endpoint:
       accessKey:

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -38,6 +38,8 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -50,6 +52,9 @@ import java.util.stream.Collectors;
 @Transactional
 public class UserService extends ServiceImpl <UserMapper, User> {
 
+    // 通过 -?[0-9]+(\\\\.[0-9]+)? 进行匹配是否为数字
+    private static Pattern pattern = Pattern.compile("-?[0-9]+(\\\\.[0-9]+)?");
+
     @Autowired
     private UserWrapper userWrapper;
 
@@ -180,7 +185,14 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         UserDTO userDTO = (UserDTO) RedisUtils.getInstance ( ).get ( CacheNames.USER_CACHE_LOGIN_NAME, tenantId + ":" + loginName );
         if ( userDTO == null ) {
             QueryWrapper queryWrapper = new QueryWrapper ( );
-            queryWrapper.eq ( "a.login_name", loginName );
+            //判断是否是用手机号登录
+            Matcher m = pattern.matcher(loginName);
+            if (m.matches()){
+                queryWrapper.eq ("a.mobile", loginName);
+            } else {
+                queryWrapper.eq ( "a.login_name", loginName );
+            }
+
             queryWrapper.eq ( "a.del_flag", CommonConstants.NOT_DELETED );
             queryWrapper.eq ( "a.tenant_id", tenantId );
             userDTO = baseMapper.get ( queryWrapper );

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

@@ -30,7 +30,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -51,8 +51,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -28,7 +28,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -36,8 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        #username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -48,8 +48,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -28,7 +28,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -36,8 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        #username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -48,8 +48,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -28,7 +28,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -36,8 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -48,8 +48,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -14,7 +14,7 @@ spring:
         url: http://localhost:8989
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -22,8 +22,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -34,8 +34,8 @@ 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}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

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

@@ -8,7 +8,7 @@ spring:
     name: jeeplus-xxl-job-executor-sample
   profiles:
     # 环境配置
-    active: dev
+    active: pro
   cloud:
     nacos:
       discovery:
@@ -16,8 +16,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+        # username: nacos
+        # password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -28,8 +28,8 @@ 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}
 #ribbon的超时时间
 ribbon:
   ConnectTimeout: 60000 # 连接超时时间(ms)