diff --git a/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java b/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java index f85c60e..1b42008 100644 --- a/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java +++ b/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java @@ -2,6 +2,7 @@ package doctor.auth.controller; import doctor.auth.service.HealthService; import doctor.auth.vo.DoctorUserVo; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.common.security.service.TokenService; import doctor.system.api.model.LoginUser; @@ -21,9 +22,13 @@ public class HealthController { private HealthService healthService; @PostMapping("/login") - public R login(@RequestParam String email,String pwd) { + public HealthR login(@RequestParam String email, @RequestParam String pwd) { DoctorUserVo userInfo = healthService.login(email,pwd); - return R.ok(userInfo); + if (userInfo!=null){ + return HealthR.ok(userInfo); + }else { + return HealthR.fail(); + } } diff --git a/doctor-auth/src/main/java/doctor/auth/service/HealthService.java b/doctor-auth/src/main/java/doctor/auth/service/HealthService.java index 0166629..e9a13e6 100644 --- a/doctor-auth/src/main/java/doctor/auth/service/HealthService.java +++ b/doctor-auth/src/main/java/doctor/auth/service/HealthService.java @@ -29,19 +29,22 @@ public class HealthService { } catch (Exception e) { throw new RuntimeException(e); } - Map token = tokenService.createToken(data); - String accessToken = (String) token.get("access_token"); - doctorUserVo.setSessionId(accessToken); - doctorUserVo.setEmail(data.getSysUser().getEmail()); - doctorUserVo.setUserId(data.getSysUser().getUserId().intValue()); - doctorUserVo.setUserName(data.getSysUser().getUserName()); - doctorUserVo.setNickName(data.getSysUser().getNickName()); - doctorUserVo.setJiGuangPwd(s); - if (data.getSysUser().getSex()=="男"){ - doctorUserVo.setSex(0); - }else { - doctorUserVo.setSex(1); + if (s.equals(data.getSysUser().getPassword())){ + Map token = tokenService.createToken(data); + String accessToken = (String) token.get("access_token"); + doctorUserVo.setSessionId(accessToken); + doctorUserVo.setEmail(data.getSysUser().getEmail()); + doctorUserVo.setUserId(data.getSysUser().getUserId().intValue()); + doctorUserVo.setUserName(data.getSysUser().getUserName()); + doctorUserVo.setNickName(data.getSysUser().getNickName()); + doctorUserVo.setJiGuangPwd(s); + if (data.getSysUser().getSex()=="男"){ + doctorUserVo.setSex(0); + }else { + doctorUserVo.setSex(1); + } + return doctorUserVo; } - return doctorUserVo; + return null; } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java index 6f9f27b..746fd64 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/doctor") -@DS("slave") +@DS("master") public class SysDoctorController { @Autowired