From 2c6a700154879b23ea2a1b0d888700a73693541b Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 13 Sep 2023 10:15:43 +0800 Subject: [PATCH] :bookmark: Releasing / Version tags. 5.2 :bookmark: Releasing / Version tags. 5.2 --- pigx-app-server/pigx-app-server-api/pom.xml | 2 +- pigx-app-server/pigx-app-server-biz/pom.xml | 4 +- .../AppArticleCollectController.java | 10 +- .../app/controller/AppRoleController.java | 2 +- .../app/controller/AppUserController.java | 7 +- .../impl/AppArticleCollectServiceImpl.java | 5 +- .../service/impl/AppArticleServiceImpl.java | 20 +- .../app/service/impl/AppIndexServiceImpl.java | 2 +- .../service/impl/AppMobileServiceImpl.java | 8 +- .../app/service/impl/AppRoleServiceImpl.java | 5 +- .../app/service/impl/AppUserServiceImpl.java | 16 +- pigx-app-server/pom.xml | 2 +- pigx-auth/pom.xml | 2 +- pigx-common/pigx-common-audit/pom.xml | 2 +- pigx-common/pigx-common-bom/pom.xml | 2 +- pigx-common/pigx-common-core/pom.xml | 2 +- pigx-common/pigx-common-data/pom.xml | 2 +- .../datascope/DataScopeInnerInterceptor.java | 3 +- pigx-common/pigx-common-datasource/pom.xml | 2 +- pigx-common/pigx-common-encrypt-api/pom.xml | 2 +- pigx-common/pigx-common-excel/pom.xml | 2 +- .../excel/ResponseExcelAutoConfiguration.java | 2 +- .../aop/RequestExcelArgumentResolver.java | 16 +- .../aop/ResponseExcelReturnValueHandler.java | 6 +- .../converters/LocalDateStringConverter.java | 2 +- .../converters/LocalTimeStringConverter.java | 2 +- .../handler/AbstractSheetWriteHandler.java | 22 +- .../handler/DefaultAnalysisEventListener.java | 5 +- .../head/I18nHeaderCellWriteHandler.java | 4 +- pigx-common/pigx-common-feign/pom.xml | 2 +- .../openfeign/PigxFeignClientsRegistrar.java | 5 +- pigx-common/pigx-common-gateway/pom.xml | 2 +- .../gateway/rule/VersionGrayLoadBalancer.java | 10 +- pigx-common/pigx-common-gray/pom.xml | 2 +- pigx-common/pigx-common-idempotent/pom.xml | 2 +- pigx-common/pigx-common-job/pom.xml | 2 +- pigx-common/pigx-common-log/pom.xml | 2 +- pigx-common/pigx-common-oss/pom.xml | 2 +- pigx-common/pigx-common-seata/pom.xml | 2 +- pigx-common/pigx-common-security/pom.xml | 2 +- pigx-common/pigx-common-sentinel/pom.xml | 2 +- pigx-common/pigx-common-sequence/pom.xml | 2 +- pigx-common/pigx-common-swagger/pom.xml | 2 +- pigx-common/pigx-common-websocket/pom.xml | 2 +- pigx-common/pigx-common-xss/pom.xml | 2 +- pigx-common/pom.xml | 2 +- .../pigx-flow-engine-api/pom.xml | 2 +- .../pigx-flow-engine-biz/pom.xml | 2 +- .../pigx/flow/engine/utils/ModelUtil.java | 238 +++++++----------- .../impl/AbstractEngineConfiguration.java | 2 +- pigx-flow/pigx-flow-engine/pom.xml | 2 +- .../pigx-flow-task/pigx-flow-task-api/pom.xml | 2 +- .../api/feign/RemoteFlowEngineService.java | 1 - .../pigx/flow/task/dto/SelectValue.java | 4 +- .../pigx-flow-task/pigx-flow-task-biz/pom.xml | 2 +- .../task/service/IProcessInstanceService.java | 1 - .../impl/ProcessInstanceServiceImpl.java | 1 - pigx-flow/pigx-flow-task/pom.xml | 2 +- pigx-flow/pom.xml | 2 +- pigx-gateway/pom.xml | 2 +- .../config/SpringDocConfiguration.java | 2 +- pigx-register/pom.xml | 2 +- pigx-upms/pigx-upms-api/pom.xml | 2 +- pigx-upms/pigx-upms-biz/pom.xml | 2 +- pigx-upms/pom.xml | 2 +- pigx-visual/pigx-codegen/pom.xml | 2 +- .../service/impl/GeneratorServiceImpl.java | 3 +- pigx-visual/pigx-daemon-elastic-job/pom.xml | 2 +- pigx-visual/pigx-daemon-quartz/pom.xml | 2 +- pigx-visual/pigx-jimu-platform/pom.xml | 2 +- pigx-visual/pigx-monitor/pom.xml | 2 +- pigx-visual/pigx-mp-platform/pom.xml | 2 +- .../pigx/mp/builder/ImageBuilder.java | 7 +- .../pigx/mp/builder/TextBuilder.java | 7 +- .../pigx/mp/config/WxMpInitConfigRunner.java | 72 ++++-- .../mp/controller/WxAccountController.java | 8 +- .../mp/controller/WxAccountTagController.java | 6 +- .../mp/controller/WxAutoReplyController.java | 8 +- .../mp/controller/WxFansMsgController.java | 6 +- .../pigx/mp/handler/LocationHandler.java | 13 +- .../pig4cloud/pigx/mp/handler/LogHandler.java | 4 +- .../pigx/mp/handler/MenuHandler.java | 57 +++-- .../pig4cloud/pigx/mp/handler/MsgHandler.java | 82 +++--- .../pigx/mp/handler/SubscribeHandler.java | 13 +- .../impl/WxAccountFansServiceImpl.java | 31 ++- .../mp/service/impl/WxAccountServiceImpl.java | 30 ++- .../service/impl/WxAccountTagServiceImpl.java | 4 +- .../mp/service/impl/WxMenuServiceImpl.java | 6 +- .../mp/service/impl/WxMsgServiceImpl.java | 2 +- pigx-visual/pigx-pay-platform/pom.xml | 2 +- .../pigx/pay/config/SequenceConfig.java | 19 +- .../impl/AlipayPayNotifyCallbackHandler.java | 6 +- .../impl/AlipayPayOrderRefundHandler.java | 12 +- .../impl/AlipayWapPayOrderHandler.java | 12 +- .../handler/impl/WeChatMpPayOrderHandler.java | 29 ++- .../impl/WeChatPayNotifyCallbackHandler.java | 6 +- .../YungouosMergePayNotifyCallbakHandler.java | 4 +- pigx-visual/pigx-report-platform/pom.xml | 2 +- pigx-visual/pom.xml | 2 +- pom.xml | 2 +- 100 files changed, 507 insertions(+), 439 deletions(-) diff --git a/pigx-app-server/pigx-app-server-api/pom.xml b/pigx-app-server/pigx-app-server-api/pom.xml index cc11facec..090b4f2aa 100644 --- a/pigx-app-server/pigx-app-server-api/pom.xml +++ b/pigx-app-server/pigx-app-server-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-app-server - 5.2.0-snapshot + 5.2.0 pigx-app-server-api diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml index 46e3ae9e3..009dd7bf3 100644 --- a/pigx-app-server/pigx-app-server-biz/pom.xml +++ b/pigx-app-server/pigx-app-server-biz/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-app-server - 5.2.0-snapshot + 5.2.0 pigx-app-server-biz @@ -62,7 +62,7 @@ com.pig4cloud pigx-app-server-api - 5.2.0-snapshot + 5.2.0 diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java index cb675f199..702a16387 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java @@ -47,9 +47,10 @@ public class AppArticleCollectController { @GetMapping("/page") public R getAppArticleCollectPage(@ParameterObject Page page) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() - .selectAll(AppArticleCollectEntity.class).select(AppArticleEntity::getTitle) - .leftJoin(AppArticleEntity.class, AppArticleEntity::getId, AppArticleCollectEntity::getArticleId) - .eq(AppArticleCollectEntity::getUserId, SecurityUtils.getUser().getId()); + .selectAll(AppArticleCollectEntity.class) + .select(AppArticleEntity::getTitle) + .leftJoin(AppArticleEntity.class, AppArticleEntity::getId, AppArticleCollectEntity::getArticleId) + .eq(AppArticleCollectEntity::getUserId, SecurityUtils.getUser().getId()); return R.ok(appArticleCollectService.selectJoinListPage(page, AppArticleCollectEntity.class, wrapper)); } @@ -106,7 +107,8 @@ public class AppArticleCollectController { public R removeByArticleId(@PathVariable String articleId) { Long id = SecurityUtils.getUser().getId(); return R.ok(appArticleCollectService.remove(Wrappers.lambdaQuery() - .eq(AppArticleCollectEntity::getUserId, id).eq(AppArticleCollectEntity::getArticleId, articleId))); + .eq(AppArticleCollectEntity::getUserId, id) + .eq(AppArticleCollectEntity::getArticleId, articleId))); } /** diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java index ca90d1217..ed9d1f327 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java @@ -63,7 +63,7 @@ public class AppRoleController { @GetMapping("/page") public R getAppRolePage(Page page, AppRole appRole) { return R.ok(appRoleService.page(page, Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(appRole.getRoleName()), AppRole::getRoleName, appRole.getRoleName()))); + .like(StrUtil.isNotBlank(appRole.getRoleName()), AppRole::getRoleName, appRole.getRoleName()))); } /** diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java index 7854acdc6..f7126edac 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java @@ -63,8 +63,11 @@ public class AppUserController { @Inner @GetMapping("/info/{username}") public R info(@PathVariable String username) { - AppUser user = appUserService.getOne(Wrappers.query().lambda().eq(AppUser::getUsername, username).or() - .eq(AppUser::getPhone, username)); + AppUser user = appUserService.getOne(Wrappers.query() + .lambda() + .eq(AppUser::getUsername, username) + .or() + .eq(AppUser::getPhone, username)); if (user == null) { return R.failed(MsgUtils.getMessage(ErrorCodes.APP_USER_USERINFO_EMPTY, username)); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleCollectServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleCollectServiceImpl.java index efa23e220..38c40f89d 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleCollectServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleCollectServiceImpl.java @@ -24,8 +24,9 @@ public class AppArticleCollectServiceImpl extends ServiceImpllambdaQuery().eq(AppArticleCollectEntity::getUserId, id) - .eq(AppArticleCollectEntity::getArticleId, appArticleCollect.getArticleId())); + Wrappers.lambdaQuery() + .eq(AppArticleCollectEntity::getUserId, id) + .eq(AppArticleCollectEntity::getArticleId, appArticleCollect.getArticleId())); return Boolean.TRUE; } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleServiceImpl.java index dbab5f33b..418056513 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppArticleServiceImpl.java @@ -40,8 +40,8 @@ public class AppArticleServiceImpl extends ServiceImpllambdaQuery()// - .eq(AppArticleCollectEntity::getArticleId, appArticleEntity.getId())// - .eq(AppArticleCollectEntity::getUserId, userId)); + .eq(AppArticleCollectEntity::getArticleId, appArticleEntity.getId())// + .eq(AppArticleCollectEntity::getUserId, userId)); appArticleEntity.setCollect(exists); } @@ -49,8 +49,10 @@ public class AppArticleServiceImpl extends ServiceImpllambdaQuery().eq(AppArticleEntity::getId, id) - .eq(AppArticleEntity::getVisit, nowVisit)); + baseMapper.update(appArticleEntity, + Wrappers.lambdaQuery() + .eq(AppArticleEntity::getId, id) + .eq(AppArticleEntity::getVisit, nowVisit)); return appArticleEntity; } @@ -64,11 +66,11 @@ public class AppArticleServiceImpl extends ServiceImpl wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(AppArticleEntity.class) - .selectAs(AppArticleCategoryEntity::getName, AppArticleEntity.Fields.cname) - .leftJoin(AppArticleCategoryEntity.class, AppArticleCategoryEntity::getId, AppArticleEntity::getCid) - .like(StrUtil.isNotBlank(appArticle.getAuthor()), AppArticleEntity::getAuthor, appArticle.getAuthor()) - .like(StrUtil.isNotBlank(appArticle.getTitle()), AppArticleEntity::getTitle, appArticle.getTitle()) - .eq(Objects.nonNull(appArticle.getCid()), AppArticleEntity::getCid, appArticle.getCid()); + .selectAs(AppArticleCategoryEntity::getName, AppArticleEntity.Fields.cname) + .leftJoin(AppArticleCategoryEntity.class, AppArticleCategoryEntity::getId, AppArticleEntity::getCid) + .like(StrUtil.isNotBlank(appArticle.getAuthor()), AppArticleEntity::getAuthor, appArticle.getAuthor()) + .like(StrUtil.isNotBlank(appArticle.getTitle()), AppArticleEntity::getTitle, appArticle.getTitle()) + .eq(Objects.nonNull(appArticle.getCid()), AppArticleEntity::getCid, appArticle.getCid()); return this.page(page, wrapper); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java index 2b56aadc8..5768ad06f 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java @@ -40,7 +40,7 @@ public class AppIndexServiceImpl implements AppIndexService { Map response = new LinkedHashMap<>(); AppPageEntity appPageEntity = appPageMapper.selectById(1); List articleList = appArticleMapper - .selectList(Wrappers.lambdaQuery().orderByDesc(AppArticleEntity::getSort)); + .selectList(Wrappers.lambdaQuery().orderByDesc(AppArticleEntity::getSort)); response.put("pages", appPageEntity); response.put("article", articleList); return response; 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 580795371..615f0ca2d 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 @@ -54,7 +54,7 @@ public class AppMobileServiceImpl implements AppMobileService { @Override public R sendSmsCode(String mobile) { Object codeObj = redisTemplate.opsForValue() - .get(CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT + mobile); + .get(CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT + mobile); if (codeObj != null) { log.info("手机号验证码未过期:{}，{}", mobile, codeObj); @@ -63,9 +63,9 @@ 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.APPSMS.getType() + StringPool.AT + mobile, code, - SecurityConstants.CODE_TIME, TimeUnit.SECONDS); + redisTemplate.opsForValue() + .set(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-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleServiceImpl.java index 0bc16fffd..b4a8293a4 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleServiceImpl.java @@ -77,8 +77,9 @@ public class AppRoleServiceImpl extends ServiceImpl impl for (AppRoleExcelVO excel : excelVOList) { Set errorMsg = new HashSet<>(); // 检验角色名称或者角色编码是否存在 - boolean existRole = roleList.stream().anyMatch(appRole -> excel.getRoleName().equals(appRole.getRoleName()) - || excel.getRoleCode().equals(appRole.getRoleCode())); + boolean existRole = roleList.stream() + .anyMatch(appRole -> excel.getRoleName().equals(appRole.getRoleName()) + || excel.getRoleCode().equals(appRole.getRoleCode())); if (existRole) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_ROLE_NAMEORCODE_EXISTING, excel.getRoleName(), diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java index 5d725fb2a..82603ba2c 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppUserServiceImpl.java @@ -159,8 +159,10 @@ public class AppUserServiceImpl extends ServiceImpl impl AppUserInfo info = new AppUserInfo(); info.setAppUser(user); // 设置角色列表 （ID） - List roleIds = appRoleService.findRolesByUserId(user.getUserId()).stream().map(AppRole::getRoleId) - .collect(Collectors.toList()); + List roleIds = appRoleService.findRolesByUserId(user.getUserId()) + .stream() + .map(AppRole::getRoleId) + .collect(Collectors.toList()); info.setRoles(ArrayUtil.toArray(roleIds, Long.class)); // 设置权限列表（menu.permission） @@ -211,7 +213,7 @@ public class AppUserServiceImpl extends ServiceImpl impl } // 删除用户关联表 this.appUserRoleService - .remove(Wrappers.lambdaQuery().in(AppUserRole::getUserId, CollUtil.toList(ids))); + .remove(Wrappers.lambdaQuery().in(AppUserRole::getUserId, CollUtil.toList(ids))); this.removeBatchByIds(CollUtil.toList(ids)); @@ -222,7 +224,7 @@ public class AppUserServiceImpl extends ServiceImpl impl @Override public R registerAppUser(AppUserDTO appUser) { List appUserList = baseMapper - .selectList(Wrappers.lambdaQuery().eq(AppUser::getPhone, appUser.getPhone())); + .selectList(Wrappers.lambdaQuery().eq(AppUser::getPhone, appUser.getPhone())); if (CollUtil.isNotEmpty(appUserList)) { return R.failed("手机号已注册，请使用验证码直接登录"); @@ -264,7 +266,7 @@ public class AppUserServiceImpl extends ServiceImpl impl Set errorMsg = new HashSet<>(); // 校验用户名是否存在 boolean exsitUserName = userList.stream() - .anyMatch(sysUser -> excel.getUsername().equals(sysUser.getUsername())); + .anyMatch(sysUser -> excel.getUsername().equals(sysUser.getUsername())); if (exsitUserName) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERNAME_EXISTING, excel.getUsername())); @@ -273,8 +275,8 @@ public class AppUserServiceImpl extends ServiceImpl impl // 判断输入的角色名称列表是否合法 List roleNameList = StrUtil.split(excel.getRoleNameList(), StrUtil.COMMA); List roleCollList = roleList.stream() - .filter(role -> roleNameList.stream().anyMatch(name -> role.getRoleName().equals(name))) - .collect(Collectors.toList()); + .filter(role -> roleNameList.stream().anyMatch(name -> role.getRoleName().equals(name))) + .collect(Collectors.toList()); if (roleCollList.size() != roleNameList.size()) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_ROLE_ROLENAME_INEXISTENCE, excel.getRoleNameList())); diff --git a/pigx-app-server/pom.xml b/pigx-app-server/pom.xml index 72935dd40..d7efd92f6 100644 --- a/pigx-app-server/pom.xml +++ b/pigx-app-server/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-app-server diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 8c9a53bf3..8f8845fc0 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-auth diff --git a/pigx-common/pigx-common-audit/pom.xml b/pigx-common/pigx-common-audit/pom.xml index 3b2823a4c..5eeee4a27 100644 --- a/pigx-common/pigx-common-audit/pom.xml +++ b/pigx-common/pigx-common-audit/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-audit diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 3a1e7ad59..96ddf648d 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -17,7 +17,7 @@ pigx 公共版本控制 - 5.2.0-snapshot + 5.2.0 3.5.3.2 1.4.5 4.1.3 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index ad3b2ba92..95d07b122 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index ccedc3928..44972bee6 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-data diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java index c355d20d0..fdbdf8388 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java @@ -44,8 +44,7 @@ public class DataScopeInnerInterceptor implements DataScopeInterceptor { // 返回true 不拦截直接返回原始 SQL （只针对 COUNT 查询） if (dataScopeHandle.calcScope(dataScope) && DataScopeFuncEnum.COUNT.equals(dataScope.getFunc())) { - mpBs.sql(String.format("SELECT %s FROM (%s) temp_data_scope", - dataScope.getFunc().getType(), originalSql)); + mpBs.sql(String.format("SELECT %s FROM (%s) temp_data_scope", dataScope.getFunc().getType(), originalSql)); return; } diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 2312554f2..4fb552c76 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 5.2.0-snapshot + 5.2.0 4.0.0 diff --git a/pigx-common/pigx-common-encrypt-api/pom.xml b/pigx-common/pigx-common-encrypt-api/pom.xml index 14f469647..ed6633bfd 100644 --- a/pigx-common/pigx-common-encrypt-api/pom.xml +++ b/pigx-common/pigx-common-encrypt-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-encrypt-api diff --git a/pigx-common/pigx-common-excel/pom.xml b/pigx-common/pigx-common-excel/pom.xml index cbd39297b..3ef97bbcd 100644 --- a/pigx-common/pigx-common-excel/pom.xml +++ b/pigx-common/pigx-common-excel/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-excel diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/ResponseExcelAutoConfiguration.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/ResponseExcelAutoConfiguration.java index 9bd3306a6..952a3fbdb 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/ResponseExcelAutoConfiguration.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/ResponseExcelAutoConfiguration.java @@ -63,7 +63,7 @@ public class ResponseExcelAutoConfiguration { @PostConstruct public void setReturnValueHandlers() { List returnValueHandlers = requestMappingHandlerAdapter - .getReturnValueHandlers(); + .getReturnValueHandlers(); List newHandlers = new ArrayList<>(); newHandlers.add(responseExcelReturnValueHandler); diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java index 196f38186..8210408fe 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java @@ -71,12 +71,16 @@ public class RequestExcelArgumentResolver implements HandlerMethodArgumentResolv Class excelModelClass = ResolvableType.forMethodParameter(parameter).getGeneric(0).resolve(); // 这里需要指定读用哪个 class 去读，然后读取第一个 sheet 文件流会自动关闭 - EasyExcel.read(inputStream, excelModelClass, readListener).registerConverter(LocalDateStringConverter.INSTANCE) - .registerConverter(LocalTimeStringConverter.INSTANCE) - .registerConverter(LocalDateTimeStringConverter.INSTANCE) - .registerConverter(LongStringConverter.INSTANCE).registerConverter(StringArrayConverter.INSTANCE) - .ignoreEmptyRow(requestExcel.ignoreEmptyRow()).sheet().headRowNumber(requestExcel.headRowNumber()) - .doRead(); + EasyExcel.read(inputStream, excelModelClass, readListener) + .registerConverter(LocalDateStringConverter.INSTANCE) + .registerConverter(LocalTimeStringConverter.INSTANCE) + .registerConverter(LocalDateTimeStringConverter.INSTANCE) + .registerConverter(LongStringConverter.INSTANCE) + .registerConverter(StringArrayConverter.INSTANCE) + .ignoreEmptyRow(requestExcel.ignoreEmptyRow()) + .sheet() + .headRowNumber(requestExcel.headRowNumber()) + .doRead(); // 校验失败的数据处理 交给 BindResult WebDataBinder dataBinder = webDataBinderFactory.createBinder(webRequest, readListener.getErrors(), "excel"); diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/ResponseExcelReturnValueHandler.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/ResponseExcelReturnValueHandler.java index d518f6ae3..43e71c96a 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/ResponseExcelReturnValueHandler.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/ResponseExcelReturnValueHandler.java @@ -51,8 +51,10 @@ public class ResponseExcelReturnValueHandler implements HandlerMethodReturnValue Assert.state(responseExcel != null, "No @ResponseExcel"); mavContainer.setRequestHandled(true); - sheetWriteHandlerList.stream().filter(handler -> handler.support(o)).findFirst() - .ifPresent(handler -> handler.export(o, response, responseExcel)); + sheetWriteHandlerList.stream() + .filter(handler -> handler.support(o)) + .findFirst() + .ifPresent(handler -> handler.export(o, response, responseExcel)); } } diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalDateStringConverter.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalDateStringConverter.java index 4ee09064f..300dbdbf1 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalDateStringConverter.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalDateStringConverter.java @@ -41,7 +41,7 @@ public enum LocalDateStringConverter implements Converter { } else { DateTimeFormatter formatter = DateTimeFormatter - .ofPattern(contentProperty.getDateTimeFormatProperty().getFormat()); + .ofPattern(contentProperty.getDateTimeFormatProperty().getFormat()); return LocalDate.parse(cellData.getStringValue(), formatter); } } diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalTimeStringConverter.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalTimeStringConverter.java index ebf584aea..370b29bc4 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalTimeStringConverter.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/converters/LocalTimeStringConverter.java @@ -41,7 +41,7 @@ public enum LocalTimeStringConverter implements Converter { } else { DateTimeFormatter formatter = DateTimeFormatter - .ofPattern(contentProperty.getDateTimeFormatProperty().getFormat()); + .ofPattern(contentProperty.getDateTimeFormatProperty().getFormat()); return LocalTime.parse(cellData.getStringValue(), formatter); } } diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/AbstractSheetWriteHandler.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/AbstractSheetWriteHandler.java index e9027e80b..fa7c69696 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/AbstractSheetWriteHandler.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/AbstractSheetWriteHandler.java @@ -81,15 +81,16 @@ public abstract class AbstractSheetWriteHandler implements SheetWriteHandler, Ap public void export(Object o, HttpServletResponse response, ResponseExcel responseExcel) { check(responseExcel); RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - String name = (String) Objects.requireNonNull(requestAttributes).getAttribute(DynamicNameAspect.EXCEL_NAME_KEY, - RequestAttributes.SCOPE_REQUEST); + String name = (String) Objects.requireNonNull(requestAttributes) + .getAttribute(DynamicNameAspect.EXCEL_NAME_KEY, RequestAttributes.SCOPE_REQUEST); if (name == null) { name = UUID.randomUUID().toString(); } String fileName = String.format("%s%s", URLEncoder.encode(name, "UTF-8"), responseExcel.suffix().getValue()); // 根据实际的文件类型找到对应的 contentType - String contentType = MediaTypeFactory.getMediaType(fileName).map(MediaType::toString) - .orElse("application/vnd.ms-excel"); + String contentType = MediaTypeFactory.getMediaType(fileName) + .map(MediaType::toString) + .orElse("application/vnd.ms-excel"); response.setContentType(contentType); response.setCharacterEncoding("utf-8"); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename*=utf-8''" + fileName); @@ -105,11 +106,14 @@ public abstract class AbstractSheetWriteHandler implements SheetWriteHandler, Ap @SneakyThrows(IOException.class) public ExcelWriter getExcelWriter(HttpServletResponse response, ResponseExcel responseExcel) { ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream()) - .registerConverter(LocalTimeStringConverter.INSTANCE) - .registerConverter(LocalDateStringConverter.INSTANCE) - .registerConverter(LocalDateTimeStringConverter.INSTANCE) - .registerConverter(LongStringConverter.INSTANCE).registerConverter(StringArrayConverter.INSTANCE) - .autoCloseStream(true).excelType(responseExcel.suffix()).inMemory(responseExcel.inMemory()); + .registerConverter(LocalTimeStringConverter.INSTANCE) + .registerConverter(LocalDateStringConverter.INSTANCE) + .registerConverter(LocalDateTimeStringConverter.INSTANCE) + .registerConverter(LongStringConverter.INSTANCE) + .registerConverter(StringArrayConverter.INSTANCE) + .autoCloseStream(true) + .excelType(responseExcel.suffix()) + .inMemory(responseExcel.inMemory()); if (StringUtils.hasText(responseExcel.password())) { writerBuilder.password(responseExcel.password()); diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/DefaultAnalysisEventListener.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/DefaultAnalysisEventListener.java index a65af14fb..8136f3835 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/DefaultAnalysisEventListener.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/handler/DefaultAnalysisEventListener.java @@ -35,8 +35,9 @@ public class DefaultAnalysisEventListener extends ListAnalysisEventListener> violations = Validators.validate(o); if (!violations.isEmpty()) { - Set messageSet = violations.stream().map(ConstraintViolation::getMessage) - .collect(Collectors.toSet()); + Set messageSet = violations.stream() + .map(ConstraintViolation::getMessage) + .collect(Collectors.toSet()); errorMessageList.add(new ErrorMessage(lineNum, messageSet)); } else { diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/head/I18nHeaderCellWriteHandler.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/head/I18nHeaderCellWriteHandler.java index 5c62a3489..9061e62a1 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/head/I18nHeaderCellWriteHandler.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/head/I18nHeaderCellWriteHandler.java @@ -51,8 +51,8 @@ public class I18nHeaderCellWriteHandler implements CellWriteHandler { if (CollectionUtils.isNotEmpty(originHeadNameList)) { // 国际化处理 List i18nHeadNames = originHeadNameList.stream() - .map(headName -> propertyPlaceholderHelper.replacePlaceholders(headName, placeholderResolver)) - .collect(Collectors.toList()); + .map(headName -> propertyPlaceholderHelper.replacePlaceholders(headName, placeholderResolver)) + .collect(Collectors.toList()); head.setHeadNameList(i18nHeadNames); } } diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index a3bec2cd7..48b4b1ed6 100755 --- a/pigx-common/pigx-common-feign/pom.xml +++ b/pigx-common/pigx-common-feign/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 4.0.0 diff --git a/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java b/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java index fbc46a29c..3eb609111 100644 --- a/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java +++ b/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java @@ -91,7 +91,8 @@ public class PigxFeignClientsRegistrar continue; } - registerClientConfiguration(registry, getClientName(attributes), className, attributes.get("configuration")); + registerClientConfiguration(registry, getClientName(attributes), className, + attributes.get("configuration")); validate(attributes); BeanDefinitionBuilder definition = BeanDefinitionBuilder @@ -255,7 +256,7 @@ public class PigxFeignClientsRegistrar } private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, Object className, - Object configuration) { + Object configuration) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FeignClientSpecification.class); builder.addConstructorArgValue(name); builder.addConstructorArgValue(className); diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index d0e71e6f4..2718c8c6a 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/rule/VersionGrayLoadBalancer.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/rule/VersionGrayLoadBalancer.java index affdc83f5..cf1b2bb5b 100644 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/rule/VersionGrayLoadBalancer.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/rule/VersionGrayLoadBalancer.java @@ -65,8 +65,8 @@ public class VersionGrayLoadBalancer implements GrayLoadBalancer { if (StrUtil.isBlank(reqVersion)) { // 过滤出不含VERSION实例 List versionInstanceList = instances.stream() - .filter(instance -> !instance.getMetadata().containsKey(CommonConstants.VERSION)) - .collect(Collectors.toList()); + .filter(instance -> !instance.getMetadata().containsKey(CommonConstants.VERSION)) + .collect(Collectors.toList()); if (CollUtil.isEmpty(versionInstanceList)) { // 根据权重获取实例 return randomByWeight(instances); @@ -76,9 +76,9 @@ public class VersionGrayLoadBalancer implements GrayLoadBalancer { } // 遍历可以实例元数据，若匹配则返回此实例 List availableList = instances.stream() - .filter(instance -> reqVersion - .equalsIgnoreCase(MapUtil.getStr(instance.getMetadata(), CommonConstants.VERSION))) - .collect(Collectors.toList()); + .filter(instance -> reqVersion + .equalsIgnoreCase(MapUtil.getStr(instance.getMetadata(), CommonConstants.VERSION))) + .collect(Collectors.toList()); if (CollUtil.isEmpty(availableList)) { // 根据权重获取实例 return randomByWeight(instances); diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index 7f76a24b1..dc9cf8a8e 100644 --- a/pigx-common/pigx-common-gray/pom.xml +++ b/pigx-common/pigx-common-gray/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-gray diff --git a/pigx-common/pigx-common-idempotent/pom.xml b/pigx-common/pigx-common-idempotent/pom.xml index 2282bb4a4..0058b5013 100644 --- a/pigx-common/pigx-common-idempotent/pom.xml +++ b/pigx-common/pigx-common-idempotent/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-idempotent diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 9ff8fa0e4..263f8e5a0 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index e9cc4b9c4..97e7c0b9d 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-log diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml index f81654c0f..edc18edae 100755 --- a/pigx-common/pigx-common-oss/pom.xml +++ b/pigx-common/pigx-common-oss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-oss diff --git a/pigx-common/pigx-common-seata/pom.xml b/pigx-common/pigx-common-seata/pom.xml index d8b7bde05..171bc6564 100644 --- a/pigx-common/pigx-common-seata/pom.xml +++ b/pigx-common/pigx-common-seata/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-seata diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 7605e794f..d7603daa9 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index a5bcaa8e8..4e5e37b3b 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index b4aa5d66c..2aebd0e49 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index d175f4c92..e1d86a7f3 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-websocket/pom.xml b/pigx-common/pigx-common-websocket/pom.xml index 2976f0ec5..4f43b9a82 100755 --- a/pigx-common/pigx-common-websocket/pom.xml +++ b/pigx-common/pigx-common-websocket/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-websocket diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml index 1101f61ac..a3fd24c86 100755 --- a/pigx-common/pigx-common-xss/pom.xml +++ b/pigx-common/pigx-common-xss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.2.0-snapshot + 5.2.0 pigx-common-xss diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 976e14810..758b6a6bc 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-common diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml index 799c55f89..382e80165 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-engine - 5.2.0-snapshot + 5.2.0 pigx-flow-engine-api diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml index 599dcdf4b..e8474e05f 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-engine - 5.2.0-snapshot + 5.2.0 pigx-flow-engine-biz diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/utils/ModelUtil.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/utils/ModelUtil.java index 476461487..0e2b09758 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/utils/ModelUtil.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/utils/ModelUtil.java @@ -28,9 +28,9 @@ import java.util.List; */ @Slf4j public class ModelUtil { + /** * 构建模型 - * * @param nodeDto 前端传输节点 * @return */ @@ -42,17 +42,16 @@ public class ModelUtil { process.setId(flowId); process.setName(processName); - //流程监听器 + // 流程监听器 ArrayList eventListeners = new ArrayList<>(); { - //流程实例监听器 + // 流程实例监听器 EventListener eventListener = new EventListener(); eventListener.setImplementationType("class"); eventListener.setImplementation(FlowProcessEventListener.class.getCanonicalName()); - eventListeners.add(eventListener); } @@ -60,24 +59,20 @@ public class ModelUtil { NodeUtil.addEndNode(nodeDto); - - //创建所有的节点 + // 创建所有的节点 buildAllNode(process, nodeDto, flowId); - //创建所有的内部节点连接线 + // 创建所有的内部节点连接线 buildAllNodeInnerSequence(process, nodeDto, flowId); - //创建节点间连线 + // 创建节点间连线 buildAllNodeOuterSequence(process, nodeDto, null); - //处理分支和下级连线 - + // 处理分支和下级连线 bpmnModel.addProcess(process); return bpmnModel; } - /** * 先创建所有的节点 - * * @param process * @param nodeDto * @param flowId @@ -87,7 +82,6 @@ public class ModelUtil { return; } - List flowElementList = buildNode(nodeDto, flowId); for (FlowElement flowElement : flowElementList) { if (process.getFlowElement(flowElement.getId()) == null) { @@ -95,36 +89,33 @@ public class ModelUtil { } } - //子节点 + // 子节点 Node children = nodeDto.getChildren(); if (NodeTypeEnum.getByValue(nodeDto.getType()).getBranch()) { - //条件分支 + // 条件分支 List branchs = nodeDto.getConditionNodes(); for (Node branch : branchs) { - buildAllNode(process, branch.getChildren(), - flowId); - + buildAllNode(process, branch.getChildren(), flowId); } if (NodeUtil.isNode(children)) { buildAllNode(process, children, flowId); } - } else { + } + else { if (NodeUtil.isNode(children)) { buildAllNode(process, children, flowId); } } - } /** * 先创建所有的内部节点连接线 - * * @param process * @param nodeDto * @param flowId @@ -134,41 +125,37 @@ public class ModelUtil { return; } - //画内部线 + // 画内部线 List flowList = buildInnerSequenceFlow(nodeDto, flowId); for (SequenceFlow sequenceFlow : flowList) { process.addFlowElement(sequenceFlow); } - //子节点 + // 子节点 Node children = nodeDto.getChildren(); - if (NodeTypeEnum.getByValue(nodeDto.getType()).getBranch() ) { - //条件分支 + if (NodeTypeEnum.getByValue(nodeDto.getType()).getBranch()) { + // 条件分支 List branchs = nodeDto.getConditionNodes(); for (Node branch : branchs) { - buildAllNodeInnerSequence(process, branch.getChildren(), - flowId); - + buildAllNodeInnerSequence(process, branch.getChildren(), flowId); } if (NodeUtil.isNode(children)) { buildAllNodeInnerSequence(process, children, flowId); } - } else { + } + else { if (NodeUtil.isNode(children)) { buildAllNodeInnerSequence(process, children, flowId); } } - } - /** * 递归创建节点间连线 - * * @param process 流程 * @param nodeDto 节点对象 * @param nextId @@ -179,85 +166,81 @@ public class ModelUtil { return; } - //子节点 + // 子节点 Node children = nodeDto.getChildren(); - if (NodeTypeEnum.getByValue(nodeDto.getType()).getBranch() ) { -// children = children.getChildren(); - //条件分支 + if (NodeTypeEnum.getByValue(nodeDto.getType()).getBranch()) { + // children = children.getChildren(); + // 条件分支 List branchs = nodeDto.getConditionNodes(); int ord = 1; int size = branchs.size(); for (Node branch : branchs) { - buildAllNodeOuterSequence(process, branch.getChildren(), nodeDto.getTailId()); String expression = null; - if (nodeDto.getType() == NodeTypeEnum.EXCLUSIVE_GATEWAY.getValue().intValue() ) { + if (nodeDto.getType() == NodeTypeEnum.EXCLUSIVE_GATEWAY.getValue().intValue()) { if (ord == size) { expression = NodeExpressionStrategyFactory.handleDefaultBranch(branchs, ord - 1); - } else if (nodeDto.getType() == NodeTypeEnum.EXCLUSIVE_GATEWAY.getValue().intValue() && ord > 1) { + } + else if (nodeDto.getType() == NodeTypeEnum.EXCLUSIVE_GATEWAY.getValue().intValue() && ord > 1) { expression = NodeExpressionStrategyFactory.handleDefaultBranch(branchs, ord - 1); - } else { + } + else { expression = NodeExpressionStrategyFactory.handle(branch); } } - - //添加连线 + // 添加连线 if (!NodeUtil.isNode(branch.getChildren())) { - //当前分支 没有其他节点了 所有就是网关和网关后面节点直接连线 + // 当前分支 没有其他节点了 所有就是网关和网关后面节点直接连线 SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getId(), nodeDto.getTailId(), - expression, - StrUtil.format("{}->{}", nodeDto.getName(), nodeDto.getName()) - ); + expression, StrUtil.format("{}->{}", nodeDto.getName(), nodeDto.getName())); process.addFlowElement(sequenceFlow); - } else { + } + else { - SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getId(), branch.getChildren().getHeadId(), - expression, - StrUtil.format("{}->{}", nodeDto.getName(), branch.getChildren().getName()) - ); + SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getId(), + branch.getChildren().getHeadId(), expression, + StrUtil.format("{}->{}", nodeDto.getName(), branch.getChildren().getName())); process.addFlowElement(sequenceFlow); } ord++; } - //分支结尾的合并分支节点-》下一个节点 - if (children != null && StrUtil.isNotBlank(children.getHeadId()) && StrUtil.isNotBlank(nodeDto.getTailId())) { + // 分支结尾的合并分支节点-》下一个节点 + if (children != null && StrUtil.isNotBlank(children.getHeadId()) + && StrUtil.isNotBlank(nodeDto.getTailId())) { - SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getTailId(), children.getHeadId(), - "", - StrUtil.format("{}->{}", nodeDto.getName(), children.getName()) - ); + SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getTailId(), children.getHeadId(), "", + StrUtil.format("{}->{}", nodeDto.getName(), children.getName())); process.addFlowElement(sequenceFlow); - } else if (StrUtil.isAllNotBlank(nodeDto.getTailId(), nextId)) { - SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getTailId(), nextId, - "", - StrUtil.format("{}->{}", nodeDto.getName(), nextId) - ); + } + else if (StrUtil.isAllNotBlank(nodeDto.getTailId(), nextId)) { + SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeDto.getTailId(), nextId, "", + StrUtil.format("{}->{}", nodeDto.getName(), nextId)); process.addFlowElement(sequenceFlow); } - buildAllNodeOuterSequence(process, children, nextId); - - } else { - //添加连线 + } + else { + // 添加连线 if (NodeUtil.isNode(children)) { List sequenceFlowList = buildSequenceFlow(children, nodeDto, ""); for (SequenceFlow sequenceFlow : sequenceFlowList) { process.addFlowElement(sequenceFlow); } buildAllNodeOuterSequence(process, children, nextId); - } else if (nodeDto.getType() != NodeTypeEnum.END.getValue().intValue()) { - SequenceFlow seq = buildSingleSequenceFlow(nodeDto.getTailId(), nextId, "", StrUtil.format("{}->{}", - nodeDto.getName(), nextId)); + } + else if (nodeDto.getType() != NodeTypeEnum.END.getValue().intValue()) { + SequenceFlow seq = buildSingleSequenceFlow(nodeDto.getTailId(), nextId, "", + StrUtil.format("{}->{}", nodeDto.getName(), nextId)); process.addFlowElement(seq); @@ -266,11 +249,9 @@ public class ModelUtil { } - /** * 构建节点 - * - * @param node 前端传输节点 + * @param node 前端传输节点 * @param flowId * @return */ @@ -280,13 +261,13 @@ public class ModelUtil { return flowElementList; } - //设置节点的连线头节点 + // 设置节点的连线头节点 node.setHeadId(node.getId()); - //设置节点的连线尾节点 + // 设置节点的连线尾节点 node.setTailId(node.getId()); node.setName(StrUtil.format("{}[{}]", node.getName(), RandomUtil.randomNumbers(5))); - //存储节点数据 + // 存储节点数据 RemoteFlowTaskService remoteFlowTaskService = SpringUtil.getBean(RemoteFlowTaskService.class); ProcessNodeDataDto processNodeDataDto = new ProcessNodeDataDto(); processNodeDataDto.setFlowId(flowId); @@ -294,32 +275,31 @@ public class ModelUtil { processNodeDataDto.setData(JSONUtil.toJsonStr(node)); remoteFlowTaskService.saveNodeOriData(processNodeDataDto); - //开始 + // 开始 if (node.getType() == NodeTypeEnum.ROOT.getValue().intValue()) { flowElementList.addAll(buildStartNode(node)); } - //结束 + // 结束 if (node.getType() == NodeTypeEnum.END.getValue().intValue()) { flowElementList.add(buildEndNode(node, false)); } - //审批 + // 审批 if (node.getType() == NodeTypeEnum.APPROVAL.getValue().intValue()) { - flowElementList.addAll(buildApproveNode(node)); } - //抄送 + // 抄送 if (node.getType() == NodeTypeEnum.CC.getValue().intValue()) { flowElementList.add(buildCCNode(node)); } - //条件分支 + // 条件分支 if (node.getType() == NodeTypeEnum.EXCLUSIVE_GATEWAY.getValue().intValue()) { flowElementList.addAll(buildInclusiveGatewayNode(node)); } - //并行分支 + // 并行分支 if (node.getType() == NodeTypeEnum.PARALLEL_GATEWAY.getValue().intValue()) { flowElementList.addAll(buildParallelGatewayNode(node)); } @@ -328,9 +308,7 @@ public class ModelUtil { } /** - * 构建开始节点 - * 添加一个自动完成任务的用户任务节点 - * + * 构建开始节点 添加一个自动完成任务的用户任务节点 * @param node 前端传输节点 * @return */ @@ -338,22 +316,17 @@ public class ModelUtil { List flowElementList = new ArrayList<>(); - StartEvent startEvent = new StartEvent(); startEvent.setId(node.getId()); startEvent.setName(node.getName()); flowElementList.add(startEvent); - - - return flowElementList; } /** * 构建审批节点 - * * @param node * @return */ @@ -361,21 +334,17 @@ public class ModelUtil { List flowElementList = new ArrayList<>(); node.setTailId(StrUtil.format("approve_service_task_{}", node.getId())); - - //创建了任务执行监听器 - //先执行指派人 后创建 - //https://tkjohn.github.io/flowable-userguide/#eventDispatcher + // 创建了任务执行监听器 + // 先执行指派人 后创建 + // https://tkjohn.github.io/flowable-userguide/#eventDispatcher FlowableListener createListener = new FlowableListener(); createListener.setImplementation(ApprovalCreateListener.class.getCanonicalName()); createListener.setImplementationType("class"); createListener.setEvent("create"); - UserTask userTask = buildUserTask(node, createListener); flowElementList.add(userTask); - - ServiceTask serviceTask = new ServiceTask(); serviceTask.setId(StrUtil.format("approve_service_task_{}", node.getId())); serviceTask.setName(StrUtil.format("{}_服务任务", node.getName())); @@ -383,36 +352,31 @@ public class ModelUtil { serviceTask.setImplementation(ApproveServiceTask.class.getCanonicalName()); serviceTask.setAsynchronous(false); - - flowElementList.add(serviceTask); - { - - //执行人处理 + // 执行人处理 String inputDataItem = "${multiInstanceHandler.resolveAssignee(execution)}"; - - //串行 + // 串行 boolean isSequential = true; Integer multipleMode = node.getMultipleMode(); - //多人 + // 多人 if ((multipleMode == ProcessInstanceConstant.MULTIPLE_MODE_AL_SAME)) { - //并行会签 + // 并行会签 isSequential = false; } if ((multipleMode == ProcessInstanceConstant.MULTIPLE_MODE_ALL_SORT)) { - //串行会签 + // 串行会签 } if ((multipleMode == ProcessInstanceConstant.MULTIPLE_MODE_ONE)) { - //或签 + // 或签 isSequential = false; } @@ -431,11 +395,8 @@ public class ModelUtil { return flowElementList; } - - /** * 创建用户任务 - * * @param node 前端传输节点 * @return */ @@ -459,13 +420,11 @@ public class ModelUtil { /** * 构建简单的包容网关 - * * @param node * @return */ private static FlowElement buildSimpleExclusiveGatewayNode(Node node) { - ExclusiveGateway exclusiveGateway = new ExclusiveGateway(); exclusiveGateway.setId(node.getId()); exclusiveGateway.setName(node.getName()); @@ -474,10 +433,8 @@ public class ModelUtil { } - /** * 构建并行网关 - * * @param node * @return */ @@ -490,7 +447,7 @@ public class ModelUtil { inclusiveGateway.setName(node.getName()); flowElementList.add(inclusiveGateway); - //合并网关 + // 合并网关 ParallelGateway parallelGateway = new ParallelGateway(); parallelGateway.setId(StrUtil.format("{}_merge_gateway", node.getId())); parallelGateway.setName(StrUtil.format("{}_合并网关", node.getName())); @@ -501,7 +458,6 @@ public class ModelUtil { /** * 构建包容网关 - * * @param node * @return */ @@ -516,7 +472,7 @@ public class ModelUtil { inclusiveGateway.setName(node.getName()); flowElementList.add(inclusiveGateway); - //合并网关 + // 合并网关 InclusiveGateway gateway = new InclusiveGateway(); gateway.setId(StrUtil.format("{}_merge_gateway", node.getId())); gateway.setName(StrUtil.format("{}_合并网关", node.getName())); @@ -527,8 +483,7 @@ public class ModelUtil { /** * 构建结束节点 - * - * @param node 前端传输节点 + * @param node 前端传输节点 * @param terminateAll * @return */ @@ -537,7 +492,6 @@ public class ModelUtil { endEvent.setId(node.getId()); endEvent.setName(node.getName()); - List definitionList = new ArrayList<>(); TerminateEventDefinition definition = new TerminateEventDefinition(); definition.setTerminateAll(terminateAll); @@ -549,16 +503,14 @@ public class ModelUtil { /** * 创建连接线 - * - * @param node 子级节点 + * @param node 子级节点 * @param parentNode 父级节点 * @param expression * @return 所有连接线 */ - private static List buildSequenceFlow(Node node, Node parentNode, String expression - ) { + private static List buildSequenceFlow(Node node, Node parentNode, String expression) { List sequenceFlowList = new ArrayList<>(); - //没有子级了 + // 没有子级了 if (!NodeUtil.isNode(node)) { return sequenceFlowList; } @@ -569,19 +521,15 @@ public class ModelUtil { return sequenceFlowList; } - SequenceFlow sequenceFlow = buildSingleSequenceFlow(parentNode.getTailId(), node.getHeadId(), expression, - StrUtil.format("{}->{}", parentNode.getName(), node.getName()) - ); + StrUtil.format("{}->{}", parentNode.getName(), node.getName())); sequenceFlowList.add(sequenceFlow); - return sequenceFlowList; } /** * 生成扩展数据 - * * @param key * @param val * @return @@ -596,7 +544,6 @@ public class ModelUtil { /** * 创建抄送节点 - * * @param node * @return */ @@ -612,9 +559,8 @@ public class ModelUtil { ExtensionElement e = new ExtensionElement(); { - e.setName("flowable:failedJobRetryTimeCycle"); - //上面的例子会让作业执行器重试5次，并在每次重试前等待1分钟。 + // 上面的例子会让作业执行器重试5次，并在每次重试前等待1分钟。 e.setElementText("R5/PT1M"); } @@ -623,57 +569,42 @@ public class ModelUtil { return serviceTask; } - - /** * 创建连接线 - * - * @param node 父级节点 + * @param node 父级节点 * @param flowId * @return 所有连接线 */ - private static List buildInnerSequenceFlow(Node node, String flowId - ) { - + private static List buildInnerSequenceFlow(Node node, String flowId) { List sequenceFlowList = new ArrayList<>(); if (!NodeUtil.isNode(node)) { return sequenceFlowList; } - String nodeId = node.getId(); if (StrUtil.hasBlank(nodeId)) { return sequenceFlowList; } - if (node.getType() == NodeTypeEnum.APPROVAL.getValue().intValue()) { - String gatewayId = StrUtil.format("approve_service_task_{}", nodeId); - { SequenceFlow sequenceFlow = buildSingleSequenceFlow(nodeId, gatewayId, "${12==12}", null); sequenceFlowList.add(sequenceFlow); } - } - - - - return sequenceFlowList; } /** * 创建单个连接线 - * - * @param pId 父级id - * @param childId 子级id + * @param pId 父级id + * @param childId 子级id * @param expression 表达式 * @param name * @return @@ -693,5 +624,4 @@ public class ModelUtil { return sequenceFlow; } - } diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java index 7ba7b77ba..4139a5908 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java @@ -506,7 +506,7 @@ public abstract class AbstractEngineConfiguration { databaseTypeMappings.setProperty("DB2/PTX", DATABASE_TYPE_DB2); databaseTypeMappings.setProperty("DB2/2", DATABASE_TYPE_DB2); databaseTypeMappings.setProperty("DB2 UDB AS400", DATABASE_TYPE_DB2); - databaseTypeMappings.setProperty("DM DBMS",DATABASE_TYPE_MYSQL);//扩展支持达梦数据 + databaseTypeMappings.setProperty("DM DBMS", DATABASE_TYPE_MYSQL);// 扩展支持达梦数据 databaseTypeMappings.setProperty(PRODUCT_NAME_CRDB, DATABASE_TYPE_COCKROACHDB); return databaseTypeMappings; } diff --git a/pigx-flow/pigx-flow-engine/pom.xml b/pigx-flow/pigx-flow-engine/pom.xml index 9b9127c06..e7af19ada 100644 --- a/pigx-flow/pigx-flow-engine/pom.xml +++ b/pigx-flow/pigx-flow-engine/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow - 5.2.0-snapshot + 5.2.0 pigx-flow-engine diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml index 619bd9d9b..854815d4f 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-task - 5.2.0-snapshot + 5.2.0 pigx-flow-task-api diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java index 6bb830147..5d35945d9 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java @@ -115,7 +115,6 @@ public interface RemoteFlowEngineService { @PostMapping("/task/delegateTask") R delegateTask(@RequestBody TaskParamDto taskParamDto); - /** * 查询任务 * @param taskId 任务ID diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/SelectValue.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/SelectValue.java index 890d27e9d..0632acbab 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/SelectValue.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/SelectValue.java @@ -10,8 +10,8 @@ import lombok.Data; @Data public class SelectValue { - private String key; + private String key; - private String value; + private String value; } diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml index 26dbabd9b..2326e32a9 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-task - 5.2.0-snapshot + 5.2.0 pigx-flow-task-biz diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java index 96685c1d3..ad5e46183 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java @@ -52,7 +52,6 @@ public interface IProcessInstanceService { */ R queryMineCC(TaskQueryParamDto taskQueryParamDto); - /** * 格式化流程显示 * @param nodeFormatParamVo diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java index 367ba3de6..431f4771a 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java @@ -289,7 +289,6 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService { return R.ok(p); } - /** * 格式化流程显示 * @param nodeFormatParamVo diff --git a/pigx-flow/pigx-flow-task/pom.xml b/pigx-flow/pigx-flow-task/pom.xml index 0add965fd..508cca397 100644 --- a/pigx-flow/pigx-flow-task/pom.xml +++ b/pigx-flow/pigx-flow-task/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow - 5.2.0-snapshot + 5.2.0 pigx-flow-task diff --git a/pigx-flow/pom.xml b/pigx-flow/pom.xml index 83df8de50..53d6fd766 100644 --- a/pigx-flow/pom.xml +++ b/pigx-flow/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-flow diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index c0639934a..1d4d98fc6 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-gateway diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java index ba5c22198..6d0232c91 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(value = "springdoc.api-docs.enabled",matchIfMissing = true) +@ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true) public class SpringDocConfiguration implements InitializingBean { private final SwaggerUiConfigProperties swaggerUiConfigProperties; diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 2147e7847..7f3d6f1c1 100644 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 051d062e0..cc420b051 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 5.2.0-snapshot + 5.2.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 72fffbec6..47d2a0222 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 5.2.0-snapshot + 5.2.0 pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index 7466ed576..1cb303ed9 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-upms diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index e0098a024..3e25d1a0b 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-codegen diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java index d78f6018b..0c0cb5ac2 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java @@ -299,7 +299,8 @@ public class GeneratorServiceImpl implements GeneratorService { // 按字段类型分组，使用 Map 存储不同类型的字段列表 Map> typeMap = table.getFieldList() .stream() - .collect(Collectors.partitioningBy(columnEntity -> BooleanUtil.toBoolean(columnEntity.getPrimaryPk().toString()))); + .collect(Collectors + .partitioningBy(columnEntity -> BooleanUtil.toBoolean(columnEntity.getPrimaryPk().toString()))); // 从分组后的 Map 中获取不同类型的字段列表 List primaryList = typeMap.get(true); diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 8467f1d7d..8696f4c8f 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index 1ba41ce54..d7a57a3d6 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 4.0.0 diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml index 12276c73e..4c4b92164 100755 --- a/pigx-visual/pigx-jimu-platform/pom.xml +++ b/pigx-visual/pigx-jimu-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-jimu-platform diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index c83612f0a..0c25efc0c 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-monitor diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index ba2bf0fa6..5d8f3d44f 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-mp-platform diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/ImageBuilder.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/ImageBuilder.java index 9ffca3dc9..114ac4a00 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/ImageBuilder.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/ImageBuilder.java @@ -13,8 +13,11 @@ public class ImageBuilder extends AbstractBuilder { @Override public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage, WxMpService service) { - WxMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId(content).fromUser(wxMessage.getToUser()) - .toUser(wxMessage.getFromUser()).build(); + WxMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE() + .mediaId(content) + .fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .build(); return m; } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/TextBuilder.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/TextBuilder.java index 66d3943e1..fd7a1e1d0 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/TextBuilder.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/builder/TextBuilder.java @@ -12,8 +12,11 @@ public class TextBuilder extends AbstractBuilder { @Override public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage, WxMpService service) { - WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content(content).fromUser(wxMessage.getToUser()) - .toUser(wxMessage.getFromUser()).build(); + WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT() + .content(content) + .fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .build(); return m; } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java index de1b95b44..c654dd614 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java @@ -127,36 +127,72 @@ public class WxMpInitConfigRunner { newRouter.rule().handler(this.logHandler).next(); // 接收客服会话管理事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT) - .event(WxMpEventConstants.CustomerService.KF_CREATE_SESSION).handler(this.kfSessionHandler).end(); - newRouter.rule().async(false).msgType(XmlMsgType.EVENT) - .event(WxMpEventConstants.CustomerService.KF_CLOSE_SESSION).handler(this.kfSessionHandler).end(); - newRouter.rule().async(false).msgType(XmlMsgType.EVENT) - .event(WxMpEventConstants.CustomerService.KF_SWITCH_SESSION).handler(this.kfSessionHandler).end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(WxMpEventConstants.CustomerService.KF_CREATE_SESSION) + .handler(this.kfSessionHandler) + .end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(WxMpEventConstants.CustomerService.KF_CLOSE_SESSION) + .handler(this.kfSessionHandler) + .end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(WxMpEventConstants.CustomerService.KF_SWITCH_SESSION) + .handler(this.kfSessionHandler) + .end(); // 门店审核事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT).event(WxMpEventConstants.POI_CHECK_NOTIFY) - .handler(this.storeCheckNotifyHandler).end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(WxMpEventConstants.POI_CHECK_NOTIFY) + .handler(this.storeCheckNotifyHandler) + .end(); // 自定义菜单事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT).event(MenuButtonType.CLICK).handler(this.menuHandler) - .end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(MenuButtonType.CLICK) + .handler(this.menuHandler) + .end(); // 点击菜单连接事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT).event(MenuButtonType.VIEW).handler(this.nullHandler) - .end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(MenuButtonType.VIEW) + .handler(this.nullHandler) + .end(); // 关注事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT).event(EventType.SUBSCRIBE) - .handler(this.subscribeHandler).end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(EventType.SUBSCRIBE) + .handler(this.subscribeHandler) + .end(); // 取消关注事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT).event(EventType.UNSUBSCRIBE) - .handler(this.unsubscribeHandler).end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(EventType.UNSUBSCRIBE) + .handler(this.unsubscribeHandler) + .end(); // 上报地理位置事件 - newRouter.rule().async(false).msgType(XmlMsgType.EVENT).event(EventType.LOCATION).handler(this.locationHandler) - .end(); + newRouter.rule() + .async(false) + .msgType(XmlMsgType.EVENT) + .event(EventType.LOCATION) + .handler(this.locationHandler) + .end(); // 接收地理位置消息 newRouter.rule().async(false).msgType(XmlMsgType.LOCATION).handler(this.locationHandler).end(); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java index 8a1fda3fe..03f07ad5b 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java @@ -57,8 +57,8 @@ public class WxAccountController { @GetMapping("/page") public R getWxAccountPage(Page page, WxAccount wxAccount) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(wxAccount.getName()), WxAccount::getName, wxAccount.getName()) - .like(StrUtil.isNotBlank(wxAccount.getAccount()), WxAccount::getAccount, wxAccount.getAccount()); + .like(StrUtil.isNotBlank(wxAccount.getName()), WxAccount::getName, wxAccount.getName()) + .like(StrUtil.isNotBlank(wxAccount.getAccount()), WxAccount::getAccount, wxAccount.getAccount()); return R.ok(wxAccountService.page(page, wrapper)); } @@ -132,8 +132,8 @@ public class WxAccountController { */ @GetMapping("/list") public R list(String name) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery().like(StrUtil.isNotBlank(name), - WxAccount::getName, name); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(name), WxAccount::getName, name); return R.ok(wxAccountService.list(wrapper)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java index b9fc4f0e3..67d4cff78 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java @@ -37,9 +37,9 @@ public class WxAccountTagController { @GetMapping("/page") public R> getWxAccountTagPage(Page page, WxAccountTag wxAccountTag) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(wxAccountTag.getTag()), WxAccountTag::getTag, wxAccountTag.getTag()) - .eq(StrUtil.isNotBlank(wxAccountTag.getWxAccountAppid()), WxAccountTag::getWxAccountAppid, - wxAccountTag.getWxAccountAppid()); + .like(StrUtil.isNotBlank(wxAccountTag.getTag()), WxAccountTag::getTag, wxAccountTag.getTag()) + .eq(StrUtil.isNotBlank(wxAccountTag.getWxAccountAppid()), WxAccountTag::getWxAccountAppid, + wxAccountTag.getWxAccountAppid()); return R.ok(wxAccountTagService.page(page, wrapper)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java index 12ff7ca81..e6e25ce85 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java @@ -87,8 +87,8 @@ public class WxAutoReplyController { */ public void jude(WxAutoReply wxAutoReply) { if (ReplyTypeEnum.MSG.getType().equals(wxAutoReply.getType())) { - Wrapper queryWrapper = Wrappers.lambdaQuery().eq(WxAutoReply::getReqType, - wxAutoReply.getReqType()); + Wrapper queryWrapper = Wrappers.lambdaQuery() + .eq(WxAutoReply::getReqType, wxAutoReply.getReqType()); List list = wxAutoReplyService.list(queryWrapper); if (wxAutoReply.getId() != null) { if (list != null && list.size() == 1) { @@ -103,8 +103,8 @@ public class WxAutoReplyController { } if (ReplyTypeEnum.KEYWORD.getType().equals(wxAutoReply.getType())) { Wrapper queryWrapper = Wrappers.lambdaQuery() - .eq(WxAutoReply::getReqKey, wxAutoReply.getReqKey()) - .eq(WxAutoReply::getRepType, wxAutoReply.getRepMate()); + .eq(WxAutoReply::getReqKey, wxAutoReply.getReqKey()) + .eq(WxAutoReply::getRepType, wxAutoReply.getRepMate()); List list = wxAutoReplyService.list(queryWrapper); if (list != null && list.size() == 1) { if (!list.get(0).getId().equals(wxAutoReply.getId())) { diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java index 3cdcc2830..8898e7181 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java @@ -50,9 +50,9 @@ public class WxFansMsgController { @GetMapping("/page") public R getWxMsgPage(Page page, WxMsg msg) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(StrUtil.isNotBlank(msg.getAppId()), WxMsg::getAppId, msg.getAppId()) - .like(StrUtil.isNotBlank(msg.getNickName()), WxMsg::getNickName, msg.getNickName()) - .eq(StrUtil.isNotBlank(msg.getType()), WxMsg::getType, msg.getType()); + .eq(StrUtil.isNotBlank(msg.getAppId()), WxMsg::getAppId, msg.getAppId()) + .like(StrUtil.isNotBlank(msg.getNickName()), WxMsg::getNickName, msg.getNickName()) + .eq(StrUtil.isNotBlank(msg.getType()), WxMsg::getType, msg.getType()); return R.ok(wxMsgService.page(page, wrapper)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LocationHandler.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LocationHandler.java index 0aebc0c2e..b0bc67ea9 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LocationHandler.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LocationHandler.java @@ -45,17 +45,18 @@ public class LocationHandler extends AbstractHandler { wxMessage.getPrecision()); // 发送关注消息 - List listWxAutoReply = wxAutoReplyService - .list(Wrappers.query().lambda().eq(WxAutoReply::getType, ReplyTypeEnum.MSG.getType()) - .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) - .eq(WxAutoReply::getReqType, wxMessage.getMsgType())); + List listWxAutoReply = wxAutoReplyService.list(Wrappers.query() + .lambda() + .eq(WxAutoReply::getType, ReplyTypeEnum.MSG.getType()) + .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) + .eq(WxAutoReply::getReqType, wxMessage.getMsgType())); // 查询公众号 基本信息 WxAccount wxAccount = wxAccountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); // 查询粉丝基本信息 WxAccountFans fans = wxAccountFansMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccountFans::getOpenid, wxMessage.getFromUser())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccountFans::getOpenid, wxMessage.getFromUser())); return MsgHandler.getWxMpXmlOutMessage(wxMessage, listWxAutoReply, fans, msgMapper, wxAccount); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LogHandler.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LogHandler.java index 169f7bcaf..d81fd11ff 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LogHandler.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/LogHandler.java @@ -44,10 +44,10 @@ public class LogHandler extends AbstractHandler { log.debug("接收到请求消息，内容：{}", wxMessage.getContent()); WxAccount wxAccount = accountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); WxAccountFans fans = fansMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccountFans::getOpenid, wxMessage.getFromUser())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccountFans::getOpenid, wxMessage.getFromUser())); if (fans == null) { return null; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MenuHandler.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MenuHandler.java index 0321cea25..45ab9792f 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MenuHandler.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MenuHandler.java @@ -47,10 +47,11 @@ public class MenuHandler extends AbstractHandler { */ public WxMpXmlOutMessage getWxMpXmlOutMessage(WxMpXmlMessage wxMessage) { - WxMpMenu wxMpMenu = wxMenuMapper.selectOne( - Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, WxMpContextHolder.getAppId())); - List buttons = JSONUtil.parseObj(wxMpMenu.getMenu()).getJSONArray("button") - .toList(JSONObject.class); + WxMpMenu wxMpMenu = wxMenuMapper + .selectOne(Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, WxMpContextHolder.getAppId())); + List buttons = JSONUtil.parseObj(wxMpMenu.getMenu()) + .getJSONArray("button") + .toList(JSONObject.class); String eventKey = wxMessage.getEventKey(); // 获取子集 @@ -80,23 +81,33 @@ public class MenuHandler extends AbstractHandler { String repMediaId = button.getStr("repMediaId"); String repDesc = button.getStr("repDesc"); if (WxConsts.KefuMsgType.TEXT.equals(repType)) { - wxMpXmlOutMessage = new TextBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .content(repContent).build(); + wxMpXmlOutMessage = new TextBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .content(repContent) + .build(); } if (WxConsts.KefuMsgType.IMAGE.equals(repType)) { - wxMpXmlOutMessage = new ImageBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .mediaId(repMediaId).build(); + wxMpXmlOutMessage = new ImageBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .mediaId(repMediaId) + .build(); } if (WxConsts.KefuMsgType.VOICE.equals(repType)) { - wxMpXmlOutMessage = new VoiceBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .mediaId(repMediaId).build(); + wxMpXmlOutMessage = new VoiceBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .mediaId(repMediaId) + .build(); } if (WxConsts.KefuMsgType.VIDEO.equals(repType)) { - wxMpXmlOutMessage = new VideoBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .mediaId(repMediaId).title(repName).description(repDesc).build(); + wxMpXmlOutMessage = new VideoBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .mediaId(repMediaId) + .title(repName) + .description(repDesc) + .build(); } if (WxConsts.KefuMsgType.MUSIC.equals(repType)) { @@ -104,17 +115,23 @@ public class MenuHandler extends AbstractHandler { String repUrl = button.getStr("repUrl"); String repHqUrl = button.getStr("repHqUrl"); - wxMpXmlOutMessage = new MusicBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .thumbMediaId(repThumbMediaId).title(repName).description(repDesc).musicUrl(repUrl) - .hqMusicUrl(repHqUrl).build(); + wxMpXmlOutMessage = new MusicBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .thumbMediaId(repThumbMediaId) + .title(repName) + .description(repDesc) + .musicUrl(repUrl) + .hqMusicUrl(repHqUrl) + .build(); } if (WxConsts.KefuMsgType.NEWS.equals(repType)) { String content = button.getStr("content"); List list = new ArrayList<>(); - List articles = JSONUtil.parseObj(content).getJSONArray("articles") - .toList(JSONObject.class); + List articles = JSONUtil.parseObj(content) + .getJSONArray("articles") + .toList(JSONObject.class); WxMpXmlOutNewsMessage.Item t; for (JSONObject jsonObject : articles) { t = new WxMpXmlOutNewsMessage.Item(); @@ -124,8 +141,10 @@ public class MenuHandler extends AbstractHandler { t.setUrl(jsonObject.getStr("url")); list.add(t); } - wxMpXmlOutMessage = new NewsBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .articles(list).build(); + wxMpXmlOutMessage = new NewsBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .articles(list) + .build(); } return wxMpXmlOutMessage; } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MsgHandler.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MsgHandler.java index a2a3bf16f..3e7428f59 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MsgHandler.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/MsgHandler.java @@ -53,19 +53,20 @@ public class MsgHandler extends AbstractHandler { // 组装回复消息 if (!wxMessage.getMsgType().equals(XmlMsgType.EVENT)) { WxMpXmlOutMessage rs; - WxAccountFans fans = wxAccountFansMapper.selectOne( - Wrappers.lambdaQuery().eq(WxAccountFans::getOpenid, wxMessage.getFromUser())); + WxAccountFans fans = wxAccountFansMapper + .selectOne(Wrappers.lambdaQuery().eq(WxAccountFans::getOpenid, wxMessage.getFromUser())); // 查询公众号 基本信息 WxAccount wxAccount = wxAccountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); // 1、先处理是否有文本关键字回复 if (WxConsts.KefuMsgType.TEXT.equals(wxMessage.getMsgType())) { // 先全匹配 - List listWxAutoReply = wxAutoReplyService.list( - Wrappers.query().lambda().eq(WxAutoReply::getType, ReplyTypeEnum.KEYWORD.getType()) - .eq(WxAutoReply::getRepMate, ReplyMateEnum.ALL.getType()) - .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) - .eq(WxAutoReply::getReqKey, wxMessage.getContent())); + List listWxAutoReply = wxAutoReplyService.list(Wrappers.query() + .lambda() + .eq(WxAutoReply::getType, ReplyTypeEnum.KEYWORD.getType()) + .eq(WxAutoReply::getRepMate, ReplyMateEnum.ALL.getType()) + .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) + .eq(WxAutoReply::getReqKey, wxMessage.getContent())); if (listWxAutoReply != null && listWxAutoReply.size() > 0) { rs = getWxMpXmlOutMessage(wxMessage, listWxAutoReply, fans, wxMsgMapper, wxAccount); if (rs != null) { @@ -73,11 +74,12 @@ public class MsgHandler extends AbstractHandler { } } // 再半匹配 - listWxAutoReply = wxAutoReplyService.list( - Wrappers.query().lambda().eq(WxAutoReply::getType, ReplyTypeEnum.KEYWORD.getType()) - .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) - .eq(WxAutoReply::getRepMate, ReplyMateEnum.LIKE.getType()) - .like(WxAutoReply::getReqKey, wxMessage.getContent())); + listWxAutoReply = wxAutoReplyService.list(Wrappers.query() + .lambda() + .eq(WxAutoReply::getType, ReplyTypeEnum.KEYWORD.getType()) + .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) + .eq(WxAutoReply::getRepMate, ReplyMateEnum.LIKE.getType()) + .like(WxAutoReply::getReqKey, wxMessage.getContent())); if (listWxAutoReply != null && listWxAutoReply.size() > 0) { rs = getWxMpXmlOutMessage(wxMessage, listWxAutoReply, fans, wxMsgMapper, wxAccount); if (rs != null) { @@ -86,10 +88,11 @@ public class MsgHandler extends AbstractHandler { } } // 2、再处理消息回复 - List listWxAutoReply = wxAutoReplyService - .list(Wrappers.query().lambda().eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) - .eq(WxAutoReply::getType, ReplyTypeEnum.MSG.getType()) - .eq(WxAutoReply::getReqType, wxMessage.getMsgType())); + List listWxAutoReply = wxAutoReplyService.list(Wrappers.query() + .lambda() + .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId()) + .eq(WxAutoReply::getType, ReplyTypeEnum.MSG.getType()) + .eq(WxAutoReply::getReqType, wxMessage.getMsgType())); rs = getWxMpXmlOutMessage(wxMessage, listWxAutoReply, fans, wxMsgMapper, wxAccount); return rs; } @@ -126,8 +129,10 @@ public class MsgHandler extends AbstractHandler { // 文本 if (WxConsts.KefuMsgType.TEXT.equals(wxAutoReply.getRepType())) { wxMsg.setRepContent(wxAutoReply.getRepContent()); - wxMpXmlOutMessage = new TextBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .content(wxAutoReply.getRepContent()).build(); + wxMpXmlOutMessage = new TextBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .content(wxAutoReply.getRepContent()) + .build(); } // 图片 @@ -135,24 +140,31 @@ public class MsgHandler extends AbstractHandler { wxMsg.setRepName(wxAutoReply.getRepName()); wxMsg.setRepUrl(wxAutoReply.getRepUrl()); wxMsg.setRepMediaId(wxAutoReply.getRepMediaId()); - wxMpXmlOutMessage = new ImageBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .mediaId(wxAutoReply.getRepMediaId()).build(); + wxMpXmlOutMessage = new ImageBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .mediaId(wxAutoReply.getRepMediaId()) + .build(); } if (WxConsts.KefuMsgType.VOICE.equals(wxAutoReply.getRepType())) { wxMsg.setRepName(wxAutoReply.getRepName()); wxMsg.setRepUrl(wxAutoReply.getRepUrl()); wxMsg.setRepMediaId(wxAutoReply.getRepMediaId()); - wxMpXmlOutMessage = new VoiceBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .mediaId(wxAutoReply.getRepMediaId()).build(); + wxMpXmlOutMessage = new VoiceBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .mediaId(wxAutoReply.getRepMediaId()) + .build(); } if (WxConsts.KefuMsgType.VIDEO.equals(wxAutoReply.getRepType())) { wxMsg.setRepName(wxAutoReply.getRepName()); wxMsg.setRepDesc(wxAutoReply.getRepDesc()); wxMsg.setRepUrl(wxAutoReply.getRepUrl()); wxMsg.setRepMediaId(wxAutoReply.getRepMediaId()); - wxMpXmlOutMessage = new VideoBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .mediaId(wxAutoReply.getRepMediaId()).title(wxAutoReply.getRepName()) - .description(wxAutoReply.getRepDesc()).build(); + wxMpXmlOutMessage = new VideoBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .mediaId(wxAutoReply.getRepMediaId()) + .title(wxAutoReply.getRepName()) + .description(wxAutoReply.getRepDesc()) + .build(); } if (WxConsts.KefuMsgType.MUSIC.equals(wxAutoReply.getRepType())) { wxMsg.setRepName(wxAutoReply.getRepName()); @@ -161,10 +173,14 @@ public class MsgHandler extends AbstractHandler { wxMsg.setRepHqUrl(wxAutoReply.getRepHqUrl()); wxMsg.setRepThumbMediaId(wxAutoReply.getRepThumbMediaId()); wxMsg.setRepThumbUrl(wxAutoReply.getRepThumbUrl()); - wxMpXmlOutMessage = new MusicBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .thumbMediaId(wxAutoReply.getRepThumbMediaId()).title(wxAutoReply.getRepName()) - .description(wxAutoReply.getRepDesc()).musicUrl(wxAutoReply.getRepUrl()) - .hqMusicUrl(wxAutoReply.getRepHqUrl()).build(); + wxMpXmlOutMessage = new MusicBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .thumbMediaId(wxAutoReply.getRepThumbMediaId()) + .title(wxAutoReply.getRepName()) + .description(wxAutoReply.getRepDesc()) + .musicUrl(wxAutoReply.getRepUrl()) + .hqMusicUrl(wxAutoReply.getRepHqUrl()) + .build(); } if (WxConsts.KefuMsgType.NEWS.equals(wxAutoReply.getRepType())) { List list = new ArrayList<>(); @@ -183,8 +199,10 @@ public class MsgHandler extends AbstractHandler { wxMsg.setRepUrl(wxAutoReply.getRepUrl()); wxMsg.setRepMediaId(wxAutoReply.getRepMediaId()); wxMsg.setContent(wxAutoReply.getContent()); - wxMpXmlOutMessage = new NewsBuilder().fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) - .articles(list).build(); + wxMpXmlOutMessage = new NewsBuilder().fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()) + .articles(list) + .build(); } wxMsgMapper.insert(wxMsg); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java index cbd254aeb..f08ca5e9f 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java @@ -66,7 +66,7 @@ public class SubscribeHandler extends AbstractHandler { wxAccountFans.setOpenid(wxMpUser.getOpenId()); wxAccountFans.setSubscribeStatus(String.valueOf(BooleanUtil.toInt(wxMpUser.getSubscribe()))); wxAccountFans.setSubscribeTime(LocalDateTime - .ofInstant(Instant.ofEpochMilli(wxMpUser.getSubscribeTime() * 1000L), ZoneId.systemDefault())); + .ofInstant(Instant.ofEpochMilli(wxMpUser.getSubscribeTime() * 1000L), ZoneId.systemDefault())); // 随机生成一个昵称，方便平台内部使用 String generatedName = ChineseNameGenerator.getInstance().generate(); @@ -77,7 +77,7 @@ public class SubscribeHandler extends AbstractHandler { wxAccountFans.setTagIds(wxAccountFans.getTagIds()); WxAccount wxAccount = wxAccountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, WxMpContextHolder.getAppId())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, WxMpContextHolder.getAppId())); wxAccountFans.setWxAccountId(wxAccount.getId()); wxAccountFans.setWxAccountAppid(wxAccount.getAppid()); wxAccountFans.setWxAccountName(wxAccount.getName()); @@ -97,12 +97,13 @@ public class SubscribeHandler extends AbstractHandler { */ private WxMpXmlOutMessage handleSpecial(WxMpXmlMessage wxMessage, WxAccountFans fans) { // 发送关注消息 - List listWxAutoReply = wxAutoReplyService - .list(Wrappers.query().lambda().eq(WxAutoReply::getType, ReplyTypeEnum.ATTENTION.getType()) - .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId())); + List listWxAutoReply = wxAutoReplyService.list(Wrappers.query() + .lambda() + .eq(WxAutoReply::getType, ReplyTypeEnum.ATTENTION.getType()) + .eq(WxAutoReply::getAppId, WxMpContextHolder.getAppId())); // 查询公众号 基本信息 WxAccount wxAccount = wxAccountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAccount, wxMessage.getToUser())); WxMpXmlOutMessage wxMpXmlOutMessage = MsgHandler.getWxMpXmlOutMessage(wxMessage, listWxAutoReply, fans, msgMapper, wxAccount); return wxMpXmlOutMessage; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountFansServiceImpl.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountFansServiceImpl.java index 189818eaf..c5ca1a09b 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountFansServiceImpl.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountFansServiceImpl.java @@ -91,10 +91,10 @@ public class WxAccountFansServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery() - .eq(StrUtil.isNotBlank(wxAccountFans.getWxAccountAppid()), WxAccountFans::getWxAccountAppid, - wxAccountFans.getWxAccountAppid()) - .like(StrUtil.isNotBlank(wxAccountFans.getNickname()), WxAccountFans::getNickname, - wxAccountFans.getNickname()); + .eq(StrUtil.isNotBlank(wxAccountFans.getWxAccountAppid()), WxAccountFans::getWxAccountAppid, + wxAccountFans.getWxAccountAppid()) + .like(StrUtil.isNotBlank(wxAccountFans.getNickname()), WxAccountFans::getNickname, + wxAccountFans.getNickname()); IPage fansPage = baseMapper.selectPage(page, wrapper); @@ -104,9 +104,9 @@ public class WxAccountFansServiceImpl extends ServiceImpl tagList = wxAccountTags.stream() - .filter(tag -> tag.getWxAccountAppid().endsWith(fans.getWxAccountAppid()) // - && ArrayUtil.contains(fans.getTagIds(), tag.getTagId())) - .collect(Collectors.toList()); + .filter(tag -> tag.getWxAccountAppid().endsWith(fans.getWxAccountAppid()) // + && ArrayUtil.contains(fans.getTagIds(), tag.getTagId())) + .collect(Collectors.toList()); vo.setTagList(tagList); } return vo; @@ -198,7 +198,7 @@ public class WxAccountFansServiceImpl extends ServiceImplquery().lambda().eq(WxAccount::getAppid, appId)); + .selectOne(Wrappers.query().lambda().eq(WxAccount::getAppid, appId)); // 获取操作微信接口类 WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId); @@ -222,8 +222,10 @@ public class WxAccountFansServiceImpl extends ServiceImpl> openIdsList = CollUtil.split(wxMpUserList.getOpenids(), SIZE).stream() - .filter(CollUtil::isNotEmpty).collect(Collectors.toList()); + List> openIdsList = CollUtil.split(wxMpUserList.getOpenids(), SIZE) + .stream() + .filter(CollUtil::isNotEmpty) + .collect(Collectors.toList()); // 处理每个分组. 调用查询用户信息 for (List openIdList : openIdsList) { log.info("开始批量获取用户信息 {}", openIdList); @@ -262,7 +264,7 @@ public class WxAccountFansServiceImpl extends ServiceImpl queryPage = new Page<>(0, 1); - Page fansPage = baseMapper.selectPage(queryPage, Wrappers.query().lambda() - .eq(WxAccountFans::getWxAccountAppid, appId).orderByDesc(WxAccountFans::getCreateTime)); + Page fansPage = baseMapper.selectPage(queryPage, + Wrappers.query() + .lambda() + .eq(WxAccountFans::getWxAccountAppid, appId) + .orderByDesc(WxAccountFans::getCreateTime)); String nextOpenId = null; if (fansPage.getTotal() > 0) { nextOpenId = fansPage.getRecords().get(0).getOpenid(); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java index 0fead1064..3edf87091 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountServiceImpl.java @@ -64,7 +64,7 @@ public class WxAccountServiceImpl extends ServiceImplquery().lambda().eq(WxAccount::getAppid, appId)); + .selectOne(Wrappers.query().lambda().eq(WxAccount::getAppid, appId)); wxAccount.setQrUrl(url); baseMapper.updateById(wxAccount); } @@ -94,29 +94,37 @@ public class WxAccountServiceImpl extends ServiceImpl> result = new ArrayList<>(); try { // 获取累计用户数据 - List cumulateList = cubeService.getUserCumulate(start, end).stream() - .map(WxDataCubeUserCumulate::getCumulateUser).collect(Collectors.toList()); + List cumulateList = cubeService.getUserCumulate(start, end) + .stream() + .map(WxDataCubeUserCumulate::getCumulateUser) + .collect(Collectors.toList()); result.add(cumulateList); // 获取用户分享数据 - List shareList = cubeService.getUserShare(start, end).stream() - .map(WxDataCubeArticleResult::getShareCount).collect(Collectors.toList()); + List shareList = cubeService.getUserShare(start, end) + .stream() + .map(WxDataCubeArticleResult::getShareCount) + .collect(Collectors.toList()); result.add(shareList); // 获取消息发送概况数据 - List upstreamList = cubeService.getUpstreamMsg(start, end).stream() - .map(WxDataCubeMsgResult::getMsgCount).collect(Collectors.toList()); + List upstreamList = cubeService.getUpstreamMsg(start, end) + .stream() + .map(WxDataCubeMsgResult::getMsgCount) + .collect(Collectors.toList()); result.add(upstreamList); // 获取接口调用概况数据 List interfaceSummaryList = cubeService.getInterfaceSummary(start, end); - List interfaceList = interfaceSummaryList.stream().map(WxDataCubeInterfaceResult::getCallbackCount) - .collect(Collectors.toList()); + List interfaceList = interfaceSummaryList.stream() + .map(WxDataCubeInterfaceResult::getCallbackCount) + .collect(Collectors.toList()); result.add(interfaceList); // 接口日期保存 - List dateList = interfaceSummaryList.stream().map(WxDataCubeInterfaceResult::getRefDate) - .collect(Collectors.toList()); + List dateList = interfaceSummaryList.stream() + .map(WxDataCubeInterfaceResult::getRefDate) + .collect(Collectors.toList()); result.add(dateList); } catch (WxErrorException e) { diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java index 6d0bc7302..65d811373 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java @@ -42,7 +42,7 @@ public class WxAccountTagServiceImpl extends ServiceImpllambdaQuery().eq(WxAccountTag::getTag, accountTag.getTag())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccountTag::getTag, accountTag.getTag())); Assert.isNull(wxAccountTag, StrUtil.format("名称为[{}]的标签已经存在", accountTag.getTag())); // 调用微信公众号接口删除 @@ -52,7 +52,7 @@ public class WxAccountTagServiceImpl extends ServiceImpllambdaQuery().eq(WxAccount::getAppid, accountTag.getWxAccountAppid())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, accountTag.getWxAccountAppid())); accountTag.setWxAccountId(wxAccount.getId()); accountTag.setWxAccountAppid(wxAccount.getAppid()); accountTag.setWxAccountName(wxAccount.getName()); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java index f449a7f7a..b99683cec 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java @@ -64,7 +64,7 @@ public class WxMenuServiceImpl extends ServiceImpl imple baseMapper.delete(Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, appId)); WxAccount wxAccount = wxAccountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, appId)); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, appId)); WxMpMenu wxMpMenu = new WxMpMenu(); wxMpMenu.setMenu(wxMenus.toStringPretty()); wxMpMenu.setWxAccountId(wxAccount.getId()); @@ -82,7 +82,7 @@ public class WxMenuServiceImpl extends ServiceImpl imple @Override public R push(String appId) { List wxMpMenuList = baseMapper - .selectList(Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, appId)); + .selectList(Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, appId)); if (CollUtil.isEmpty(wxMpMenuList)) { return R.failed("微信菜单配置未保存，不能发布"); @@ -118,7 +118,7 @@ public class WxMenuServiceImpl extends ServiceImpl imple @Override public R getByAppId(String appId) { List wxMpMenuList = baseMapper - .selectList(Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, appId)); + .selectList(Wrappers.lambdaQuery().eq(WxMpMenu::getWxAccountAppid, appId)); if (CollUtil.isEmpty(wxMpMenuList)) { return R.ok(); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMsgServiceImpl.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMsgServiceImpl.java index 49bad3f4d..96d29f337 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMsgServiceImpl.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMsgServiceImpl.java @@ -52,7 +52,7 @@ public class WxMsgServiceImpl extends ServiceImpl implements // 查询用户详细 WxAccountFans wxUser = accountFansMapper.selectById(wxMsg.getWxUserId()); WxAccount wxAccount = accountMapper - .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, wxMsg.getAppId())); + .selectOne(Wrappers.lambdaQuery().eq(WxAccount::getAppid, wxMsg.getAppId())); // 维护消息-用户 wxMsg.setNickName(wxAccount.getName()); diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 9a8bbe567..81596e495 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-pay-platform diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java index 55ba4270b..e05e69560 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java @@ -28,9 +28,12 @@ public class SequenceConfig { @Bean public Sequence paySequence(DataSource dataSource, SequenceDbProperties properties) { return DbSeqBuilder.create() - .bizName(() -> String.format("pay_%s_%s", TenantContextHolder.getTenantId(), DateUtil.today())) - .dataSource(dataSource).step(properties.getStep()).retryTimes(properties.getRetryTimes()) - .tableName(properties.getTableName()).build(); + .bizName(() -> String.format("pay_%s_%s", TenantContextHolder.getTenantId(), DateUtil.today())) + .dataSource(dataSource) + .step(properties.getStep()) + .retryTimes(properties.getRetryTimes()) + .tableName(properties.getTableName()) + .build(); } /** @@ -41,9 +44,13 @@ public class SequenceConfig { */ @Bean public Sequence channelSequence(DataSource dataSource, SequenceDbProperties properties) { - return DbSeqBuilder.create().bizName(() -> String.format("channel_%s", TenantContextHolder.getTenantId())) - .dataSource(dataSource).step(properties.getStep()).retryTimes(properties.getRetryTimes()) - .tableName(properties.getTableName()).build(); + return DbSeqBuilder.create() + .bizName(() -> String.format("channel_%s", TenantContextHolder.getTenantId())) + .dataSource(dataSource) + .step(properties.getStep()) + .retryTimes(properties.getRetryTimes()) + .tableName(properties.getTableName()) + .build(); } } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java index d6c7192bc..84db59b41 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java @@ -107,16 +107,16 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand @Override public String parse(Map params) { String tradeStatus = EnumUtil.fromString(TradeStatusEnum.class, params.get(PayConstants.TRADE_STATUS)) - .getStatus(); + .getStatus(); String orderNo = params.get(PayConstants.OUT_TRADE_NO); PayGoodsOrder goodsOrder = goodsOrderService - .getOne(Wrappers.lambdaQuery().eq(PayGoodsOrder::getPayOrderId, orderNo)); + .getOne(Wrappers.lambdaQuery().eq(PayGoodsOrder::getPayOrderId, orderNo)); goodsOrder.setStatus(tradeStatus); goodsOrderService.updateById(goodsOrder); PayTradeOrder tradeOrder = tradeOrderService - .getOne(Wrappers.lambdaQuery().eq(PayTradeOrder::getOrderId, orderNo)); + .getOne(Wrappers.lambdaQuery().eq(PayTradeOrder::getOrderId, orderNo)); tradeOrder.setPaySuccTime(LocalDateTime.now()); tradeOrder.setChannelOrderNo(params.get("trade_no")); tradeOrder.setStatus(TradeStatusEnum.TRADE_SUCCESS.getStatus()); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayOrderRefundHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayOrderRefundHandler.java index 755988a33..8e648b0be 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayOrderRefundHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayOrderRefundHandler.java @@ -57,10 +57,14 @@ public class AlipayPayOrderRefundHandler implements PayOrderRefundHandler { } JSONObject params = JSONUtil.parseObj(channel.getParam()); - AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder().setAppId(channel.getAppId()) - .setPrivateKey(params.getStr("privateKey")).setCharset(CharsetUtil.UTF_8) - .setAliPayPublicKey(params.getStr("publicKey")).setServiceUrl(params.getStr("serviceUrl")) - .setSignType("RSA2").build(); + AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder() + .setAppId(channel.getAppId()) + .setPrivateKey(params.getStr("privateKey")) + .setCharset(CharsetUtil.UTF_8) + .setAliPayPublicKey(params.getStr("publicKey")) + .setServiceUrl(params.getStr("serviceUrl")) + .setSignType("RSA2") + .build(); AliPayApiConfigKit.setThreadLocalAliPayApiConfig(aliPayApiConfig); return channel; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java index 93870545e..579fcf4a4 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java @@ -81,10 +81,14 @@ public class AlipayWapPayOrderHandler extends AbstractPayOrderHandler { } JSONObject params = JSONUtil.parseObj(channel.getParam()); - AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder().setAppId(channel.getAppId()) - .setPrivateKey(params.getStr("privateKey")).setCharset(CharsetUtil.UTF_8) - .setAliPayPublicKey(params.getStr("publicKey")).setServiceUrl(params.getStr("serviceUrl")) - .setSignType("RSA2").build(); + AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder() + .setAppId(channel.getAppId()) + .setPrivateKey(params.getStr("privateKey")) + .setCharset(CharsetUtil.UTF_8) + .setAliPayPublicKey(params.getStr("publicKey")) + .setServiceUrl(params.getStr("serviceUrl")) + .setSignType("RSA2") + .build(); AliPayApiConfigKit.setThreadLocalAliPayApiConfig(aliPayApiConfig); return channel; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java index aadac2b41..6d84669f3 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java @@ -79,8 +79,11 @@ public class WeChatMpPayOrderHandler extends AbstractPayOrderHandler { } JSONObject params = JSONUtil.parseObj(channel.getParam()); - WxPayApiConfig wx = WxPayApiConfig.builder().appId(channel.getAppId()).mchId(channel.getChannelMchId()) - .partnerKey(params.getStr("partnerKey")).build(); + WxPayApiConfig wx = WxPayApiConfig.builder() + .appId(channel.getAppId()) + .mchId(channel.getChannelMchId()) + .partnerKey(params.getStr("partnerKey")) + .build(); WxPayApiConfigKit.setThreadLocalWxPayApiConfig(wx); return channel; @@ -117,14 +120,20 @@ public class WeChatMpPayOrderHandler extends AbstractPayOrderHandler { WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig(); // 预订单参数 - Map params = UnifiedOrderModel.builder().appid(wxPayApiConfig.getAppId()) - .mch_id(wxPayApiConfig.getMchId()).nonce_str(WxPayKit.generateStr()).body(goodsOrder.getGoodsName()) - .attach(TenantContextHolder.getTenantId().toString()) - .out_trade_no(String.valueOf(tradeOrder.getOrderId())).total_fee(goodsOrder.getAmount()) - .spbill_create_ip(ip) - .notify_url(ChannelPayApiConfigKit.get().getNotifyUrl() + "/admin/notify/wx/callbak") - .trade_type(TradeType.JSAPI.getTradeType()).openid(goodsOrder.getUserId()).build() - .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256); + Map params = UnifiedOrderModel.builder() + .appid(wxPayApiConfig.getAppId()) + .mch_id(wxPayApiConfig.getMchId()) + .nonce_str(WxPayKit.generateStr()) + .body(goodsOrder.getGoodsName()) + .attach(TenantContextHolder.getTenantId().toString()) + .out_trade_no(String.valueOf(tradeOrder.getOrderId())) + .total_fee(goodsOrder.getAmount()) + .spbill_create_ip(ip) + .notify_url(ChannelPayApiConfigKit.get().getNotifyUrl() + "/admin/notify/wx/callbak") + .trade_type(TradeType.JSAPI.getTradeType()) + .openid(goodsOrder.getUserId()) + .build() + .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256); String xmlResult = WxPayApi.pushOrder(false, params); log.info("微信统一下单返回 {}", xmlResult); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java index d29faf9c6..c93e1e227 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java @@ -102,16 +102,16 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand @Override public String parse(Map params) { String tradeStatus = EnumUtil.fromString(TradeStatusEnum.class, params.get(PayConstants.RESULT_CODE)) - .getStatus(); + .getStatus(); String orderNo = params.get(PayConstants.OUT_TRADE_NO); PayGoodsOrder goodsOrder = goodsOrderService - .getOne(Wrappers.lambdaQuery().eq(PayGoodsOrder::getPayOrderId, orderNo)); + .getOne(Wrappers.lambdaQuery().eq(PayGoodsOrder::getPayOrderId, orderNo)); goodsOrder.setStatus(tradeStatus); goodsOrderService.updateById(goodsOrder); PayTradeOrder tradeOrder = tradeOrderService - .getOne(Wrappers.lambdaQuery().eq(PayTradeOrder::getOrderId, orderNo)); + .getOne(Wrappers.lambdaQuery().eq(PayTradeOrder::getOrderId, orderNo)); tradeOrder.setPaySuccTime(LocalDateTime.now()); tradeOrder.setStatus(tradeStatus); tradeOrder.setChannelOrderNo(params.get("transaction_id")); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java index 2c5f7182a..f97a32d65 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java @@ -86,9 +86,9 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb String mergeCode = params.get(PayConstants.MERGE_CODE); String orderNo = params.get(PayConstants.MERGE_OUT_TRADE_NO); PayGoodsOrder goodsOrder = goodsOrderService - .getOne(Wrappers.lambdaQuery().eq(PayGoodsOrder::getPayOrderId, orderNo)); + .getOne(Wrappers.lambdaQuery().eq(PayGoodsOrder::getPayOrderId, orderNo)); PayTradeOrder tradeOrder = tradeOrderService - .getOne(Wrappers.lambdaQuery().eq(PayTradeOrder::getOrderId, orderNo)); + .getOne(Wrappers.lambdaQuery().eq(PayTradeOrder::getOrderId, orderNo)); if (OrderStatusEnum.SUCCESS.getStatus().equals(mergeCode)) { goodsOrder.setStatus(OrderStatusEnum.SUCCESS.getStatus()); diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index 5afa85387..167907bc0 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.2.0-snapshot + 5.2.0 pigx-report-platform diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 0e9c03293..9a49c3d62 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 pigx-visual diff --git a/pom.xml b/pom.xml index 70c00c0be..868c8e4ed 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.2.0-snapshot + 5.2.0 ${project.artifactId} pom