luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

master
wangchao 5 years ago
parent
c9a68a2154 4990f8809c
commit
75e45be8fa
23 changed files with 28 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-auth/deploy/docker-compose-test.yml
  2. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  3. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  4. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActCustomizedConstant.java
  5. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
  6. 6
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
  7. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
  8. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  9. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  10. 1
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
  11. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
  12. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  13. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  14. 6
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
  15. 1
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
  16. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  17. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  18. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  19. 2
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  20. 3
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
  21. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
  22. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
  23. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml

2
epmet-auth/deploy/docker-compose-test.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.57
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.67
ports:
- "8081:8081"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
View File

@ -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.35
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.36
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/pom.xml
View File

@ -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.35</version>
<version>0.0.36</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActCustomizedConstant.java
View File

@ -11,7 +11,7 @@ public interface ActCustomizedConstant {
/**
* 标题：志愿者去哪儿
*/
String TITLE_NAME = "志愿者去哪儿";
String TITLE_NAME = "爱心互助";
/**
* 咨询热线

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
View File

@ -21,9 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.resi.ResiActUserCancelSignUpFormDTO;
import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
import com.epmet.service.VolunteerInfoService;
import org.springframework.beans.factory.annotation.Autowired;

6
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
View File

@ -29,11 +29,9 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.SendMqMsgUtils;
import com.epmet.constant.ActMessageConstant;
import com.epmet.dao.VolunteerInfoDao;
import com.epmet.dto.HeartUserInfoDTO;
import com.epmet.dto.VolunteerInfoDTO;
import com.epmet.dto.form.PasswordLoginUserInfoFormDTO;
import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
@ -131,8 +129,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
if (volunteerFlag > NumConstant.ZERO){
// 获取志愿者信息
VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId());
resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce());
resultDTO.setVolunteerSignature(dto.getVolunteerSignature());
resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce() == null ? "" : dto.getVolunteerIntroduce());
resultDTO.setVolunteerSignature(dto.getVolunteerSignature() == null ? "" : dto.getVolunteerSignature());
}
} else {
logger.error("获取用户基本信息失败");

4
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
View File

@ -31,10 +31,10 @@
<if test="customerId != null and customerId != ''">
CUSTOMER_ID = #{customerId},
</if>
<if test="volunteerIntroduce != null and volunteerIntroduce.trim() != ''">
<if test="volunteerIntroduce != null">
VOLUNTEER_INTRODUCE = #{volunteerIntroduce},
</if>
<if test="volunteerSignature != null and volunteerSignature.trim() != ''">
<if test="volunteerSignature != null">
VOLUNTEER_SIGNATURE = #{volunteerSignature},
</if>
<if test="userId != null and userId != ''">

2
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
View File

@ -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.27
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.28
ports:
- "8112:8112"
network_mode: host # 使用现有网络

2
epmet-module/epmet-point/epmet-point-server/pom.xml
View File

@ -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.27</version>
<version>0.0.28</version>
<parent>
<artifactId>epmet-point</artifactId>
<groupId>com.epmet</groupId>

1
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
View File

@ -216,6 +216,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
continue;
}
PointRuleEntity entity = ConvertUtils.sourceToTarget(defaultRule, PointRuleEntity.class);
entity.setId("");
entity.setCustomerId(customerDTO.getId());
insertList.add(entity);
}

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
View File

@ -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.81
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.100
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
View File

@ -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.62
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.64
ports:
- "8105:8105"
network_mode: host # 使用现有网络

2
epmet-module/gov-voice/gov-voice-server/pom.xml
View File

@ -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.62</version>
<version>0.3.64</version>
<parent>
<artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId>

6
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
View File

@ -187,7 +187,11 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
if (formDTO.isShowCover()){
DraftCoverEntity coverEntity = draftCoverDao.selectByDraftId(formDTO.getDraftId(), null);
if (coverEntity != null){
CoverImgDTO coverImgDTO = ConvertUtils.sourceToTarget(coverEntity, CoverImgDTO.class);
CoverImgDTO coverImgDTO = new CoverImgDTO();
coverImgDTO.setCoverId(coverEntity.getId());
coverImgDTO.setUrl(coverEntity.getImgUrl());
coverImgDTO.setAuditStatus(coverEntity.getAuditStatus());
coverImgDTO.setAuditReason(coverEntity.getAuditReason());
draftDetailResultDTO.setCoverInfo(coverImgDTO);
}else{
draftDetailResultDTO.setCoverInfo(new CoverImgDTO());

1
epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
View File

@ -6,6 +6,7 @@
<!-- 通过草稿Id获取草稿封面且创建时间是为最新的 -->
<select id="selectByDraftId" resultType="com.epmet.entity.DraftCoverEntity">
SELECT
cover.ID,
cover.CUSTOMER_ID,
cover.IMG_URL,
cover.AUDIT_STATUS,

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-crm-server:
container_name: oper-crm-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.60
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.62
ports:
- "8090:8090"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-crm-server:
container_name: oper-crm-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.55
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.59
ports:
- "8090:8090"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/pom.xml
View File

@ -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.60</version>
<version>0.3.62</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

2
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
View File

@ -329,7 +329,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
if (customerRootAgency != null) {
StaffRoleFormDTO staffsInRoleForm = new StaffRoleFormDTO();
staffsInRoleForm.setOrgId(customerRootAgency.getId());
staffsInRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);
staffsInRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
Result<List<GovStaffRoleResultDTO>> managersResult = epmetUserFeignClient.getStaffsInRole(staffsInRoleForm);
if (!managersResult.success()) {
throw new RenException("查询客户详情:查询客户管理员失败:".concat(managersResult.toString()));

3
epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
View File

@ -72,8 +72,7 @@
</select>
<select id="getAllList" resultMap="customerMap">
SELECT
id,customer_name,title,organizationNumber,organizationImg,validityTime,customerAdmin,
organizationLevel,logo
*
FROM customer
WHERE
del_flag = '0'

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.18
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.19
ports:
- "8091:8091"
network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.30
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.37
ports:
- "8094:8094"
network_mode: host # 使用现有网络

2
epmet-user/epmet-user-server/deploy/docker-compose-test.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.102
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.106
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络

Write Preview
Loading…
Cancel
Save