From 58a301383811cd6324fd0aaf52bd6da3afc56f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 11 Dec 2019 15:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=A1=A8=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/src/main/resources/application.yml | 8 ++++++++ .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 3 +-- .../epdc-user-server/src/main/resources/application.yml | 8 ++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index bb363122e..a742d3e24 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -1,4 +1,6 @@ server: + tomcat: + max-swallow-size: 100MB port: @server.port@ servlet: context-path: /epdc-api @@ -6,6 +8,12 @@ server: spring: application: name: epdc-gateway-server + servlet: + multipart: + enabled: true + file-size-threshold: 0 + max-file-size: 100MB + max-request-size: 100MB redis: database: @spring.redis.index@ host: @spring.redis.host@ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index adba69d00..33a7984cd 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -519,7 +519,7 @@ public class UserServiceImpl extends BaseServiceImpl implem partyMembersEntity.setGridId(userGridRelation.getGridId()); partyMembersEntity.setGridName(userGridRelation.getGrid()); partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value()); - + partyMembersEntity.setRegistTime(oldEntity.getRegisterTime()); QueryWrapper partyWrapper = new QueryWrapper<>(); partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo) .eq(UserFieldConsant.REAL_NAME, userDto.getRealName()); @@ -545,7 +545,6 @@ public class UserServiceImpl extends BaseServiceImpl implem UpdateWrapper partyUpdate = new UpdateWrapper<>(); partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) .eq(UserFieldConsant.REAL_NAME, userDto.getRealName()); - this.partyMembersDao.update(partyMembersEntity, partyUpdate); userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value()); userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否，1-是) 认证失败：0 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml index 3d895fdcb..4bde8c8cb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml @@ -1,4 +1,6 @@ server: + tomcat: + max-swallow-size: 100MB port: @server.port@ servlet: context-path: /app-user @@ -6,6 +8,12 @@ server: spring: main: allow-bean-definition-overriding: true + servlet: + multipart: + enabled: true + file-size-threshold: 0 + max-file-size: 100MB + max-request-size: 100MB application: name: epdc-user-server # 环境 dev|test|prod