修改登录接口

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/SafetyServiceImpl.java

@@ -114,10 +114,10 @@ public class SafetyServiceImpl implements ISafetyService {
         // 1.判断是否需要进行短信验证码校验
         boolean isPassCheck = !param.getIsNeedVerify()
                 || ("dev".equals(loginEnvironment) && "666666".equals(param.getVerifyCode()));
-       /* isPassCheck = this.smsVerifyCodeCheck(param.getIsNeedVerify(), param.getVerifyCode(), phoneNo);
+        isPassCheck = this.smsVerifyCodeCheck(param.getIsNeedVerify(), param.getVerifyCode(), phoneNo);
         if (!isPassCheck) {
             throw new CommonException(600001, "短信验证不通过");
-        }*/
+        }
 
         // 2.校验是否已经注册过
         List<RegUnitInfo> userList = regUnitInfoMapper.userData(phoneNo);
@@ -136,7 +136,8 @@ public class SafetyServiceImpl implements ISafetyService {
         RequestContext.setProduct(product);
         RequestContext.setAppKey(appKey);
         try {
-            mobileVerifyCodeResult = privilegeFeginService.mobileVerifyCode(model);
+           // mobileVerifyCodeResult = privilegeFeginService.mobileVerifyCode(model);
+           mobileVerifyCodeResult=Privilege.authClient.mobileVerifyCode(model);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -160,7 +161,7 @@ public class SafetyServiceImpl implements ISafetyService {
         // 设置userInfo信息
         RegUnitInfo user = userList.get(0);
 
-        result.put("userInfo", userInfo);
+        result.put("userInfo", user);
 
         return result;
     }