Commit 224c9c6e authored by xuepeng.chang's avatar xuepeng.chang

注释

parent 472e53b2
...@@ -41,6 +41,11 @@ public class OauthApiV2Controller implements IBaseController { ...@@ -41,6 +41,11 @@ public class OauthApiV2Controller implements IBaseController {
return JsonResult.buildSuccessResultGeneric(loginContext.interLogin(loginReq)); return JsonResult.buildSuccessResultGeneric(loginContext.interLogin(loginReq));
} }
/**
* 消费地图历史数据清洗转换
* @param req
* @return
*/
@PostMapping("/shop-map/user-data-convert") @PostMapping("/shop-map/user-data-convert")
public JsonResult<List<ShopMapRsp>> shopMapDataConvert(@RequestBody UserInfoConvertReq req){ public JsonResult<List<ShopMapRsp>> shopMapDataConvert(@RequestBody UserInfoConvertReq req){
......
...@@ -464,8 +464,9 @@ public class UserController implements IBaseController { ...@@ -464,8 +464,9 @@ public class UserController implements IBaseController {
@Deprecated @Deprecated
@PasswordFreeAccessValidator @PasswordFreeAccessValidator
@RequestMapping(path = "/resetPassword", method = RequestMethod.POST) @RequestMapping(path = "/resetPassword", method = RequestMethod.POST)
public JsonResult resetPassword(@RequestParam String phoneNo, @RequestParam String password, @RequestParam(required = false) String passwordNew, @RequestHeader(value = Constants.X_AUTH_TENANT, defaultValue = UserConstant.defaultTenantIdString) Integer tenantId public JsonResult resetPassword(@RequestParam String phoneNo, @RequestParam String password,
) { @RequestParam(required = false) String passwordNew,
@RequestHeader(value = Constants.X_AUTH_TENANT, defaultValue = UserConstant.defaultTenantIdString) Integer tenantId) {
if (!ValidationUtil.validatePhoneNo(phoneNo)) { if (!ValidationUtil.validatePhoneNo(phoneNo)) {
return JsonResult.buildErrorStateResult("手机号错误", null); return JsonResult.buildErrorStateResult("手机号错误", null);
} }
......
...@@ -86,7 +86,7 @@ public class SMSLoginStrategy implements LoginStrategy { ...@@ -86,7 +86,7 @@ public class SMSLoginStrategy implements LoginStrategy {
} }
} }
// 线上的神策埋点 scIsOpen =false
if (scIsOpen) { if (scIsOpen) {
try { try {
if (!StringUtils.isEmpty(sessionStruct.getScDeviceId())) { if (!StringUtils.isEmpty(sessionStruct.getScDeviceId())) {
......
...@@ -27,6 +27,9 @@ import java.util.Collections; ...@@ -27,6 +27,9 @@ import java.util.Collections;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/**
* 短信验证码
*/
@Service @Service
@Slf4j @Slf4j
public class SMSVerificationCodeStrategy implements VerificationCodeStrategy { public class SMSVerificationCodeStrategy implements VerificationCodeStrategy {
......
...@@ -25,6 +25,9 @@ import java.util.Collections; ...@@ -25,6 +25,9 @@ import java.util.Collections;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/**
* 语音验证码
*/
@Service @Service
@Slf4j @Slf4j
public class SMSVoiceVerificationCodeStrategy implements VerificationCodeStrategy { public class SMSVoiceVerificationCodeStrategy implements VerificationCodeStrategy {
......
...@@ -78,7 +78,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy { ...@@ -78,7 +78,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
assert responseMap != null; assert responseMap != null;
if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) { if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) {
log.error("code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getToken(), responseMap.get("errcode"), log.error("微信登陆失败,code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getToken(), responseMap.get("errcode"),
responseMap.get("errmsg")); responseMap.get("errmsg"));
throw new SilentBizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg")); throw new SilentBizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg"));
} else { } else {
......
...@@ -89,7 +89,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy { ...@@ -89,7 +89,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
assert responseMap != null; assert responseMap != null;
if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) { if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) {
log.error("code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getToken(), responseMap.get("errcode"), log.error("微信小程序手机号登陆出现异常,code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getToken(), responseMap.get("errcode"),
responseMap.get("errmsg")); responseMap.get("errmsg"));
throw new SilentBizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg")); throw new SilentBizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg"));
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment