From d1208e30c2cc00b95d78c3431d1d2323ccfac999 Mon Sep 17 00:00:00 2001 From: aeizzz Date: Sat, 28 Jan 2023 15:24:48 +0800 Subject: [PATCH 1/3] :arrow_up: Upgrading dependencies. seata 1.6.1 --- pigx-common/pigx-common-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index af1618e48..903989a54 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -38,7 +38,7 @@ 2.3.0 3.0.52.ALL 1.11.543 - 1.4.2 + 1.6.1 7.1 2.17.1 0.0.23 From f13bade19e3e0921d850c0d297c737739864e2fb Mon Sep 17 00:00:00 2001 From: aeizzz Date: Sun, 29 Jan 2023 16:04:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0app=E7=AB=AF=E7=99=BB=E5=BD=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=80=82=E9=85=8D=E5=8D=95=E4=BD=93=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/app/api/feign/RemoteAppUserService.java | 4 ++-- ...{MobileController.java => AppMobileController.java} | 10 +++++----- .../app/controller/AppSocialDetailsController.java | 2 +- .../pigx/app/handler/MiniAppLoginHandler.java | 2 +- .../pig4cloud/pigx/app/handler/SmsLoginHandler.java | 2 +- .../{MobileService.java => AppMobileService.java} | 2 +- ...obileServiceImpl.java => AppMobileServiceImpl.java} | 4 ++-- .../app/service/impl/AppSocialDetailsServiceImpl.java | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/{MobileController.java => AppMobileController.java} (88%) rename pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/{MobileService.java => AppMobileService.java} (96%) rename pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/{MobileServiceImpl.java => AppMobileServiceImpl.java} (96%) diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java index 5b4744ba9..fc81da51d 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java @@ -51,7 +51,7 @@ public interface RemoteAppUserService { * @param from 调用标志 * @return */ - @GetMapping("/social/info/{inStr}") + @GetMapping("/appsocial/info/{inStr}") R social(@PathVariable("inStr") String inStr, @RequestHeader(SecurityConstants.FROM) String from); /** @@ -60,7 +60,7 @@ public interface RemoteAppUserService { * @param from 调用标识 * @return */ - @PutMapping("/user/lock/{username}") + @PutMapping("/appuser/lock/{username}") R lockUser(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM) String from); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMobileController.java similarity index 88% rename from pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java rename to pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMobileController.java index 7caa99298..9b93c5ebd 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/MobileController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppMobileController.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.app.controller; -import com.pig4cloud.pigx.app.service.MobileService; +import com.pig4cloud.pigx.app.service.AppMobileService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -37,17 +37,17 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @AllArgsConstructor -@RequestMapping("/mobile") +@RequestMapping("/appmobile") @Tag(description = "mobile", name = "手机管理模块") @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) -public class MobileController { +public class AppMobileController { - private final MobileService mobileService; + private final AppMobileService appMobileService; @Inner(value = false) @GetMapping("/{mobile}") public R sendSmsCode(@PathVariable String mobile) { - return mobileService.sendSmsCode(mobile); + return appMobileService.sendSmsCode(mobile); } } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java index 445a6d6bd..6b91429d8 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @RestController -@RequestMapping("/social") +@RequestMapping("/appsocial") @AllArgsConstructor @Tag(description = "social", name = "三方账号管理模块") @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/MiniAppLoginHandler.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/MiniAppLoginHandler.java index 8c15691a1..4dd2fbca8 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/MiniAppLoginHandler.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/MiniAppLoginHandler.java @@ -39,7 +39,7 @@ import org.springframework.stereotype.Component; * 微信小程序 */ @Slf4j -@Component("MINI") +@Component("APP-MINI") @AllArgsConstructor public class MiniAppLoginHandler extends AbstractLoginHandler { diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/SmsLoginHandler.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/SmsLoginHandler.java index 0e56a5e86..5d75a58e7 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/SmsLoginHandler.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/handler/SmsLoginHandler.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; * @date 2018/11/18 */ @Slf4j -@Component("SMS") +@Component("APP-SMS") @AllArgsConstructor public class SmsLoginHandler extends AbstractLoginHandler { diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/MobileService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMobileService.java similarity index 96% rename from pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/MobileService.java rename to pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMobileService.java index 58d0b371e..702efb32a 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/MobileService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMobileService.java @@ -23,7 +23,7 @@ import com.pig4cloud.pigx.common.core.util.R; * @author lengleng * @date 2018/11/14 */ -public interface MobileService { +public interface AppMobileService { /** * 发送手机验证码 diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/MobileServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java similarity index 96% rename from pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/MobileServiceImpl.java rename to pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java index c86225e7e..e216851bf 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/MobileServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java @@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.app.api.entity.AppUser; import com.pig4cloud.pigx.app.mapper.AppUserMapper; -import com.pig4cloud.pigx.app.service.MobileService; +import com.pig4cloud.pigx.app.service.AppMobileService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.enums.LoginTypeEnum; @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Service @AllArgsConstructor -public class MobileServiceImpl implements MobileService { +public class AppMobileServiceImpl implements AppMobileService { private final RedisTemplate redisTemplate; diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppSocialDetailsServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppSocialDetailsServiceImpl.java index 8a9bbf3af..fdfec8740 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppSocialDetailsServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppSocialDetailsServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Map; */ @Slf4j @AllArgsConstructor -@Service("sysSocialDetailsService") +@Service("appSocialDetailsService") public class AppSocialDetailsServiceImpl extends ServiceImpl implements AppSocialDetailsService { From 6843d5ab59bad035bf0d3af6e1158e82a9a58f9a Mon Sep 17 00:00:00 2001 From: aeizzz Date: Mon, 30 Jan 2023 14:44:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0app=E7=AB=AF=E7=99=BB=E5=BD=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=80=82=E9=85=8D=E5=8D=95=E4=BD=93=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java | 4 ++-- .../pigx/common/core/constant/enums/LoginTypeEnum.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java index e216851bf..48c4128cf 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppMobileServiceImpl.java @@ -69,7 +69,7 @@ public class AppMobileServiceImpl implements AppMobileService { } Object codeObj = redisTemplate.opsForValue() - .get(CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.SMS.getType() + StringPool.AT + mobile); + .get(CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT + mobile); if (codeObj != null) { log.info("手机号验证码未过期:{}，{}", mobile, codeObj); @@ -79,7 +79,7 @@ public class AppMobileServiceImpl implements AppMobileService { String code = RandomUtil.randomNumbers(Integer.parseInt(SecurityConstants.CODE_SIZE)); log.debug("手机号生成验证码成功:{},{}", mobile, code); redisTemplate.opsForValue().set( - CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.SMS.getType() + StringPool.AT + mobile, code, + CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT + mobile, code, SecurityConstants.CODE_TIME, TimeUnit.SECONDS); return R.ok(Boolean.TRUE, code); } diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java index fed98e14f..f8594f5b0 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java @@ -38,6 +38,8 @@ public enum LoginTypeEnum { */ SMS("SMS", "验证码登录"), + APPSMS("APP-SMS", "APP验证码登录"), + /** * QQ登录 */