md

report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java

@@ -7,6 +7,8 @@ import com.anji.plus.gaea.cache.CacheHelper;
 import com.anji.plus.gaea.utils.JwtBean;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
@@ -19,6 +21,7 @@ import java.io.IOException;
  * Created by raodeming on 2021/6/24.
  */
 @Component
+@Order(Integer.MIN_VALUE + 99)
 public class TokenFilter implements Filter {
     @Autowired
     private CacheHelper cacheHelper;

report-core/src/main/resources/bootstrap-dev.yml

@@ -54,44 +54,16 @@ mybatis-plus:
     - classpath*:/mapper/**/*.xml
     - classpath*:/modeler-mybatis-mappings/**/*.xml
 
-  gaea:
-    subscribes:
-      security:
-        enabled: true
-      push:
-        enabled: true
-        sms:
-          aliyun:
-            access-key-id:
-            secret:
-      audit-log:
-        enabled: true
-        callback-url: http://127.0.0.1:9091/log/callback
-      export:
-        enabled: true
-
-  #  邮箱发送配置
-  mail:
-    #    host不配置会注入失败
-    host: smtp.163.com
-    default-encoding: utf-8
-    protocol: smtp
-    properties:
-      mail:
-        smtp:
-          connectiontimeout: 5000
-          timeout: 3000
-
 management:
   endpoints:
     web:
       base-path: /
 logging:
-  level:
+  config: classpath:logback.xml
-    com.alibaba.cloud.nacos.client.NacosPropertySourceBuilder: debug
 file:
   dist-path: /app/disk/upload/
   white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi
   excelSuffix: .xlsx|.xls|.csv
   downloadPath: http://10.108.26.197:9095/file/download
 
+

report-ui/config/dev.env.js

@@ -4,6 +4,6 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://127.0.0.1:9095"'
+  BASE_API: '"http://127.0.0.1:9095"'
-  BASE_API: '"http://10.108.26.197:9095"'
+  // BASE_API: '"http://10.108.26.197:9095"'
 })

report-ui/config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"https://report.anji-plus.com/"'
+  BASE_API: '"./"'
 }

report-ui/config/test.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
-  BASE_API: '"http://127.0.0.1:9095"'
+  BASE_API: '"./"'
 })

report-ui/src/views/login.vue

@@ -1,8 +1,8 @@
 <!--
- * @Author: zyk 
+ * @Author: zyk
- * @Date: 2020-07-13 11:04:24 
+ * @Date: 2020-07-13 11:04:24
- * @Last Modified by:   zyk 
+ * @Last Modified by:   zyk
- * @Last Modified time: 2020-07-13 11:04:24 
+ * @Last Modified time: 2020-07-13 11:04:24
  !-->
 <template>
   <div class="login_container">
@@ -127,8 +127,8 @@ export default {
       activeTop: "-50%", // 色条滑块控制
       rememberPsw: false, // 记住密码选择框
       loginForm: {
-        username: "guest",
+        username: "admin",
-        password: "guest",
+        password: "123456",
         verifyCode: ""
       }, // 登录表单
       loginRules: {
@@ -231,10 +231,10 @@ export default {
       };
       const { code, data } = await login(obj);
       console.log(data);
+      this.loading = false;
       if (code != "200") return;
       setItem("token", data.token);
       setItem("username", data.username);
-      this.loading = false;
       // 选中记住密码时 把密码存到cookie里,时效15天
       this.rememberPsw &&
         cookies.set(