tianwu.sun 9 mesi fa
parent
commit
3efb181b4e

File diff suppressed because it is too large
+ 3038 - 1961
log/cic-data-reportin.out


+ 1 - 0
src/main/java/com/bootdo/system/config/ShiroConfig.java

@@ -121,6 +121,7 @@ public class ShiroConfig {
         factory.setUnauthorizedUrl("/403");
         // url过滤规则
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
+        filterChainDefinitionMap.put("/getLoginUrl", "anon");
         filterChainDefinitionMap.put("/login", "anon");
         filterChainDefinitionMap.put("/ssoLogin", "anon");
         filterChainDefinitionMap.put("/sys/online/**", "anon");

+ 10 - 0
src/main/java/com/bootdo/system/controller/LoginController.java

@@ -41,9 +41,13 @@ public class LoginController extends BaseController {
     FileService fileService;
     @Autowired
     BootdoConfig bootdoConfig;
+
     @Value("${sysCity:#{null}}")
     public String sysCity;
 
+    @Value("${login.url:#{null}}")
+    public String loginUrl;
+
     @Autowired
     private SessionService sessionService;
 
@@ -114,6 +118,12 @@ public class LoginController extends BaseController {
         return "dashboard/dashboard-2";
     }
 
+    @ResponseBody
+    @GetMapping("/getLoginUrl")
+    String getLoginUrl() {
+        return loginUrl;
+    }
+
     @GetMapping("/login")
     String login() {
         boolean bl = LicenseUtil.checkLicense();

+ 4 - 1
src/main/resources/application-dev.yml

@@ -73,4 +73,7 @@ spring:
 #  server-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA197S/rwqi+rHjg987bvsqTGYfdsxCFgfMhayyaO+64huzavefkLSEQc4fkYd2eVfnm4K9EwrispHx/3KfT22KCM+v6skJuozCslD/3jnRWSLtMl+7B95qWI8DvBUlIGKf0AXek7VLli/ibgwy2/UdGTyeM9Hdt+Ib95eKPyCxvkJDkaxFMlwS6wCX+BlUMjGBjkD5G7U4rrILHpi4NFzXQSohHrgqtiDF61RcxUMEzJMuV9CckmDbSuUamYnIQ/6JXO5zkiLtGsQZIZpLOin/+AcbEy4FQ24j9QOL0Lsd0ST8Y28ro10whXqcqoiAShwVBjP8Mr41FaVfl0uwvAgHQIDAQAB
 
 #允许http api调用的IP
-api-allow-ip: 127.0.0.1
+api-allow-ip: 127.0.0.1
+
+#登录页地址
+login.url: http://127.0.0.1:19087/login

+ 4 - 1
src/main/resources/application-prod.yml

@@ -86,4 +86,7 @@ spring:
 #  server-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA197S/rwqi+rHjg987bvsqTGYfdsxCFgfMhayyaO+64huzavefkLSEQc4fkYd2eVfnm4K9EwrispHx/3KfT22KCM+v6skJuozCslD/3jnRWSLtMl+7B95qWI8DvBUlIGKf0AXek7VLli/ibgwy2/UdGTyeM9Hdt+Ib95eKPyCxvkJDkaxFMlwS6wCX+BlUMjGBjkD5G7U4rrILHpi4NFzXQSohHrgqtiDF61RcxUMEzJMuV9CckmDbSuUamYnIQ/6JXO5zkiLtGsQZIZpLOin/+AcbEy4FQ24j9QOL0Lsd0ST8Y28ro10whXqcqoiAShwVBjP8Mr41FaVfl0uwvAgHQIDAQAB
 
 #允许http api调用的IP
-api-allow-ip: 127.0.0.1
+api-allow-ip: 127.0.0.1
+
+#登录页地址
+login.url: http://127.0.0.1:19087/login

+ 4 - 1
src/main/resources/application-test.yml

@@ -73,4 +73,7 @@ spring:
 #  server-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA197S/rwqi+rHjg987bvsqTGYfdsxCFgfMhayyaO+64huzavefkLSEQc4fkYd2eVfnm4K9EwrispHx/3KfT22KCM+v6skJuozCslD/3jnRWSLtMl+7B95qWI8DvBUlIGKf0AXek7VLli/ibgwy2/UdGTyeM9Hdt+Ib95eKPyCxvkJDkaxFMlwS6wCX+BlUMjGBjkD5G7U4rrILHpi4NFzXQSohHrgqtiDF61RcxUMEzJMuV9CckmDbSuUamYnIQ/6JXO5zkiLtGsQZIZpLOin/+AcbEy4FQ24j9QOL0Lsd0ST8Y28ro10whXqcqoiAShwVBjP8Mr41FaVfl0uwvAgHQIDAQAB
 
 #允许http api调用的IP
-api-allow-ip: 127.0.0.1,124.70.58.209
+api-allow-ip: 127.0.0.1,124.70.58.209
+
+#登录页地址
+login.url: http://124.70.58.209:19087/login

+ 9 - 0
src/main/resources/templates/login.html

@@ -85,6 +85,14 @@
 <script src="/js/plugins/layer/layer.min.js" th:src="@{/js/plugins/layer/layer.min.js}"></script>
 <script type="text/javascript">
     $(document).ready(function () {
+        $.ajax({
+            type: "get",
+            url: ctx + "getLoginUrl",
+            success: function (r) {
+                parent.location.href = r;
+            },
+        });
+
         $("#login").on('click', function () {
             $("#signupForm").submit();
         });
@@ -109,6 +117,7 @@
     });
 
     function login() {
+        //跳转到公共登录页面
         $.ajax({
             type: "POST",
             url: ctx + "login",