From 9250accd3059880e414e10bbb1f2d830886741f1 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 25 Dec 2024 10:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8B=A6=E6=88=AA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/TokenController.java | 22 +++++++++---------- .../config/ResourcesConfigAdapter.java | 8 +++---- .../service/impl/ProDataServiceImpl.java | 3 ++- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java b/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java index c048593..4ca64e3 100644 --- a/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java +++ b/securityControl-auth/src/main/java/com/securityControl/auth/controller/TokenController.java @@ -114,17 +114,17 @@ public class TokenController { @PostMapping("login") public R login(LoginBody form) { String pwd=form.getPassword(); - Map map=null; - //走门户账号鉴权 - if(getIscMuUser(form.getUsername())){ - map= iscLogin2(form.getUsername(),form.getPassword()); - }else{ - map= iscLogin(form.getUsername(),form.getPassword()); - } - pwd=(String) map.get("pwd"); - if(getUserNoLj(form.getUsername())){//过滤账号不走isc - pwd=form.getPassword(); - } +// Map map=null; +// //走门户账号鉴权 +// if(getIscMuUser(form.getUsername())){ +// map= iscLogin2(form.getUsername(),form.getPassword()); +// }else{ +// map= iscLogin(form.getUsername(),form.getPassword()); +// } +// pwd=(String) map.get("pwd"); +// if(getUserNoLj(form.getUsername())){//过滤账号不走isc +// pwd=form.getPassword(); +// } List menu=null; LoginUser userInfo = sysLoginService.login(form.getUsername(), pwd,menu); // 获取登录token diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/config/ResourcesConfigAdapter.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/config/ResourcesConfigAdapter.java index 22aa507..d8fcab3 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/config/ResourcesConfigAdapter.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/config/ResourcesConfigAdapter.java @@ -8,11 +8,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter public class ResourcesConfigAdapter extends WebMvcConfigurerAdapter { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { -// registry.addResourceHandler("/files/**").addResourceLocations("file:/data/ahsbs/file/"); -// super.addResourceHandlers(registry); - - registry.addResourceHandler("/files/**").addResourceLocations("file:F:\\File\\"); + registry.addResourceHandler("/files/**").addResourceLocations("file:/data/ahsbs/file/"); super.addResourceHandlers(registry); + +// registry.addResourceHandler("/files/**").addResourceLocations("file:F:\\File\\"); +// super.addResourceHandlers(registry); } } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/service/impl/ProDataServiceImpl.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/service/impl/ProDataServiceImpl.java index af51d13..166b256 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/service/impl/ProDataServiceImpl.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/service/impl/ProDataServiceImpl.java @@ -191,7 +191,8 @@ public class ProDataServiceImpl implements ProDataService { @Override public AjaxResult getProjectSelect(ProData entity) { - return AjaxResult.success(mapper.getProjectSelect(entity)); + List list=mapper.getProjectSelect(entity); + return AjaxResult.success(list); } /**