diff --git a/builds/Dockerfile b/builds/Dockerfile index 995db64f9..ac8f65536 100644 --- a/builds/Dockerfile +++ b/builds/Dockerfile @@ -5,7 +5,7 @@ LABEL Author="axzsd" \ Description="创盈支付服务端" ENV SPRING_PROFILES_ACTIVE="dev" -ENV JAVA_OPTIONS "-Xms800m -Xmx800m \ +ENV JAVA_OPTIONS "-Xms1024m -Xmx2048m \ -XX:+HeapDumpOnOutOfMemoryError \ -Dfile.encoding=UTF-8 \ -Djava.awt.headless=true \ diff --git a/builds/docker-compose-test.yml b/builds/docker-compose-test.yml index 290d59145..05dbefd92 100644 --- a/builds/docker-compose-test.yml +++ b/builds/docker-compose-test.yml @@ -20,7 +20,7 @@ services: deploy: resources: limits: - memory: 800MB + memory: 2048MB healthcheck: test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"] timeout: 30s diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index b037cd499..dd91bd4b5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1188,9 +1188,6 @@ public class StoreOrderServiceImpl extends ServiceImpl infoDOS = new ArrayList<>(); orderInfos.forEach(info -> { diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java index 94f19342b..ec599deed 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java @@ -150,6 +150,7 @@ public class PromoterController { @GetMapping("/all-export-excel") @Operation(summary = "导出所有推广员 Excel") @OperateLog(type = EXPORT) + @TenantIgnore public void allExportExcel(@Valid PromoterPageReqVO pageVO, HttpServletResponse response) throws IOException { PageResult pageResult = promoterService.getPromoterPage(pageVO); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index f384dfa28..bf78bd297 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -149,6 +149,7 @@ public class DeptServiceImpl implements DeptService { }); deptMapper.updateBatch(deptDOS, deptDOS.size()); deptDO.setName(reqVO.getName()); + deptDO.setParentOrganizationName(reqVO.getName()); deptMapper.updateById(deptDO); // 发送刷新消息 deptProducer.sendDeptRefreshMessage(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java index d09341491..8f96175b3 100755 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java @@ -170,12 +170,6 @@ public class TenantServiceImpl implements TenantService { if (ObjectUtil.notEqual(tenant.getPackageId(), updateReqVO.getPackageId())) { updateTenantRoleMenu(tenant.getId(), tenantPackage.getMenuIds()); } - // 同步修改部门信息 - DeptUpdateReqVO reqVO = new DeptUpdateReqVO(); - DeptDO dept = deptService.getDept(updateReqVO.getId()); - reqVO.setName(updateReqVO.getName()); - reqVO.setId(dept.getId()); - deptService.updateDept(reqVO); } /**