Web部署支持

src/main/java/com/qs/serve/common/config/SpringMvcConfig.java

@@ -1,7 +1,10 @@
 package com.qs.serve.common.config;
 
+import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.interceptor.LimitSubmitInterceptor;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
@@ -10,12 +13,14 @@ import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * @author YenHex
  * @since 2022/2/24
  */
+@Slf4j
 @AllArgsConstructor
 @Configuration(proxyBeanMethods = false)
 public class SpringMvcConfig implements WebMvcConfigurer {
@@ -23,21 +28,22 @@ public class SpringMvcConfig implements WebMvcConfigurer {
     private final LimitSubmitInterceptor limitSubmitInterceptor;
     //private final ApiAuthInterceptor apiAuthInterceptor;
 
+    private final ProjectProperties projectProperties;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        //注册LimitSubmitInterceptor拦截器
-//        registry.addInterceptor(apiAuthInterceptor)
-//                .addPathPatterns("/api/**")
-//                .excludePathPatterns("/api/wx/login/*","/api/dev/**");
         registry.addInterceptor(limitSubmitInterceptor)
                 .addPathPatterns("/**");
     }
 
-    /*@Override
+    @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        log.warn("PcWebLocal==>{}",projectProperties.getPcWebLocal());
+        registry.addResourceHandler("/web/**")
+                .addResourceLocations("file:"+projectProperties.getPcWebLocal());
         registry.addResourceHandler("/static/**")
-                .addResourceLocations("classpath:/static/");
-    }*/
+                .addResourceLocations("file:"+projectProperties.getPcWebLocal()+"static/");
+    }
 
     @Bean
     public CorsFilter corsFilter() {

src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java

@@ -20,4 +20,6 @@ public class ProjectProperties {
 
     private String webUrl;
 
+    private String pcWebLocal;
+
 }

src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java

@@ -76,7 +76,7 @@ public class HttpServletRequestFilter implements Filter{
         try {
             LoginUser loginUser = AuthContextUtils.getLoginUser(false);
             if(loginUser!=null){
-                buffer.append("\n用户类型: "+ loginUser.getTypeFlag().getName()+"  用户ID: "+loginUser.getUserId());
+                buffer.append("\n用户ID: "+loginUser.getUserId());
             }
         } catch (Exception e) {}
         if(!StringUtils.isEmpty(queryStr)){

src/main/resources/application-dev.yml

@@ -2,11 +2,13 @@
 project:
   web_url: 'http://192.168.0.9:6031'
   host_url: 'http://192.168.0.9:7400'
+  pc-web-local: 'D:\Software\Nginx1.8\html\jslcrm3\'
   task: true
   dev: true
   seeyon:
     enable: true
     url: 'http://192.168.0.9:7444'
+
   upload:
     #上传映射地址
     proxy-url: https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/jsl/