Merge branch 'master' into master_huangjunjie

jshERP-web/vue.config.js

@@ -54,7 +54,7 @@ module.exports = {
     open: true,
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://120.26.144.244:8082', // 请求本地 需要jshERP-boot后台项目
+        target: 'http://localhost:8082', // 请求本地 需要jshERP-boot后台项目
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '',

src/main/java/com/jsh/erp/filter/LogCostFilter.java

@@ -13,11 +13,18 @@ import java.io.IOException;
 
 @WebFilter(filterName = "LogCostFilter", urlPatterns = {"/*"},
         initParams = {@WebInitParam(name = "filterPath",
-                      value = "/jshERP-boot/user/login#/jshERP-boot/user/weixinLogin#/jshERP-boot/user/weixinBind#" +
-                              "/jshERP-boot/user/registerUser#/jshERP-boot/user/randomImage#" +
-                              "/jshERP-boot/platformConfig/getPlatform#/jshERP-boot/v2/api-docs#/jshERP-boot/webjars#" +
-                              "/jshERP-boot/systemConfig/static#/jshERP-boot/api/plugin/wechat/weChat/share#" +
-                              "/jshERP-boot/api/plugin/general-ledger/pdf/voucher#/jshERP-boot/api/plugin/tenant-statistics/tenantClean")})
+                      value = "/user/login#" +
+                              "/user/weixinLogin#" +
+                              "/user/weixinBind#" +
+                              "/user/registerUser#" +
+                              "/user/randomImage#" +
+                              "/platformConfig/getPlatform#" +
+                              "/v2/api-docs#" +
+                              "/webjars#" +
+                              "/systemConfig/static#" +
+                              "/api/plugin/wechat/weChat/share#" +
+                              "/api/plugin/general-ledger/pdf/voucher#" +
+                              "/api/plugin/tenant-statistics/tenantClean")})
 public class LogCostFilter implements Filter {
 
     private static final String FILTER_PATH = "filterPath";
@@ -69,4 +76,4 @@ public class LogCostFilter implements Filter {
     public void destroy() {
 
     }
-}
+}