From 66928f1aec517dadbdd7807f44d1c99a87a2a5da Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 28 Aug 2023 19:03:38 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E9=85=8D=E7=BD=AEUndertow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-events/epdc-events-server/pom.xml | 15 +++++++ .../item/service/impl/ItemServiceImpl.java | 40 +++++++++---------- .../src/main/resources/application.yml | 5 +++ 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 058b4951f..b8e9b2feb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -36,7 +36,22 @@ org.springframework.boot spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + org.springframework.boot + spring-boot-starter-undertow + + + org.springframework spring-context-support diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 2ae5bf11c..a8fc80821 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -5942,26 +5942,26 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } - public class DataReport { - public void myRun(ItemHandleProcessDTO dto, String type) { - new Thread(new Runnable() { - @SneakyThrows - @Override - public void run() { - try { - Thread.sleep(131000); - if ("1".equals(type)) { - pushToCityGridService.dispatchAudit(dto);//2.4 派遣审核 - } else if ("2".equals(type)) { - pushToCityGridService.appealAudit(dto.getId(), NumConstant.ONE_STR); // 诉求审核 - } - } catch (Exception e) { - e.printStackTrace(); - } - } - }).start(); - } - } +// public class DataReport { +// public void myRun(ItemHandleProcessDTO dto, String type) { +// new Thread(new Runnable() { +// @SneakyThrows +// @Override +// public void run() { +// try { +// Thread.sleep(131000); +// if ("1".equals(type)) { +// pushToCityGridService.dispatchAudit(dto);//2.4 派遣审核 +// } else if ("2".equals(type)) { +// pushToCityGridService.appealAudit(dto.getId(), NumConstant.ONE_STR); // 诉求审核 +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// }).start(); +// } +// } /** * 拉去项目在网格化平台的进展 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index fdc1c3a92..0ec9c0e19 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -20,6 +20,11 @@ # name: epdc-events-server server: port: @server.port@ + undertow: + io-threads: 8 + worker-threads: 64 + buffer-size: 1024 + direct-buffers: true servlet: context-path: /events From 458997c8fae442a9ad5e470c26d177f1c974e837 Mon Sep 17 00:00:00 2001 From: RXS Date: Mon, 28 Aug 2023 19:25:19 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 2 +- esua-epdc/epdc-cloud-commons-shibei | 2 +- esua-epdc/epdc-cloud-gateway-shibei | 2 +- esua-epdc/epdc-cloud-parent-shibei | 2 +- .../src/main/resources/application.yml | 20 +++++++++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 43081f0a8..43c412ae5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = http://120.46.222.128:10021/elink-star/epdc-cloud-gateway-shibei.git [submodule "esua-epdc/epdc-cloud-commons-shibei"] path = esua-epdc/epdc-cloud-commons-shibei - url = http://120.46.222.128:10021/elink-star/epdc-cloud-commons-shibei.git + url = http://120.46.222.128:10021/elink-star/epdc-cloud-commons-shibei.git \ No newline at end of file diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 6ce4c3d35..760b973de 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 6ce4c3d35f0cfb0d915e5c291f9e36155007a393 +Subproject commit 760b973de2bbc58874c4a2ce6ac82d4d436ceecb diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 89021d5b3..b9ed9d8d4 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 89021d5b3e35ad1d3be88a03e19de146df5a0d70 +Subproject commit b9ed9d8d4489f6cd87f2d1e5152bbf206c831dfb diff --git a/esua-epdc/epdc-cloud-parent-shibei b/esua-epdc/epdc-cloud-parent-shibei index 71857553c..418503b89 160000 --- a/esua-epdc/epdc-cloud-parent-shibei +++ b/esua-epdc/epdc-cloud-parent-shibei @@ -1 +1 @@ -Subproject commit 71857553cfca23b808dadbe177d8391509a50cbd +Subproject commit 418503b89e892d5f7279c2a52c6aad38da1544d9 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index fdc1c3a92..f7058f58d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -20,6 +20,26 @@ # name: epdc-events-server server: port: @server.port@ + + # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 + # 不要设置过大，如果过大，启动项目会报错：打开文件数过多 + + undertow: + io-threads: 8 + + # 阻塞任务线程池, 当执行类似servlet请求阻塞IO操作, undertow会从这个线程池中取得线程 + # 它的值设置取决于系统线程执行任务的阻塞系数，默认值是IO线程数*8 + worker-threads: 64 + + # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 + # 每块buffer的空间大小,越小的空间被利用越充分，不要设置太大，以免影响其他应用，合适即可 + buffer-size: 1024 + + # 每个区分配的buffer数量 , 所以pool的大小是buffer-size * buffers-per-region + buffers-per-region: 1024 + + # 是否分配的直接内存(NIO直接分配的堆外内存) + servlet: context-path: /events From 128b32e0c5637845e33977dd4a83e536602f05d7 Mon Sep 17 00:00:00 2001 From: RXS Date: Mon, 28 Aug 2023 19:41:13 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 6 ------ esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 38b23a3d0..86e1facf2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -85,12 +85,6 @@ 1.0.0 compile - - com.esua.epdc.shibei - epdc-optimize-department - 1.0.0 - compile - com.esua.epdc.shibei spring-boot-httpclient-starter diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 1891f3e83..74b52bbfe 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -95,12 +95,6 @@ feign-httpclient 10.3.0 - - com.esua.epdc.shibei - epdc-custom-client - 1.0.0 - compile - com.esua.epdc.shibei epdc-points-client From 8de6ce5d306d7353ecc6faaf80d235d88b5a35e5 Mon Sep 17 00:00:00 2001 From: RXS Date: Mon, 28 Aug 2023 19:44:18 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 760b973de..a5f907864 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 760b973de2bbc58874c4a2ce6ac82d4d436ceecb +Subproject commit a5f907864fd3757e2ecd255eb485dec6a2c4e1c3 From aa673155eba0a74829b299550e55e3fccc185c97 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 29 Aug 2023 09:40:59 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index a8fc80821..aaf5c2c1d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -297,8 +297,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem IPage page = getPage(params); List list = baseDao.selectListOfPendingHandleItems(params); - Map map = listItemHandleDept(); - list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); +// Map map = listItemHandleDept(); +// list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); return new PageData<>(list, page.getTotal()); } From 88392f7c3a74afa01308fe0b36ca4da5fa553fb9 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 29 Aug 2023 11:07:13 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/PushToCityGridServiceImpl.java | 12 ++++++------ .../src/main/resources/mapper/item/ItemDao.xml | 12 +----------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index ebe786eca..f26e3983d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -1440,12 +1440,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { return; } - LambdaQueryWrapper entityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue()); - List list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper); - - if (list.size()>0){ - return; - } +// LambdaQueryWrapper entityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue()); +// List list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper); +// +// if (list.size()>0){ +// return; +// } ReceiveResultDTO dto = new ReceiveResultDTO(); dto.setSqid(getSqid(item.getItemId())); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 36e0f7fb5..c7674add0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -537,13 +537,7 @@ WHEN 2 THEN '非常满意' ELSE '' END AS evaluationScore, - eve.APPROVE_NUM, - eve.OPPOSE_NUM, - eve.COMMENT_NUM, - eve.BROWSE_NUM, - (case when (process.STATE = 1001 and HOUR( timediff( now(), item.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind, - (case when (getworkminute(item.CREATED_TIME,now()) / 60 > 6) then '红灯' when (getworkminute(item.CREATED_TIME,now()) / 60 > 4 and getworkminute(item.CREATED_TIME,now()) / 60 <=6) then '黄灯' when (getworkminute(item.CREATED_TIME,now()) / 60 <= 4) then '绿灯' else '' end) as lamp, @@ -560,13 +554,9 @@ then concat((360 - getworkminute(item.CREATED_TIME,now())),'分钟') else concat((6 - ROUND((getworkminute(item.CREATED_TIME,now()) / 60),1)),'小时') end) end - ) as remainTime, + ) as remainTime - ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum, - (case when d.ID is not null then '1' else '0' end) as isDelay FROM epdc_item item - LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' - left join epdc_item_fusing_delay_record d on d.ITEM_ID = item.ID and d.DEL_FLAG = '0' left join ( select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state from epdc_item_handle_process b From b5cf4602b72492b73f2ef2c07b2f6f5c1575a8c7 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 29 Aug 2023 13:24:12 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- esua-epdc/epdc-cloud-parent-shibei | 2 +- .../epdc-events-server/src/main/resources/application.yml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index b9ed9d8d4..a783187c8 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit b9ed9d8d4489f6cd87f2d1e5152bbf206c831dfb +Subproject commit a783187c8dbbe5e048d157493b9b871c3ef35787 diff --git a/esua-epdc/epdc-cloud-parent-shibei b/esua-epdc/epdc-cloud-parent-shibei index 418503b89..13aed64d5 160000 --- a/esua-epdc/epdc-cloud-parent-shibei +++ b/esua-epdc/epdc-cloud-parent-shibei @@ -1 +1 @@ -Subproject commit 418503b89e892d5f7279c2a52c6aad38da1544d9 +Subproject commit 13aed64d573dd166c1cf120b8a5458a76e43082c diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index 0ec9c0e19..e46417705 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -25,6 +25,12 @@ server: worker-threads: 64 buffer-size: 1024 direct-buffers: true + accesslog: + enabled: true + dir: logs + prefix: access_log. + suffix: log + pattern: "%h %D %T %l %u %t \"%r\" %s %b" servlet: context-path: /events From cb9acb91c73287d197b3dcd530d012985e3fc0a1 Mon Sep 17 00:00:00 2001 From: RXS Date: Tue, 29 Aug 2023 14:15:44 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9undertow=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=BC=80=E5=90=AFaccesslog=20RECORD=5FREQUEST=5FSTART?= =?UTF-8?q?=5FTIME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- esua-epdc/epdc-cloud-parent-shibei | 2 +- .../epdc/controller/ApiItemController.java | 1 - .../esua/epdc/config/UndertowConfig.java | 24 +++++++++++++++++++ .../src/main/resources/application.yml | 2 +- 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index a783187c8..b9ed9d8d4 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit a783187c8dbbe5e048d157493b9b871c3ef35787 +Subproject commit b9ed9d8d4489f6cd87f2d1e5152bbf206c831dfb diff --git a/esua-epdc/epdc-cloud-parent-shibei b/esua-epdc/epdc-cloud-parent-shibei index 13aed64d5..418503b89 160000 --- a/esua-epdc/epdc-cloud-parent-shibei +++ b/esua-epdc/epdc-cloud-parent-shibei @@ -1 +1 @@ -Subproject commit 13aed64d573dd166c1cf120b8a5458a76e43082c +Subproject commit 418503b89e892d5f7279c2a52c6aad38da1544d9 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index 61f5f093f..32fa4f410 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -17,7 +17,6 @@ import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO; import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO; -import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO; import com.elink.esua.epdc.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java new file mode 100644 index 000000000..303886487 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.config; + +import io.undertow.Undertow; +import io.undertow.UndertowOptions; +import org.springframework.boot.web.embedded.undertow.UndertowBuilderCustomizer; +import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class UndertowConfig { + + @Bean + public UndertowServletWebServerFactory undertowServletWebServerFactory() { + UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(); + factory.addBuilderCustomizers(new UndertowBuilderCustomizer() { + @Override + public void customize(Undertow.Builder builder) { + builder.setServerOption(UndertowOptions.RECORD_REQUEST_START_TIME, true); + } + }); + return factory; + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index e46417705..b400bab88 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -30,7 +30,7 @@ server: dir: logs prefix: access_log. suffix: log - pattern: "%h %D %T %l %u %t \"%r\" %s %b" + pattern: "%h (%D ms) %T %l %u %t \"%r\" %s %b" servlet: context-path: /events From 4393ca2779c7a23185aae747b67a93558dbb4a80 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 29 Aug 2023 15:01:53 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/log/LogConsumer.java | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/log/LogConsumer.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/log/LogConsumer.java index eee0237c4..7622976eb 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/log/LogConsumer.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/log/LogConsumer.java @@ -64,39 +64,39 @@ public class LogConsumer implements CommandLineRunner { } private void receiveQueue() { - String key = RedisKeys.getSysLogKey(); - //每次插入100条 - int count = 100; - for (int i = 0; i < count; i++) { - log.info("1日志存储开始-------------"); - BaseLog baseLog = (BaseLog) redisUtils.rightPop(key); - if (baseLog == null) { - return; - } - //登录日志 - if (baseLog.getType() == LogTypeEnum.LOGIN.value()) { - SysLogLogin sysLogLogin = (SysLogLogin) baseLog; - SysLogLoginEntity entity = ConvertUtils.sourceToTarget(sysLogLogin, SysLogLoginEntity.class); - log.info("1登录日志开始-------------"+entity.toString()); - sysLogLoginService.save(entity); - } - - //操作日志 - if (baseLog.getType() == LogTypeEnum.OPERATION.value()) { - SysLogOperation sysLogOperation = (SysLogOperation) baseLog; - SysLogOperationEntity entity = ConvertUtils.sourceToTarget(sysLogOperation, SysLogOperationEntity.class); - log.info("操作日志开始-------------"+entity.toString()); - sysLogOperationService.save(entity); - } - -// //异常日志 -// if (baseLog.getType() == LogTypeEnum.ERROR.value()) { -// SysLogError logError = (SysLogError) baseLog; -// SysLogErrorEntity entity = ConvertUtils.sourceToTarget(logError, SysLogErrorEntity.class); -// log.info("异常日志开始-------------"+entity.toString()); -// sysLogErrorService.save(entity); +// String key = RedisKeys.getSysLogKey(); +// //每次插入100条 +// int count = 100; +// for (int i = 0; i < count; i++) { +// log.info("1日志存储开始-------------"); +// BaseLog baseLog = (BaseLog) redisUtils.rightPop(key); +// if (baseLog == null) { +// return; +// } +// //登录日志 +// if (baseLog.getType() == LogTypeEnum.LOGIN.value()) { +// SysLogLogin sysLogLogin = (SysLogLogin) baseLog; +// SysLogLoginEntity entity = ConvertUtils.sourceToTarget(sysLogLogin, SysLogLoginEntity.class); +// log.info("1登录日志开始-------------"+entity.toString()); +// sysLogLoginService.save(entity); +// } +// +// //操作日志 +// if (baseLog.getType() == LogTypeEnum.OPERATION.value()) { +// SysLogOperation sysLogOperation = (SysLogOperation) baseLog; +// SysLogOperationEntity entity = ConvertUtils.sourceToTarget(sysLogOperation, SysLogOperationEntity.class); +// log.info("操作日志开始-------------"+entity.toString()); +// sysLogOperationService.save(entity); // } - } +// +//// //异常日志 +//// if (baseLog.getType() == LogTypeEnum.ERROR.value()) { +//// SysLogError logError = (SysLogError) baseLog; +//// SysLogErrorEntity entity = ConvertUtils.sourceToTarget(logError, SysLogErrorEntity.class); +//// log.info("异常日志开始-------------"+entity.toString()); +//// sysLogErrorService.save(entity); +//// } +// } } } From 5277ca2338c412cfb6690a373ac8fcc2e5aa29e6 Mon Sep 17 00:00:00 2001 From: RXS Date: Tue, 29 Aug 2023 15:52:06 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=BC=82=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/EventsApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java index 9da702350..d176f9c5d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java @@ -12,6 +12,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.scheduling.annotation.EnableAsync; /** * 党群议事模块 @@ -22,6 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients +@EnableAsync public class EventsApplication { public static void main(String[] args) { From 83426618f24a25d9cd1e5ff5f97bbc1a5d8f36ce Mon Sep 17 00:00:00 2001 From: RXS Date: Tue, 29 Aug 2023 15:57:18 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=B1=A0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/config/AsyncConfig.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java new file mode 100644 index 000000000..32f72d7b1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.core.task.AsyncTaskExecutor; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +public class AsyncConfig { + + private static final int MAX_POOL_SIZE = 100; + + private static final int CORE_POOL_SIZE = 50; + + @Bean("asyncTaskExecutor") + public AsyncTaskExecutor asyncTaskExecutor() { + ThreadPoolTaskExecutor asyncTaskExecutor = new ThreadPoolTaskExecutor(); + asyncTaskExecutor.setMaxPoolSize(MAX_POOL_SIZE); + asyncTaskExecutor.setCorePoolSize(CORE_POOL_SIZE); + asyncTaskExecutor.setThreadNamePrefix("async-task-thread-pool-"); + asyncTaskExecutor.initialize(); + return asyncTaskExecutor; + } +} From a20ffa917579ebacb716776cd47056a52bab4380 Mon Sep 17 00:00:00 2001 From: RXS Date: Tue, 29 Aug 2023 16:02:47 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E5=BC=82=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index aaf5c2c1d..b76ea2601 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3426,6 +3426,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override @Transactional + @Async public Result submitMsFzItemResi(SubmitItemFormDTO formDto) { if("0".equals(formDto.getAppealSource())){ formDto.setNickName("网格员："+formDto.getNickName()); From 510ad597a426f20422f29ce7d9338f842dbe1820 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 29 Aug 2023 18:07:46 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- esua-epdc/epdc-cloud-parent-shibei | 2 +- .../elink/esua/epdc/EventsApplication.java | 1 - .../elink/esua/epdc/config/AsyncConfig.java | 22 ----------------- .../esua/epdc/config/UndertowConfig.java | 24 ------------------- .../item/service/impl/ItemServiceImpl.java | 1 - 6 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index b9ed9d8d4..a783187c8 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit b9ed9d8d4489f6cd87f2d1e5152bbf206c831dfb +Subproject commit a783187c8dbbe5e048d157493b9b871c3ef35787 diff --git a/esua-epdc/epdc-cloud-parent-shibei b/esua-epdc/epdc-cloud-parent-shibei index 418503b89..13aed64d5 160000 --- a/esua-epdc/epdc-cloud-parent-shibei +++ b/esua-epdc/epdc-cloud-parent-shibei @@ -1 +1 @@ -Subproject commit 418503b89e892d5f7279c2a52c6aad38da1544d9 +Subproject commit 13aed64d573dd166c1cf120b8a5458a76e43082c diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java index d176f9c5d..abe0c42ba 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java @@ -23,7 +23,6 @@ import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients -@EnableAsync public class EventsApplication { public static void main(String[] args) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java deleted file mode 100644 index 32f72d7b1..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.elink.esua.epdc.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.core.task.AsyncTaskExecutor; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -public class AsyncConfig { - - private static final int MAX_POOL_SIZE = 100; - - private static final int CORE_POOL_SIZE = 50; - - @Bean("asyncTaskExecutor") - public AsyncTaskExecutor asyncTaskExecutor() { - ThreadPoolTaskExecutor asyncTaskExecutor = new ThreadPoolTaskExecutor(); - asyncTaskExecutor.setMaxPoolSize(MAX_POOL_SIZE); - asyncTaskExecutor.setCorePoolSize(CORE_POOL_SIZE); - asyncTaskExecutor.setThreadNamePrefix("async-task-thread-pool-"); - asyncTaskExecutor.initialize(); - return asyncTaskExecutor; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java deleted file mode 100644 index 303886487..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.config; - -import io.undertow.Undertow; -import io.undertow.UndertowOptions; -import org.springframework.boot.web.embedded.undertow.UndertowBuilderCustomizer; -import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class UndertowConfig { - - @Bean - public UndertowServletWebServerFactory undertowServletWebServerFactory() { - UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(); - factory.addBuilderCustomizers(new UndertowBuilderCustomizer() { - @Override - public void customize(Undertow.Builder builder) { - builder.setServerOption(UndertowOptions.RECORD_REQUEST_START_TIME, true); - } - }); - return factory; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index b76ea2601..aaf5c2c1d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3426,7 +3426,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override @Transactional - @Async public Result submitMsFzItemResi(SubmitItemFormDTO formDto) { if("0".equals(formDto.getAppealSource())){ formDto.setNickName("网格员："+formDto.getNickName()); From 694f03db6e120729891129fe9c77952f0e68d521 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sat, 2 Sep 2023 10:57:56 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E8=AF=89=E6=B1=82=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index a5f907864..afd07f546 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit a5f907864fd3757e2ecd255eb485dec6a2c4e1c3 +Subproject commit afd07f546d032e9cc6889df29d315af6d32c0f4c diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index aaf5c2c1d..091a94d13 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3703,7 +3703,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem CityCaseDevelopDTO data = new CityCaseDevelopDTO(); data.setId(entity.getId()); data.setJjcd(CityPushEnum.JJCD_YB.getCode()); - data.setSqly(CityPushEnum.SQLY_WLFS.getCode()); + data.setSqly(CityPushEnum.SQLY_FXFS.getCode()); data.setSqzt(CityPushStateEnum.DCL.getCode()); data.setSbqs(CityPushEnum.SBQS_SB.getCode()); data.setDqclhj(CityPushLinkEnum.DJ.getCode()); From 6c8154e4f79d1c781d0a16a6a794e4e06b418ee1 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 4 Sep 2023 17:30:47 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B2=A1=E7=94=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/WorkUserServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 65767a1e2..df7cb72fd 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -268,7 +268,7 @@ public class WorkUserServiceImpl implements WorkUserService { EpdcUnauthorizedAmountFromDTO unauthorizedFromDto = new EpdcUnauthorizedAmountFromDTO(); unauthorizedFromDto.setGridId(formDto.getDeptId()); Result unauthorizedResult = this.getUnauthorizedAmount(unauthorizedFromDto); - Result masterMesCount = masterGroupService.messageStatistics(SecurityUser.getUser().getId()); +// Result masterMesCount = masterGroupService.messageStatistics(SecurityUser.getUser().getId()); // 组装返回数据 List resultDtoList = new ArrayList<>(); boolean isItem = false; @@ -294,9 +294,9 @@ public class WorkUserServiceImpl implements WorkUserService { case WorkAppMenuConstant.WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED: resultDto = this.packageMenuData(childDto.getNavCode(), unauthorizedResult.getData()); break; - case WorkAppMenuConstant.WORK_APP_MENU_CODE_MASTER_GROUP: - resultDto = this.packageMenuData(childDto.getNavCode(), masterMesCount.getData()); - break; +// case WorkAppMenuConstant.WORK_APP_MENU_CODE_MASTER_GROUP: +// resultDto = this.packageMenuData(childDto.getNavCode(), masterMesCount.getData()); +// break; default: break; } From 14757d4e3e1cf4adbb7fe8e858f0b3eaf73b2832 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 4 Sep 2023 17:37:03 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiAppUserController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index d9c7408bf..2b0b0060c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -354,8 +354,8 @@ public class ApiAppUserController { @PostMapping("userloginlog") public Result save(@RequestBody UserLoginLogDTO dto) { //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - appUserService.save(dto); +// ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); +// appUserService.save(dto); return new Result(); }