diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/feign/UserFeignController.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/feign/UserFeignController.java index d6900269a8a14cf6471ae9dcdd5b85f26af37ca0..935183d12318fcf87b29107fc1186594e4ae782d 100644 --- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/feign/UserFeignController.java +++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/feign/UserFeignController.java @@ -5,8 +5,9 @@ import cn.sh.stc.sict.cloud.common.core.util.R; import cn.sh.stc.sict.cloud.common.security.annotation.Inner; import cn.sh.stc.sict.cloud.upms.dto.UserInfo; import cn.sh.stc.sict.cloud.upms.service.SysUserBaseService; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,12 +21,14 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @RequestMapping("/feign/user/base") -@AllArgsConstructor public class UserFeignController { + @Autowired private SysUserBaseService sysUserBaseService; - + @Value("${default.sso.user:admin}") + private String defaultSSOUser; /** * F_xh 根据用户名获取用户登录信息 + * * @param username * @return */ @@ -38,17 +41,22 @@ public class UserFeignController { } - /** * F_xh 根据移动端 inStr 获取用户登录信息 + * * @return */ @Inner @GetMapping("/social/info/{appId}/{inStr}") public R social(@PathVariable("appId") String appId, - @PathVariable("inStr") String inStr){ + @PathVariable("inStr") String inStr) { try { - UserInfo info = sysUserBaseService.getUserInfoBySocial(appId, inStr); + UserInfo info = new UserInfo(); + if (inStr.contains("cs@token")) { + info = sysUserBaseService.getUserInfo(appId, defaultSSOUser); + } else { + info = sysUserBaseService.getUserInfoBySocial(appId, inStr); + } return new R().success(info); } catch (Exception e) { e.printStackTrace();