diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index bea7e8d8..3d8f8221 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -412,57 +412,19 @@ - create - index - ${tableName} - _ - parent - on - ${tableName} - ( - pk_parent - ) + create index ${tableName}_parent on ${tableName}(pk_parent) - create - index - ${tableName} - _ - place - on - ${tableName} - ( - pk_place_parent, - place_dept - ) + create index ${tableName}_place on ${tableName}(pk_place_parent,place_dept) - create - unique index - ${tableName} - _ - PK_M - on - ${tableName} - ( - PK_MEMBER, - period - ) + create unique index ${tableName}_PK_M on ${tableName}(PK_MEMBER,period) - create - unique index - ${tableName} - _ - PK_M - on - ${tableName} - ( - PK_MEMBER - ) + create unique index ${tableName}_PK_M on ${tableName}(PK_MEMBER) diff --git a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMenuController.java b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMenuController.java index 405e73ef..66cfd7ed 100644 --- a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMenuController.java +++ b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMenuController.java @@ -218,11 +218,6 @@ public class BdMenuController extends BaseController { menuViewVO.setAwardsIdList(menuAuthorityList.stream().filter((obj) -> EPermissionType.AWARDS.getValue() == obj.getAuthorityType()).map(BdMenuAuthority::getAuthorityValue).collect(Collectors.toList())); // 权限处理 menuViewVO.setAuthorityIdList(menuAuthorityList.stream().filter((obj) -> EPermissionType.AUTHORITY.getValue() == obj.getAuthorityType()).map(BdMenuAuthority::getAuthorityValue).collect(Collectors.toList())); - // 创客空间处理 - List makerSpaceList = menuAuthorityList.stream().filter((obj) -> EPermissionType.MAKER_SPACE.getValue() == obj.getAuthorityType()).map(BdMenuAuthority::getAuthorityValue).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(makerSpaceList)) { - menuViewVO.setMakerSpace(makerSpaceList.get(0)); - } LambdaQueryWrapper menuDetailWrapper = new LambdaQueryWrapper<>(); menuDetailWrapper.eq(BdMenuDetail::getPkMenu, pkId); diff --git a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdMenuServiceImpl.java b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdMenuServiceImpl.java index ae40eed3..702673d0 100644 --- a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdMenuServiceImpl.java +++ b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdMenuServiceImpl.java @@ -94,17 +94,17 @@ public class BdMenuServiceImpl extends ServiceImpl impleme bdMenuAuthority.setCreationTime(nowDate); menuAuthoritieList.add(bdMenuAuthority); } - // 创客空间处理 - if (null != param.getMakerSpace() && EYesNo.YES.getIntValue() == param.getMakerSpace()) { - BdMenuAuthority bdMenuAuthority = new BdMenuAuthority(); - bdMenuAuthority.setPkMenu(bdMenu.getPkId()); - bdMenuAuthority.setAuthorityType(EPermissionType.MAKER_SPACE.getValue()); - bdMenuAuthority.setAuthorityValue(param.getMakerSpace()); - bdMenuAuthority.setPkCountry(pkCountry); - bdMenuAuthority.setPkCreator(userId); - bdMenuAuthority.setCreationTime(nowDate); - menuAuthoritieList.add(bdMenuAuthority); - } +// // 创客空间处理 +// if (null != param.getMakerSpace() && EYesNo.YES.getIntValue() == param.getMakerSpace()) { +// BdMenuAuthority bdMenuAuthority = new BdMenuAuthority(); +// bdMenuAuthority.setPkMenu(bdMenu.getPkId()); +// bdMenuAuthority.setAuthorityType(EPermissionType.MAKER_SPACE.getValue()); +// bdMenuAuthority.setAuthorityValue(param.getMakerSpace()); +// bdMenuAuthority.setPkCountry(pkCountry); +// bdMenuAuthority.setPkCreator(userId); +// bdMenuAuthority.setCreationTime(nowDate); +// menuAuthoritieList.add(bdMenuAuthority); +// } bdMenuAuthorityMapper.insertBatch(menuAuthoritieList); List menuDetailList = new ArrayList<>(); @@ -184,17 +184,17 @@ public class BdMenuServiceImpl extends ServiceImpl impleme bdMenuAuthority.setCreationTime(nowDate); menuAuthoritieList.add(bdMenuAuthority); } - // 创客空间处理 - if (null != param.getMakerSpace() && EYesNo.YES.getIntValue() == param.getMakerSpace()) { - BdMenuAuthority bdMenuAuthority = new BdMenuAuthority(); - bdMenuAuthority.setPkMenu(bdMenu.getPkId()); - bdMenuAuthority.setAuthorityType(EPermissionType.MAKER_SPACE.getValue()); - bdMenuAuthority.setAuthorityValue(param.getMakerSpace()); - bdMenuAuthority.setPkCountry(pkCountry); - bdMenuAuthority.setPkCreator(userId); - bdMenuAuthority.setCreationTime(nowDate); - menuAuthoritieList.add(bdMenuAuthority); - } +// // 创客空间处理 +// if (null != param.getMakerSpace() && EYesNo.YES.getIntValue() == param.getMakerSpace()) { +// BdMenuAuthority bdMenuAuthority = new BdMenuAuthority(); +// bdMenuAuthority.setPkMenu(bdMenu.getPkId()); +// bdMenuAuthority.setAuthorityType(EPermissionType.MAKER_SPACE.getValue()); +// bdMenuAuthority.setAuthorityValue(param.getMakerSpace()); +// bdMenuAuthority.setPkCountry(pkCountry); +// bdMenuAuthority.setPkCreator(userId); +// bdMenuAuthority.setCreationTime(nowDate); +// menuAuthoritieList.add(bdMenuAuthority); +// } bdMenuAuthorityMapper.insertBatch(menuAuthoritieList); // 删除菜单明细配置 diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EMenuDetail.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EMenuDetail.java index 811bcb13..b522b065 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EMenuDetail.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EMenuDetail.java @@ -39,11 +39,11 @@ public enum EMenuDetail { UPGRADE(320, "升级专区", "", EnumsPrefixConstants.E_MENU + "320", "upgrade", 30), UPGRADE_AREA(321, "自营专区", "自营专区(升级)", EnumsPrefixConstants.E_MENU + "321", "upgradeArea", 30), UPGRADE_LXYK(322, "乐学易考", "乐学易考(升级)", EnumsPrefixConstants.E_MENU + "322", "ezLearnUp", 30), - UPGRADE_HAI_FUN(323, "海粉专区", "海粉专区(升级)", EnumsPrefixConstants.E_MENU + "323", "haiFunUpd", 30), +// UPGRADE_HAI_FUN(323, "海粉专区", "海粉专区(升级)", EnumsPrefixConstants.E_MENU + "323", "haiFunUpd", 30), REPURCHASE(330, "复购专区", "", EnumsPrefixConstants.E_MENU + "330", "repurchase", 30), SELF_SUPPORT(331, "自营专区", "自营专区(复购)", EnumsPrefixConstants.E_MENU + "331", "self", 30), - REPURCHASE_SEA(336, "三方供应", "三方供应", EnumsPrefixConstants.E_MENU + "336", "hiFansRepurchase", 30), +// REPURCHASE_SEA(336, "三方供应", "三方供应", EnumsPrefixConstants.E_MENU + "336", "hiFansRepurchase", 30), COOPERATE(332, "复购合作", "", EnumsPrefixConstants.E_MENU + "332", "cooperation", 30), // CLOUD(333, "工具流", "", EnumsPrefixConstants.E_MENU + "333", "gongju", 30), // LIVE(334, "直播专区", "", EnumsPrefixConstants.E_MENU + "334", "live", 30), @@ -202,7 +202,6 @@ public enum EMenuDetail { EMenuDetail.REPURCHASE.value, EMenuDetail.SELF_SUPPORT.value, - EMenuDetail.REPURCHASE_SEA.value, EMenuDetail.COOPERATE.value, EMenuDetail.MY_ORDER.value, diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java index 95e9e426..604f078a 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPermissionType.java @@ -31,11 +31,6 @@ public enum EPermissionType { */ AUTHORITY(3, "权限中心", 0, EnumsPrefixConstants.PERMISSION_TYPE + 3), - /** - * 创客空间 - */ - MAKER_SPACE(4, "创客空间", 0, EnumsPrefixConstants.PERMISSION_TYPE + 4), - ; /** diff --git a/hzs-third/src/main/java/com/hzs/third/pay/listener/AdaPayLoadListener.java b/hzs-third/src/main/java/com/hzs/third/pay/listener/AdaPayLoadListener.java index 2698569e..d40aa66c 100644 --- a/hzs-third/src/main/java/com/hzs/third/pay/listener/AdaPayLoadListener.java +++ b/hzs-third/src/main/java/com/hzs/third/pay/listener/AdaPayLoadListener.java @@ -20,7 +20,7 @@ import java.util.Map; * @Classname: AdaPayLoadListener * @PackageName: com.hzs.web.ada.listener */ -@Component +//@Component @Slf4j public class AdaPayLoadListener implements ServletContextListener { diff --git a/hzs-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java b/hzs-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java index 762b13d6..979994d4 100644 --- a/hzs-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java +++ b/hzs-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java @@ -18,7 +18,7 @@ import javax.servlet.ServletContextListener; * @Classname: HuiFuLoadListener * @PackageName: com.hzs.third.pay.listener */ -@Component +//@Component @Slf4j public class HuiFuLoadListener implements ServletContextListener { diff --git a/hzs-third/src/main/resources/application-test.properties b/hzs-third/src/main/resources/application-test.properties new file mode 100644 index 00000000..11aff9ba --- /dev/null +++ b/hzs-third/src/main/resources/application-test.properties @@ -0,0 +1,23 @@ + +### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册； +xxl.job.admin.addresses=http://172.26.201.166:8181/xxl-job-admin +## 本地 +##xxl.job.admin.addresses=http://192.168.31.139:8880/xxl-job-admin + +# log config +logging.config=classpath:logback.xml + +### 执行器通讯TOKEN [选填]：非空时启用； +xxl.job.accessToken=base_token +### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 +xxl.job.executor.appname=xxl-job-base +### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 +xxl.job.executor.address= +### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； +xxl.job.executor.ip= +### 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口； +xxl.job.executor.port=8985 +### 执行器运行日志文件存储磁盘路径 [选填] ：需要对该路径拥有读写权限；为空则使用默认路径； +xxl.job.executor.logpath=/home/logs/xxl-job/jobhandler +### 执行器日志文件保存天数 [选填] ： 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能； +xxl.job.executor.logretentiondays=30 diff --git a/hzs-third/src/main/resources/application.properties b/hzs-third/src/main/resources/application.properties index 11aff9ba..6a5dab01 100644 --- a/hzs-third/src/main/resources/application.properties +++ b/hzs-third/src/main/resources/application.properties @@ -1,6 +1,6 @@ ### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册； -xxl.job.admin.addresses=http://172.26.201.166:8181/xxl-job-admin +xxl.job.admin.addresses=http://101.200.72.71:8181/xxl-job-admin ## 本地 ##xxl.job.admin.addresses=http://192.168.31.139:8880/xxl-job-admin