diff --git a/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java b/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java index 7b2a1f370..7bab3b5bd 100644 --- a/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java +++ b/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java @@ -216,20 +216,18 @@ public class AuthController extends BaseController { */ @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.AUTHENTICATE) @ApiOperation("自动登录") - @GetMapping("/autoLogin") + @PostMapping("/autoLogin") @ApiImplicitParam(name = "phone", value = "手机号", required = true, paramType = "query") @ApiIgnore public HttpResult autoLogin(@RequestParam String phone) { String methodDescribe = getMethodDescribe("autoLogin"); - String userUrl = "http://127.0.0.1:10214/oauth/token"; + String userUrl = "http://127.0.0.1:20214/oauth/token"; UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(userUrl) - .queryParam("grant_type", SecurityConstants.GRANT_AUTHORIZATION_CODE) - .queryParam("client_id", "njcn") + .queryParam("grant_type", "sms_code") + .queryParam("client_id", "njcnapp") .queryParam("client_secret", "njcnpqs") - .queryParam("username", "%2FPY4%2FD07ExoKDUg6yCi2cA%3D%3D") - .queryParam("imageCode", "verifyCode") - .queryParam("verifyCode", "0"); - + .queryParam("phone", phone) + .queryParam("smsCode", "123456789"); URI uri = builder.build().encode().toUri(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, Objects.requireNonNull(RestTemplateUtil.post(uri, HttpResult.class).getBody()).getData(), methodDescribe); } diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java index 99968d0d8..78f013245 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java @@ -62,7 +62,7 @@ public class UserParam { @ApiModelProperty("用户权限类型") @NotNull(message = UserValidMessage.CASUAL_USER_NOT_BLANK) - @Range(min = 0, max = 2, message = UserValidMessage.PARAM_FORMAT_ERROR) + @Range(min = 0, max = 3, message = UserValidMessage.PARAM_FORMAT_ERROR) private Integer type; @ApiModelProperty("短信通知") diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppInfoSetController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppInfoSetController.java index 5c13f2d0e..c6ccc1812 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppInfoSetController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppInfoSetController.java @@ -4,6 +4,7 @@ package com.njcn.user.controller.app; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.user.pojo.param.AppInfoSetParam; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Objects; /** *

@@ -58,6 +60,9 @@ public class AppInfoSetController extends BaseController { public HttpResult queryByUserId(){ String methodDescribe = getMethodDescribe("queryByUserId"); AppInfoSet appInfoSet = appInfoSetService.lambdaQuery().eq(AppInfoSet::getUserId, RequestUtil.getUserIndex()).one(); + if (Objects.isNull(appInfoSet)) { + throw new BusinessException("非手机号注册的用户,需联系管理员添加配置!"); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appInfoSet, methodDescribe); }