From a1feac5a8e9ef4f4c2f5aed6d285c7b4f7139025 Mon Sep 17 00:00:00 2001 From: aeizzz <1129603149@qq.com> Date: Wed, 28 Dec 2022 12:19:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E9=81=BF?= =?UTF-8?q?=E5=85=8D=20race=20condition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/PigAuthenticationSuccessEventHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigAuthenticationSuccessEventHandler.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigAuthenticationSuccessEventHandler.java index 2729c96de..58fb1e971 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigAuthenticationSuccessEventHandler.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigAuthenticationSuccessEventHandler.java @@ -34,6 +34,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2RefreshToken; @@ -102,7 +103,11 @@ public class PigAuthenticationSuccessEventHandler implements AuthenticationSucce private void sendSuccessEventLog(HttpServletRequest request, OAuth2AccessTokenAuthenticationToken accessTokenAuthentication, Map map) { // 发送异步日志事件 - SecurityContextHolder.getContext().setAuthentication(accessTokenAuthentication); + + SecurityContext context = SecurityContextHolder.createEmptyContext(); + context.setAuthentication(accessTokenAuthentication); + SecurityContextHolder.setContext(context); + SysLogDTO logVo = SysLogUtils.getSysLog(); logVo.setTitle("登录成功"); logVo.setLogType(LogTypeEnum.NORMAL.getType()); From 8de53b30a400fe0c2f7dd0c59102abe2d4904827 Mon Sep 17 00:00:00 2001 From: aeizzz <1129603149@qq.com> Date: Wed, 28 Dec 2022 20:08:26 +0800 Subject: [PATCH 2/5] :sparkles: Introducing new features. up mybatis-plus 3.5.3 --- 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 f7217c3a0..3b60e4107 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -18,7 +18,7 @@ 4.6.0 - 3.5.1 + 3.5.3 3.5.2 1.2.9 5.8.10 From 82a1f1f5bb68bd5a01d9ccc0bee9dd09c49d1319 Mon Sep 17 00:00:00 2001 From: aeizzz <1129603149@qq.com> Date: Fri, 30 Dec 2022 16:29:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=85=A5=E9=92=89=E9=92=89=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=98=AF=E5=A4=9A=E7=BA=A7=E9=83=A8=E9=97=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/service/impl/SysTenantServiceImpl.java | 3 +-- .../pigx/admin/service/impl/SysUserServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index 28344a9fb..e812f0e90 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -136,8 +136,7 @@ public class SysTenantServiceImpl extends ServiceImpl newMenuList = menuService - .list(Wrappers.lambdaQuery().in(SysMenu::getMenuId,split)); + List newMenuList = menuService.list(Wrappers.lambdaQuery().in(SysMenu::getMenuId, split)); menuList.addAll(newMenuList); }); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 546370663..13e7b7e94 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -413,11 +413,14 @@ public class SysUserServiceImpl extends ServiceImpl impl } // 删除手机号中的 +86 前缀 String phone = item.getPhone().split("-")[1]; + boolean exsitPhone = userList.stream().anyMatch(sysUser -> phone.equals(sysUser.getPhone())); if (exsitPhone) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, item.getPhone())); } - String deptName = item.getDeptName().split(",")[0]; + // 根据规则获取部门信息 + String[] deptNameList = item.getDeptName().split(",")[0].split("-"); + String deptName = deptNameList[deptNameList.length - 1]; // 判断输入的部门名称列表是否合法 Optional deptOptional = deptList.stream().filter(dept -> deptName.equals(dept.getName())) .findFirst(); From b10ae03f806c0e48154404b44a723a2f8c1ae5f3 Mon Sep 17 00:00:00 2001 From: aeizzz Date: Tue, 3 Jan 2023 09:06:22 +0800 Subject: [PATCH 4/5] :sparkles: Introducing new features. up mybatis-plus 3.5.3.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 3b60e4107..fd5ef1b09 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -18,7 +18,7 @@ 4.6.0 - 3.5.3 + 3.5.3.1 3.5.2 1.2.9 5.8.10 From 91b3991fa4c21e633b5a8a70b4dbe44b625e1eaa Mon Sep 17 00:00:00 2001 From: aeizzz Date: Wed, 4 Jan 2023 15:41:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20closed=20#4604=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B3=A8=E8=A7=A3=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx-codegen/src/main/resources/template/Entity.java.vm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm index 8305a6aa7..983e8ef3d 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm @@ -52,6 +52,9 @@ public class ${className} extends Model<${className}> { */ #if($column.columnName == $pk.columnName) @TableId(type = IdType.ASSIGN_ID) +#end +#if($column.columnName == 'del_flag') + @TableLogic #end @ApiModelProperty(value="$column.comments"#if($column.hidden),hidden=$column.hidden#end) private $column.attrType $column.lowerAttrName;