FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
feat: 登陆修改

See merge request !13
This commit is contained in:
super_liu
2021-06-23 07:26:03 +00:00
parent e985820f27 fa985d2d58
commit d957107510
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java
+8 -10
View File
@@ -15,17 +15,15 @@ public class LoginUserUtil {
*
*/
public static String getUserId() {
String userId = "WY8J26MH23";
String userId = null;
try {
if(!StringUtils.isNotBlank(userId)){
Subject subject = SecurityUtils.getSubject();
Object object=subject.getPrincipal();
if(object!=null){
String json = JSONObject.toJSONString(object);
if(json!=null && json.length()>0){
Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
userId=userInfo.get("id").toString();
}
Subject subject = SecurityUtils.getSubject();
Object object=subject.getPrincipal();
if(object!=null){
String json = JSONObject.toJSONString(object);
if(json!=null && json.length()>0){
Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
userId=userInfo.get("id").toString();
}
}
} catch (UnavailableSecurityManagerException e) {
adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java
+13 -3
View File
@@ -62,11 +62,11 @@ public class UserInfoEOController extends BaseController<UserInfoEO> {
@ApiOperation(value = "查找用户信息接口")
@GetMapping("/getByUserInfoCode")
//@RequiresPermissions("person:userInfo:getByUserInfoCode")
public ResponseMessage<UserInfoEO> getByUserInfoCode() throws Exception {
public ResponseMessage<UserInfoEO> getByUserInfoCode(String userId) throws Exception {
//获取当前登录人
String userId= LoginUserUtil.getUserId();
// String userId= LoginUserUtil.getUserId();
UserInfoEO userInfoEO =new UserInfoEO();
userInfoEO.setUserId(userId);
userInfoEO.setUserId(userIdFilter(userId));
userInfoEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
UserInfoEO getInfo = userInfoEOService.getUserEOAndInfoEOByUserCode(userInfoEO);
if(getInfo!=null){
@@ -84,6 +84,16 @@ public class UserInfoEOController extends BaseController<UserInfoEO> {
return Result.success(getInfo);
}
private String userIdFilter(String str){
String result = "";
if(str.contains("?_t")){
result = str.split("\\?_t")[0];
}else {
result = str;
}
return result;
}
/**
* 刘寅楠