图片拦截修改
This commit is contained in:
parent
bb8a29ab31
commit
9250accd30
|
|
@ -114,17 +114,17 @@ public class TokenController {
|
|||
@PostMapping("login")
|
||||
public R<?> login(LoginBody form) {
|
||||
String pwd=form.getPassword();
|
||||
Map<String,Object> 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<String,Object> 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<SysMenu> menu=null;
|
||||
LoginUser userInfo = sysLoginService.login(form.getUsername(), pwd,menu);
|
||||
// 获取登录token
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -191,7 +191,8 @@ public class ProDataServiceImpl implements ProDataService {
|
|||
|
||||
@Override
|
||||
public AjaxResult getProjectSelect(ProData entity) {
|
||||
return AjaxResult.success(mapper.getProjectSelect(entity));
|
||||
List<ProData> list=mapper.getProjectSelect(entity);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue