From 18f01aa006214a1db8a8a4d063bbcee1d3cbcd38 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Wed, 7 Jul 2021 15:31:56 +0800 Subject: [PATCH] md --- .../gaea/business/filter/TokenFilter.java | 3 ++ .../src/main/resources/bootstrap-dev.yml | 32 ++----------------- report-ui/config/dev.env.js | 4 +-- report-ui/config/prod.env.js | 2 +- report-ui/config/test.env.js | 2 +- report-ui/src/views/login.vue | 14 ++++---- 6 files changed, 16 insertions(+), 41 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java index a3043c5e..9c7501e2 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java +++ b/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; diff --git a/report-core/src/main/resources/bootstrap-dev.yml b/report-core/src/main/resources/bootstrap-dev.yml index 632fc706..64dabe22 100644 --- a/report-core/src/main/resources/bootstrap-dev.yml +++ b/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: - com.alibaba.cloud.nacos.client.NacosPropertySourceBuilder: debug + config: classpath:logback.xml 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 + diff --git a/report-ui/config/dev.env.js b/report-ui/config/dev.env.js index f50fc84e..ee3d90dc 100644 --- a/report-ui/config/dev.env.js +++ b/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://10.108.26.197:9095"' + BASE_API: '"http://127.0.0.1:9095"' + // BASE_API: '"http://10.108.26.197:9095"' }) diff --git a/report-ui/config/prod.env.js b/report-ui/config/prod.env.js index 18c259bd..d22f030e 100644 --- a/report-ui/config/prod.env.js +++ b/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: '"./"' } diff --git a/report-ui/config/test.env.js b/report-ui/config/test.env.js index 05c15ecc..67c23543 100644 --- a/report-ui/config/test.env.js +++ b/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: '"./"' }) diff --git a/report-ui/src/views/login.vue b/report-ui/src/views/login.vue index fb90c126..afc46ae7 100644 --- a/report-ui/src/views/login.vue +++ b/report-ui/src/views/login.vue @@ -1,8 +1,8 @@