From a79e7c54df178a3c88627f90210608329b8b8544 Mon Sep 17 00:00:00 2001 From: TS-QD1 Date: Wed, 23 Apr 2025 17:39:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=92=8C?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=A7=A3=E9=99=A4=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/user/wx/UserWxController.java | 16 +++++++++------- .../user/wx/UserWxUpdateUsernameController.java | 9 ++++++++- .../service/user/wx/UserWxMiniappService.java | 8 +++++++- .../user/wx/UserWxUpdateUsernameService.java | 4 ++++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxController.java b/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxController.java index aef2f51..79d2144 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxController.java @@ -7,18 +7,14 @@ import cn.com.tenlion.operator.service.user.wx.UserWxMiniappService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.result.SuccessResult; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; +import org.springframework.web.bind.annotation.*; @Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "微信用户接口") @RestController -@RequestMapping(ISystemConstant.API_PREFIX + "/user/wx") +@RequestMapping(ISystemConstant.API_PREFIX + "/user-wx") public class UserWxController extends DefaultBaseController { @Autowired @@ -36,4 +32,10 @@ public class UserWxController extends DefaultBaseController { return userWxMiniappService.register(userWxRegisterVO.getOpenid(), userWxRegisterVO.getCode()); } + @GetMapping("unlock-phone") + public synchronized SuccessResult unlockPhone() { + userWxMiniappService.unlockPhone(); + return new SuccessResult(); + } + } diff --git a/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxUpdateUsernameController.java b/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxUpdateUsernameController.java index d395cd8..d1ac731 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxUpdateUsernameController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/api/user/wx/UserWxUpdateUsernameController.java @@ -4,13 +4,14 @@ import cn.com.tenlion.operator.service.user.wx.UserWxUpdateUsernameService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.sms.service.sms.ISmsService; +import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.vos.UpdatePhoneUsernameVO; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "企业用户创建员工接口") +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "用户微信更新用户名接口") @RestController @RequestMapping(ISystemConstant.API_PREFIX + "/user-wx-update-username") public class UserWxUpdateUsernameController { @@ -28,4 +29,10 @@ public class UserWxUpdateUsernameController { return new SuccessResultData<>(code); } + @GetMapping("unlock-phone") + public synchronized SuccessResult unlockPhone() { + updateUsernameService.unlockPhone(); + return new SuccessResult(); + } + } diff --git a/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxMiniappService.java b/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxMiniappService.java index 6f01be6..ddd1105 100644 --- a/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxMiniappService.java +++ b/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxMiniappService.java @@ -8,6 +8,7 @@ import cn.com.tenlion.operator.remote.wx.IWxOauth2RemoteService; import cn.com.tenlion.operator.remote.wx.entity.*; import cn.com.tenlion.operator.service.accesstoken.AccessTokenService; import cn.com.tenlion.operator.service.user.expand.UserExpandServiceImpl; +import ink.wgink.common.component.SecurityComponent; import ink.wgink.common.manager.env.EnvManager; import ink.wgink.exceptions.base.SystemException; import ink.wgink.login.app.pojo.vos.appsign.AppLoginPhoneVO; @@ -16,7 +17,6 @@ import ink.wgink.register.base.pojo.vos.RegisterPhoneVO; import ink.wgink.register.base.service.IRegisterService; import ink.wgink.service.user.pojo.pos.UserPO; import ink.wgink.service.user.service.IUserService; -import ink.wgink.util.date.DateUtil; import org.apache.commons.lang3.StringUtils; import org.joda.time.LocalDateTime; import org.slf4j.Logger; @@ -49,6 +49,8 @@ public class UserWxMiniappService { private IRegisterService registerService; @Autowired private IAppSignService appSignService; + @Autowired + private SecurityComponent securityComponent; /** * 保存openid和session_key的映射关系，需要创建用户时使用 */ @@ -154,6 +156,10 @@ public class UserWxMiniappService { } } + public void unlockPhone() { + userExpandService.updateWxMiniappOpenId(securityComponent.getCurrentUser().getUserId(), ""); + } + /** * 获取手机号 * diff --git a/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxUpdateUsernameService.java b/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxUpdateUsernameService.java index 213c13b..1b2365a 100644 --- a/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxUpdateUsernameService.java +++ b/src/main/java/cn/com/tenlion/operator/service/user/wx/UserWxUpdateUsernameService.java @@ -79,4 +79,8 @@ public class UserWxUpdateUsernameService extends DefaultBaseService { return code; } + + public void unlockPhone() { + userExpandService.updateWxOpenIdAndUnionId(securityComponent.getCurrentUser().getUserId(), "", ""); + } }