From afed258a0a6c180a54027d73fe206a41ccbedfb0 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 11 Jul 2023 14:04:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/SysUserController.java | 16 ++++++++++++++++ .../serve/modules/tbs/common/TbsSeeYonConst.java | 1 + 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 4b8a29c0..bc0202cf 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -69,6 +69,22 @@ public class SysUserController { return R.ok("false","ok"); } + /** + * 获取致远用户 + * @param code + * @return + */ + @GetMapping("/getSyUser") + public R getSyUser(String code){ + SeeYonRequestBaseService service = SpringUtils.getBean(SeeYonRequestBaseService.class); + if(!StringUtils.hasText(code)){ + return R.ok(); + } + R rs = service.getBase(TbsSeeYonConst.OA_USER_INFO+"?code="+code,null); + String listJson = rs.getMsg(); + return R.ok(JSONUtil.parse(listJson)); + } + /** * 获取致远用户列表 * @param code diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 41e003c1..7d373232 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -48,6 +48,7 @@ public interface TbsSeeYonConst { String API_CHECK_SUMMERY = "/process/checkAffairSummery"; String OA_USER_LIST = "/process/getUsersByCode"; + String OA_USER_INFO = "/process/getUserByCode"; String OA_USER_LIST_1 = "/process/getUsersList"; String XLT_SAVE_CHECK = "/xlt/saveCheck"; From a0cc25d8584f1d9c00c36d3a9b7f7300bac744f9 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 11 Jul 2023 17:04:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Web=E9=83=A8=E7=BD=B2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/common/config/SpringMvcConfig.java | 20 ++++++++++++------- .../config/properties/ProjectProperties.java | 2 ++ .../mvc/HttpServletRequestFilter.java | 2 +- src/main/resources/application-dev.yml | 2 ++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java b/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java index 20f19075..f3cf5364 100644 --- a/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java +++ b/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() { diff --git a/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java b/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java index 743f35db..21c44317 100644 --- a/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java +++ b/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java @@ -20,4 +20,6 @@ public class ProjectProperties { private String webUrl; + private String pcWebLocal; + } diff --git a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java index 8023d743..13d37c24 100644 --- a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java +++ b/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)){ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 56641309..7523290d 100644 --- a/src/main/resources/application-dev.yml +++ b/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/