修复 #5556

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java

@@ -37,7 +37,9 @@ import java.util.*;
  */
 @Slf4j
 public class JeecgController<T, S extends IService<T>> {
-    /**issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service*/
+    /**
+     * issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service
+     */
     @Autowired
     protected S service;
     @Resource
@@ -75,6 +77,7 @@ public class JeecgController<T, S extends IService<T>> {
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
     /**
      * 根据每页sheet数量导出多sheet
      *

jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java

@@ -36,6 +36,9 @@ public class JeecgSentinelApplication {
         triggerSentinelInit();
         ConfigurableApplicationContext application = SpringApplication.run(JeecgSentinelApplication.class, args);
         Environment env = application.getEnvironment();
+        // 目前jeecg-sentinel 1.8.3 版本存在alibaba-sentinel 1.8.3版本 启动nacos数据源导致配置不生效的问题，以下为临时处理办法
+        System.getProperties().setProperty("sentinel.dashboard.auth.username", env.getProperty("sentinel.dashboard.auth.username"));
+        System.getProperties().setProperty("sentinel.dashboard.auth.password", env.getProperty("sentinel.dashboard.auth.password"));
         String port = env.getProperty("server.port");
         log.info("\n----------------------------------------------------------\n\t" +
                 "Application SentinelDashboard is running! Access URLs:\n\t" +

jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/resources/application.yml

@@ -18,8 +18,6 @@ auth:
   filter:
     exclude-url-suffixes: htm,html,js,css,map,ico,ttf,woff,png
     exclude-urls: /,/auth/login,/auth/logout,/registry/machine,/version
-  password: sentinel
-  username: sentinel
 logging:
   level:
     org:
@@ -35,3 +33,6 @@ nacos:
 sentinel:
   dashboard:
     version: 1.8.2
+    auth:
+      username: sentinel
+      password: sentinel