diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
index af7dee2c58..06f9b57041 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
@@ -30,12 +30,12 @@ spring:
password: @spring.datasource.druid.password@
#监控页面
stat-view-servlet:
- enabled: true
+ enabled: false
#loginUsername: admin
#loginPassword: admin
allow:
web-stat-filter:
- enabled: true
+ enabled: false
filters: stat,log4j2
cloud:
nacos:
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
index 15aa1dcbfb..22a2f25dc9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
@@ -30,12 +30,12 @@ spring:
password: @spring.datasource.druid.password@
#监控页面
stat-view-servlet:
- enabled: true
+ enabled: false
#loginUsername: admin
#loginPassword: admin
allow:
web-stat-filter:
- enabled: true
+ enabled: false
filters: stat,wall,log4j2
# 数据迁移工具flyway
flyway:
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
index e9a8edafd3..b782d086dc 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
@@ -33,12 +33,12 @@ spring:
password: @spring.datasource.druid.password@
#监控页面
stat-view-servlet:
- enabled: true
+ enabled: false
#loginUsername: admin
#loginPassword: admin
allow:
web-stat-filter:
- enabled: true
+ enabled: false
filters: stat,wall,log4j2
# 数据迁移工具flyway
flyway:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 9aa5f5b29b..e28d2341fa 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -17,6 +17,11 @@
resi-partymember-client
2.0.0
+
+ com.epmet
+ epmet-user-client
+ 2.0.0
+
com.epmet
epmet-commons-tools
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 62b7dbf697..c636d91b43 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -415,7 +415,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
String currUserAgencyId, Map checkBoxOptionColumnIdxAndLabel,
String currUserAgencyPids, String currentUserId, String tableName) {
- this.printLog("persistIcResiBaseInfo");
+ //this.printLog("persistIcResiBaseInfo");
// 遍历每一行,将行内容转化为
for (Map row : dataRows) {
@@ -1000,7 +1000,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
List options = null;
log.info("optionsUrl:{}, currUserAgencyId:{}", pureUri, currUserAgencyId);
- this.printLog("listRemoteOptions");
+ //this.printLog("listRemoteOptions");
switch (pureUri) {
case "/epmetuser/icresidemanddict/demandoption":
options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
@@ -1041,7 +1041,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
}
nform.setGridId(gridId);
- this.printLog("listRemoteOptions#neighborhoodoption");
+ //this.printLog("listRemoteOptions#neighborhoodoption");
log.info("neighborhoodoption:{},{}", currUserAgencyId, gridId);
options = getResultDataOrThrowsException(govOrgOpenFeignClient.getNeighborHoodOptions(nform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index be62667c51..4bf946ea43 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -40,10 +40,8 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.HttpContextUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.IcPlatformConstant;
import com.epmet.constant.IcResiUserConstant;
@@ -73,7 +71,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Date;
@@ -988,7 +985,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl