From faa7f189245b5efe1e904b77f5082a58d76f826a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Thu, 1 Aug 2024 11:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/{wx/auth => auth/wx}/AccessTokenUtil.java | 2 +- .../com/ruoyi/common/{wx/auth => auth/wx}/WxAuthService.java | 2 +- .../com/ruoyi/common/{wx/auth => auth/wx}/vo/AccessToken.java | 2 +- .../java/com/ruoyi/framework/web/service/SysLoginService.java | 4 ++-- .../com/ruoyi/web/controller/app/AppAccountController.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/{wx/auth => auth/wx}/AccessTokenUtil.java (97%) rename smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/{wx/auth => auth/wx}/WxAuthService.java (96%) rename smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/{wx/auth => auth/wx}/vo/AccessToken.java (98%) diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/AccessTokenUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/AccessTokenUtil.java similarity index 97% rename from smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/AccessTokenUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/AccessTokenUtil.java index 4d024a10..8f59bf24 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/AccessTokenUtil.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/AccessTokenUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.wx.auth; +package com.ruoyi.common.auth.wx; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/WxAuthService.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/WxAuthService.java similarity index 96% rename from smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/WxAuthService.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/WxAuthService.java index c8348e1e..509f30c0 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/WxAuthService.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/WxAuthService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.wx.auth; +package com.ruoyi.common.auth.wx; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.alibaba.fastjson2.JSON; diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/vo/AccessToken.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/vo/AccessToken.java similarity index 98% rename from smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/vo/AccessToken.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/vo/AccessToken.java index 90a48d66..3d842770 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/auth/vo/AccessToken.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/vo/AccessToken.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.wx.auth.vo; +package com.ruoyi.common.auth.wx.vo; public class AccessToken { private String expires_in; //成功有效时间 diff --git a/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index fbfdfad9..a765e2a0 100644 --- a/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -10,8 +10,8 @@ import com.ruoyi.common.core.domain.model.WxLoginBody; import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.http.HttpUtils; -import com.ruoyi.common.wx.auth.AccessTokenUtil; -import com.ruoyi.common.wx.auth.WxAuthService; +import com.ruoyi.common.auth.wx.AccessTokenUtil; +import com.ruoyi.common.auth.wx.WxAuthService; import com.ruoyi.ss.account.domain.Account; import com.ruoyi.ss.store.service.IStoreService; import com.ruoyi.ss.user.service.ISmUserService; diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java index a3dec8af..5a9ed49a 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java @@ -6,7 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.wx.auth.WxAuthService; +import com.ruoyi.common.auth.wx.WxAuthService; import com.ruoyi.ss.account.domain.Account; import com.ruoyi.ss.account.domain.AccountQuery; import com.ruoyi.ss.account.domain.AccountVO;