Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

5 years ago · 3667f114d4
16 changed files with 24 additions and 22 deletions
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-heart-server:
    container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.3
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.4
    ports:
      - "8111:8111"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-heart</artifactId>
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java
@ -157,7 +157,7 @@ public class WorkActController {
     * @description 已结束-活动详情
     * @Date 2020/7/26 21:01
     **/
-    @PostMapping("finisheddeatil")
+    @PostMapping("finisheddetail")
    public Result<FinishedActDetailResultDTO> finishedDeatil(@RequestBody ActIdFormDTO formDTO) {
        ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
        return new Result<FinishedActDetailResultDTO>().ok(workActService.finishedDeatil(formDTO));
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
@ -3,7 +3,7 @@ services:
  epmet-oss-server:
    container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.24
    ports:
      - "8083:8083"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.23</version>
+    <version>0.3.24</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-oss</artifactId>
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-point-server:
    container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.3
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.4
    ports:
      - "8112:8112"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
    <parent>
        <artifactId>epmet-point</artifactId>
        <groupId>com.epmet</groupId>
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-third-server:
    container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.65
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.67
    ports:
      - "8110:8110"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-third-server:
    container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.64
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.65
    ports:
      - "8110:8110"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.65</version>
+    <version>0.0.67</version>

    <parent>
        <groupId>com.epmet</groupId>
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@ -1,9 +1,7 @@
 package com.epmet.service.impl;

-import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.alibaba.nacos.client.config.utils.IOUtils;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@ -13,6 +11,7 @@ import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.ThirdRedisKeyConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
 import com.epmet.dao.*;
+import com.epmet.dto.PaCustomerUserAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@ -81,6 +80,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
    @Autowired
    private AuthResultRecordDao authResultRecordDao;
+    @Autowired
+    private PaCustomerUserAgencyDao paCustomerUserAgencyDao;

    @Value("${third.platform.appId}")
    private String componentAppId;
@ -652,10 +653,12 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
     * @author zxc
     */
    public String getLoginUserCustomerId(TokenDto tokenDto){
-        LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
+        /*LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
        BeanUtils.copyProperties(tokenDto,dto);
-        LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();
-        return data.getCustomerId();
+        LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();*/
+        PaCustomerUserAgencyDTO result = paCustomerUserAgencyDao.selectByUserId(tokenDto.getUserId());
+//        return data.getCustomerId();
+        return result.getCustomerId();
    }

    /**
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-voice-server:
    container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.60
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.62
    ports:
      - "8105:8105"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.60</version>
+    <version>0.3.62</version>
    <parent>
        <artifactId>gov-voice</artifactId>
        <groupId>com.epmet</groupId>
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.81
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.82
    ports:
      - "8087:8087"
    network_mode: host # 不会创建新的网络
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.81</version>
+    <version>0.3.82</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-user</artifactId>
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@ -33,7 +33,6 @@ import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.UserWechatResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@ -133,14 +132,14 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
            return new ArrayList<>();
        }
        List<UserBaseInfoResultDTO> userBaseInfoList=new ArrayList<>();
-        for(String userId:userIdList){
+       /* for(String userId:userIdList){
            UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userId);
            if(null!=userBaseInfoResultDTO){
                UserWechatResultDTO userWechatResultDTO=baseDao.selectUserWechatByUserId(userId);
                userBaseInfoResultDTO.setUserWechatResultDTO(userWechatResultDTO);
                userBaseInfoList.add(userBaseInfoResultDTO);
            }
-        }
+        }*/
        userIdList.forEach(id -> {
            UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
            //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里