From 04e8e222c5aa9126f0ec9a8231f929ef2ba7cf4d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Apr 2020 16:24:55 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index ae9b3431ac..cd7ff8a818 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.12 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.13 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 793c9e1c69..70cc7ddb82 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.12 + 0.3.13 com.epmet resi-group diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index 5a1971d1d8..fe6300a1c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.11 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.12 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index da9e3f88a0..60d739ec71 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.11 + 0.3.12 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 7cfd36ce0c..210153a6b0 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.22 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 43e9eba5ad..8310c582d5 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.21 + 0.3.22 com.epmet epmet-user From 73e8d880f59516b8118629a3c230d2098a928f46 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Apr 2020 16:47:33 +0800 Subject: [PATCH 2/9] =?UTF-8?q?gov-grid,resi-group=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-grid/gov-grid-server/docker-compose.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml index 168e285ce4..3a09d062f2 100644 --- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml +++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.11 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.12 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 617c7fe7ce..599ce24826 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.11 + 0.3.12 com.epmet gov-grid diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index cd7ff8a818..fe09af9ec7 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.14 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 70cc7ddb82..aa8c707806 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.13 + 0.3.14 com.epmet resi-group From 1389466c6342b6104a066b4e241791baee3c2fd7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Apr 2020 16:55:50 +0800 Subject: [PATCH 3/9] =?UTF-8?q?parymember=E3=80=81govorg=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index 5f1c7f3385..de2f941fad 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.29 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 2829929b7a..d9ab552699 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.29 com.epmet gov-org diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index fe6300a1c1..8646d64496 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.12 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.13 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 60d739ec71..299bc2d6fa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.12 + 0.3.13 com.epmet resi-partymember From 0049861d4e8f79cbb8f33a4b2640403022eda724 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Thu, 30 Apr 2020 17:06:15 +0800 Subject: [PATCH 4/9] =?UTF-8?q?gridFullPath=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartymemberInfoServiceImpl.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index a6b52cfd48..bbb512211c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; +import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -152,9 +153,16 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS); - Result gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO); + Result gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } for (CertifiedResultDTO datum : listResult.getData()) { - datum.setGridFullPath(gridName.getData().getGridName()); + datum.setGridFullPath(gridFullPath); } return listResult.getData(); } @@ -178,11 +186,16 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl registerTime = epmetUserFeignClient.createdTimeByUserId(time); certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime()); - CertifiedFormDTO certifiedFormDTO = new CertifiedFormDTO(); - certifiedFormDTO.setGridId(certifiedDetail.getGridId()); - //查询网格名称 - Result gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO); - certifiedDetail.setGridFullPath(gridName.getData().getGridName()); + //查询gridFullName + Result gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedDetail.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } + certifiedDetail.setGridFullPath(gridFullPath); return certifiedDetail; } From 90f2bf02d4129f8e7f89163b8d3b53b1d17be921 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Apr 2020 17:09:12 +0800 Subject: [PATCH 5/9] =?UTF-8?q?parymember=E6=97=B6=E9=97=B4=E6=88=B3?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=A7=92=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartymemberInfoServiceImpl.java | 4 ++-- .../resources/mapper/partymember/PartymemberBaseInfoDao.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index bbb512211c..37861ebcc4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -150,7 +150,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl(); } for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) { - certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L); + certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()); } Result> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS); Result gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId()); @@ -180,7 +180,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl Date: Thu, 30 Apr 2020 17:10:22 +0800 Subject: [PATCH 6/9] =?UTF-8?q?partymember|group=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index fe09af9ec7..39ecb5dfb2 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.14 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.15 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index aa8c707806..66f3cb1002 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.14 + 0.3.15 com.epmet resi-group diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index 8646d64496..d560c6f0d4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.14 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 299bc2d6fa..691f256b3c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.13 + 0.3.14 com.epmet resi-partymember From 952ea2fcb3b877dc672897def27e370433fc9fb0 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 30 Apr 2020 17:29:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3RedisTemplate.opsForValue?= =?UTF-8?q?()=E5=AD=98=E5=8F=96List=E6=97=B6=E5=80=99=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=89=8B=E5=8A=A8=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8stringRedisTemplate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisUtils.java | 39 +++++++++++++++++++ .../com/epmet/redis/RoleOpeScopeRedis.java | 8 ++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index 35e82c3de2..b68418626a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import java.util.Collection; @@ -30,6 +31,9 @@ public class RedisUtils { @Autowired private RedisTemplate redisTemplate; + @Autowired + private StringRedisTemplate stringRedisTemplate; + /** * 默认过期时长为24小时，单位：秒 */ @@ -171,4 +175,39 @@ public class RedisUtils { return redisTemplate.opsForList().rightPop(key); } + /** + * 获取String + * @param key + * @param expire + * @return + */ + public String getString(String key, long expire) { + String value = stringRedisTemplate.opsForValue().get(key); + if (expire != NOT_EXPIRE) { + expire(key, expire); + } + return value; + } + + public String getString(String key) { + return getString(key, DEFAULT_EXPIRE); + } + + /** + * 存储String + * @param key + * @param value + * @param expire + */ + public void setString(String key, String value, long expire) { + stringRedisTemplate.opsForValue().set(key, value); + if (expire != NOT_EXPIRE) { + expire(key, expire); + } + } + + public void setString(String key, String value) { + setString(key, value, DEFAULT_EXPIRE); + } + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java index f539f8e369..d8e324fb27 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java @@ -1,5 +1,7 @@ package com.epmet.redis; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.dto.result.RoleOpeScopeResultDTO; @@ -36,7 +38,7 @@ public class RoleOpeScopeRedis { */ public void setRoleAllOpeScopes(String roleId, List scopes) { String roleAllOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId); - redisUtils.set(roleAllOpeScopesKey, scopes); + redisUtils.setString(roleAllOpeScopesKey, JSON.toJSONString(scopes)); } /** @@ -57,8 +59,8 @@ public class RoleOpeScopeRedis { */ public List getRoleAllOpeScopes(String roleId) { String roleOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId); - Object o = redisUtils.get(roleOpeScopesKey); - return (List)o; + String stringValue = redisUtils.getString(roleOpeScopesKey); + return JSON.parseObject(stringValue, new TypeReference>(){}); } } From 257d837a0cdd18d17fc17d55ce9e1528bf66d9bd Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 30 Apr 2020 17:31:25 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-access/gov-access-server/docker-compose.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/docker-compose.yml b/epmet-module/gov-access/gov-access-server/docker-compose.yml index 4cfcd4676f..948d404bb1 100644 --- a/epmet-module/gov-access/gov-access-server/docker-compose.yml +++ b/epmet-module/gov-access/gov-access-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.8 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 69e8af3c03..2e3d316e31 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.7 + 0.3.8 gov-access com.epmet From ef96e088cfb72c4cd006719fe4b8fea0b234d122 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Thu, 30 Apr 2020 17:58:31 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=A7=92=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index d20564dadb..76529d39eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -122,7 +122,7 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO) { CreatedTimeByUserIdResultDTO registerTime = baseDao.createdTimeByUserId(formDTO); - registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L); +// registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L); return registerTime; } }