Merge pull request #5605 from EightMonth/master

修复 #5556

sentinel配置文件修改账号密码，logging.level.pattern 等配置无效！ #5556
shiro集成 redis 不支持 sentinel 方式部署的redis集群 #5569

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:
@@ -34,4 +32,7 @@ nacos:
     ip: @config.server-addr@
 sentinel:
   dashboard:
-    version: 1.8.2
+    version: 1.8.2
+    auth:
+      username: sentinel
+      password: sentinel