v1 账户密码登录 step2

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginV1Controller.java

@@ -5,10 +5,12 @@ import com.pica.cloud.account.account.server.entity.AesBean.AesAuthCodeReq;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LogLoginAes;
 import com.pica.cloud.account.account.server.entity.LoginResult;
+import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.req.OneClickLoginReq;
 import com.pica.cloud.account.account.server.service.LoginService;
 import com.pica.cloud.account.account.server.service.LoginV1Service;
+import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
 import com.pica.cloud.foundation.entity.PicaResponse;
@@ -23,7 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(description = "登录v1.0")
+@Api(description = "登录注册相关接口 v1.0")
 @RestController
 @RequestMapping("v1/login")
 public class LoginV1Controller extends AccountBaseController {
@@ -40,7 +42,7 @@ public class LoginV1Controller extends AccountBaseController {
     public PicaResponse<LoginResult> oneClickLogin(@RequestBody AesAuthCodeReq aesReq) throws Exception {
         //added by joy begin
         EncryptEntity entity = new EncryptEntity();
-        if(StringUtils.isEmpty(aesReq.getKey()) && StringUtils.isEmpty(aesReq.getContent())){
+        if (StringUtils.isEmpty(aesReq.getKey()) && StringUtils.isEmpty(aesReq.getContent())) {
             //明文时处理
             entity = RSAUtil.getOneClickEncrypt(aesReq);
             logger.info("AesAuthCodeReq oneClickLogin:" + JSONObject.toJSONString(aesReq));
@@ -54,7 +56,7 @@ public class LoginV1Controller extends AccountBaseController {
             loginAes.setMobile(aesReq.getMobile());
             loginAes.setDeviceInfo(super.getDeviceInfoLow("deviceinfo"));
             loginService.insertLoginAesLog(loginAes);
-        }else {
+        } else {
             //执行原逻辑
             entity.setKey(aesReq.getKey());
             entity.setContent(aesReq.getContent());
@@ -66,7 +68,7 @@ public class LoginV1Controller extends AccountBaseController {
         req.setSourceType(super.getSourceType());
         req.setLoginIp(super.getIpAddr());
         req.setUserTokenTourist(super.getUserTokenTourist());
-        logger.info("one-click req:{}",JSONObject.toJSONString(req));
+        logger.info("one-click req:{}", JSONObject.toJSONString(req));
         LoginResult oneClickLoginResultVo = loginV1Service.oneClickLogin(req);
         return PicaResponse.toResponse(oneClickLoginResultVo);
     }
@@ -85,4 +87,36 @@ public class LoginV1Controller extends AccountBaseController {
         return PicaResponse.toResponse();
     }
 
+    /**
+     * 密码登录接口（app、H5、web --> v1）
+     *
+     * @param authCodeReq
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("密码登录接口")
+    @PostMapping("/password")
+    public PicaResponse<LoginResult> v1LoginPassword(@RequestBody AesAuthCodeReq authCodeReq) throws Exception {
+
+        EncryptEntity entity = new EncryptEntity();
+        entity.setKey(authCodeReq.getKey());
+        entity.setContent(authCodeReq.getContent());
+
+        BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        request.setProductType(super.getProductType());
+        Integer sourceType = super.getSourceType();
+        request.setSourceType(sourceType == null ? 0 : sourceType);
+        request.setLoginIp(super.getIpAddr());
+        request.setUserTokenTourist(super.getUserTokenTourist());
+        AccountUtils.checkMobilePhone(request.getMobile());
+        AccountUtils.checkPassword(request.getPassword());
+        LoginResult login = loginV1Service.v1LoginPassword(request);
+        if (SourceTypeEnum.SAAS.getCode().equals(sourceType)) {
+            login.setDoctorId("");
+        } else {
+            login.setUserId(null);
+        }
+        return PicaResponse.toResponse(login);
+    }
+
 }

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

@@ -100,4 +100,5 @@ public interface LoginService {
     int insertLoginAesLog(LogLoginAes aes);
 
     LoginResult loginQRCode(BaseRequest request);
+
 }

server/src/main/java/com/pica/cloud/account/account/server/service/LoginV1Service.java

@@ -11,4 +11,6 @@ public interface LoginV1Service {
 
     void mobileValidate(BaseRequest request);
 
+    LoginResult v1LoginPassword(BaseRequest request);
+
 }