add web login 接口

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

@@ -11,6 +11,7 @@ import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 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.CaptchaService;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.service.LoginService;
 import com.pica.cloud.account.account.server.service.TokenService;
@@ -18,11 +19,13 @@ 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;
+import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.servlet4preview.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,8 +61,11 @@ public class LoginController extends AccountBaseController {
 
     private String cache_prifix = "cache-";
 
+    @Autowired
+    private CaptchaService captchaService;
+
     /**
-     * 密码登录接口（app、H5）
+     * 密码登录接口（app、H5、web）
      *
      * @param authCodeReq
      * @return
@@ -363,4 +369,35 @@ public class LoginController extends AccountBaseController {
         LoginResult oneClickLoginResultVo = loginService.oneClickLogin(req);
         return PicaResponse.toResponse(oneClickLoginResultVo);
     }
+
+    @ApiOperation(value = "web登录-图形码")
+    @PostMapping("/web/captchaPwd")
+    public PicaResponse<LoginResult> webCaptchaPwd(@RequestBody EncryptEntity entity,
+                                                   HttpServletRequest req) throws Exception {
+        BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("webCaptchaPwd:{}", JSONObject.toJSONString(request));
+        String captchaToken = request.getCaptchaToken();
+        String captchaAnswer = request.getCaptchaAnswer();
+        //校验图形验证码
+        if (!captchaService.acknowledge(captchaToken, captchaAnswer)) {
+            return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "图形验证码错误");
+        }
+
+        //原登录逻辑
+        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 = loginService.login(request);
+        if (SourceTypeEnum.SAAS.getCode().equals(sourceType)) {
+            login.setDoctorId("");
+        } else {
+            login.setUserId(null);
+        }
+        return PicaResponse.toResponse(login);
+    }
+
 }