Browse Source

Merge remote-tracking branch 'origin/dev' into release

dev_shibei_match
yinzuomei 5 years ago
parent
commit
dfc94e863b
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
  4. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  5. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  6. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  7. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
  8. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  9. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  10. 29
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
  11. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  13. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  14. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  15. 10
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  16. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  17. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  18. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  19. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.68
ports:
- "8081:8081"
network_mode: host # 使用现有网络

2
epmet-auth/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.67</version>
<version>0.3.68</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@ -73,4 +73,6 @@ public interface StrConstant {
* 空字符串
*/
String EPMETY_STR="";
String NULL_STR="null";
}

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.39
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.42
ports:
- "8108:8108"
network_mode: host # 使用现有网络

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

2
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.39</version>
<version>0.0.40</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

4
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@ -342,7 +342,9 @@ public class WorkActUserServiceImpl implements WorkActUserService {
if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) {
resultDTO.setIdNum(userBaseInfo.getIdNum());
}
resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
String address = userBaseInfo.getStreet() + userBaseInfo.getDistrict() + userBaseInfo.getBuildingAddress();
address = address.replaceAll(StrConstant.NULL_STR, StrConstant.EPMETY_STR);
resultDTO.setAddress(address);
}
resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
/**

2
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.103
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.104
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
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.103</version>
<version>0.0.104</version>
<parent>
<groupId>com.epmet</groupId>

29
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@ -206,28 +206,29 @@ public class WarrantServiceImpl implements WarrantService {
public void dingDingRobot(String result,String event,String customerName,String clientType){
DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=5b48fcbc3fde24b8ba4696aa062b7f8146479a9d3467dbb1f9cf132ec36b955a");
OapiRobotSendRequest request = new OapiRobotSendRequest();
request.setMsgtype("text");
OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
request.setMsgtype("markdown");
OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
markdown.setTitle("代码审核结果");
switch (event){
case ModuleConstant.WEAPP_AUDIT_SUCCESS:
text.setContent("代码审核结果: 审核成功\n"+
"客户名称:" + customerName +"\n"+
"客户端:"+clientType+"\n");
markdown.setText("代码审核结果: 审核成功\n"+
"> 客户名称:" + customerName +"\n\n"+
"> 客户端:"+clientType+"\n");
break;
case ModuleConstant.WEAPP_AUDIT_FAIL:
text.setContent("代码审核结果: 审核不通过\n"+
"客户名称:" + customerName +"\n"+
"客户端:"+clientType+"\n"+
"不通过原因:"+result);
markdown.setText("代码审核结果: 审核不通过\n"+
"> 客户名称:" + customerName +"\n\n"+
"> 客户端:"+clientType+"\n\n"+
"> 不通过原因:"+result);
break;
case ModuleConstant.WEAPP_AUDIT_DELAY:
text.setContent("代码审核结果: 审核延时\n"+
"客户名称:" + customerName +"\n"+
"客户端:"+clientType+"\n"+
"延时原因:"+result);
markdown.setText("代码审核结果: 审核延时\n"+
"> 客户名称:" + customerName +"\n\n"+
"> 客户端:"+clientType+"\n\n"+
"> 延时原因:"+result);
break;
}
request.setText(text);
request.setMarkdown(markdown);
try {
OapiRobotSendResponse response = client.execute(request);
} catch (ApiException e) {

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.80
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.81
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-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.80</version>
<version>0.3.81</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

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

@ -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.63
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.64
ports:
- "8090:8090"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-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.63</version>
<version>0.3.64</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

10
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@ -384,12 +384,16 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
}
/**
* 获取客户的有效时长
* @return
* @Author sun
* @Description 获取客户的有效时长
*/
private Date getValidityTime() {
int life = 3600 * 1000 * 24 * 365 * 10;
return new Date(new Date().getTime() + Long.valueOf(life));
//获取当前日历日期
GregorianCalendar calendar = new GregorianCalendar();
//往后推3个月(不是三个自然月)
calendar.add(GregorianCalendar.MONTH,3);
return calendar.getTime();
}
/**

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.19
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.20
ports:
- "8091:8091"
network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-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.19</version>
<version>0.3.20</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.37
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.38
ports:
- "8094:8094"
network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-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.37</version>
<version>0.3.38</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

Loading…
Cancel
Save