Browse Source

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

dev_shibei_match
sunyuchao 5 years ago
parent
commit
2c5fa9fd45
  1. 1
      epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
  2. 1
      epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
  3. 1
      epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
  4. 1
      epmet-auth/deploy/docker-compose-dev.yml
  5. 1
      epmet-auth/deploy/docker-compose-prod.yml
  6. 1
      epmet-auth/deploy/docker-compose-test.yml
  7. 1
      epmet-gateway/deploy/docker-compose-dev.yml
  8. 1
      epmet-gateway/deploy/docker-compose-prod.yml
  9. 1
      epmet-gateway/deploy/docker-compose-test.yml
  10. 1
      epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
  11. 1
      epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
  12. 1
      epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
  13. 1
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  14. 1
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  15. 1
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
  16. 1
      epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
  17. 1
      epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
  18. 1
      epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
  19. 3
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
  20. 1
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
  21. 1
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
  22. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  23. 27
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommonCustomerFormDTO.java
  24. 16
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
  25. 18
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
  26. 3
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  27. 1
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
  28. 1
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
  29. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  30. 16
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
  31. 11
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
  32. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
  33. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
  34. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
  35. 3
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  36. 1
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
  37. 1
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
  38. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  39. 3
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  40. 1
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  41. 1
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  42. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  43. 3
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  44. 1
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
  45. 1
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
  46. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  47. 3
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  48. 1
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
  49. 3
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
  50. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  51. 3
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  52. 1
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  53. 3
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
  54. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  55. 1
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
  56. 1
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
  57. 1
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  58. 1
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  59. 1
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
  60. 1
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  61. 1
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  62. 1
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
  63. 1
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  64. 1
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  65. 1
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
  66. 1
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
  67. 1
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  68. 1
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
  69. 1
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  70. 1
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  71. 1
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  72. 1
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  73. 1
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  74. 1
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
  75. 1
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
  76. 1
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
  77. 1
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
  78. 1
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
  79. 3
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  80. 1
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
  81. 1
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  82. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  83. 3
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
  84. 1
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
  85. 1
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
  86. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  87. 1
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  88. 1
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
  89. 1
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  90. 1
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  91. 1
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
  92. 1
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
  93. 1
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  94. 1
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
  95. 1
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
  96. 1
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
  97. 1
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
  98. 1
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
  99. 1
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  100. 1
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

1
epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-auth/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-auth/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-gateway/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-gateway/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-gateway/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

3
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
common-service-server:
container_name: common-service-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.7
image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.8
ports:
- "8103:8103"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

2
epmet-module/epmet-common-service/common-service-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.7</version>
<version>0.3.8</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-common-service</artifactId>

27
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommonCustomerFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description
* @ClassName CommonCustomerFormDTO
* @Auth wangc
* @Date 2020-08-13 10:03
*/
@Data
public class CommonCustomerFormDTO implements Serializable {
private static final long serialVersionUID = -8141450443229290083L;
public interface CustomerIdGroup extends CustomerClientShowGroup{}
/**
* 客户Id
* */
@NotBlank(message = "客户Id不能为空" , groups = CustomerIdGroup.class)
private String customerId;
}

16
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@ -1,8 +1,14 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.CommonCustomerFormDTO;
import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
@ -12,4 +18,14 @@ import org.springframework.cloud.openfeign.FeignClient;
*/
@FeignClient(name = ServiceConstant.EPMET_POINT_SERVER, fallback = EpmetHeartOpenFeignClientFallback.class)
public interface EpmetHeartOpenFeignClient {
/**
* @Description 根据客户Id查询志愿者用户Id集合
* @param customerFormDTO
* @return
* @author wangc
* @date 2020.08.13 10:22
**/
@PostMapping("/heart/resi/volunteer/volunteeruserids")
Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO);
}

18
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@ -1,8 +1,14 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.CommonCustomerFormDTO;
import com.epmet.feign.EpmetHeartOpenFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
*
@ -11,4 +17,16 @@ import org.springframework.stereotype.Component;
*/
@Component
public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignClient {
/**
* @Description 根据客户Id查询志愿者用户Id集合
* @param customerFormDTO
* @return
* @author wangc
* @date 2020.08.13 10:22
**/
@Override
public Result<List<String>> volunteerUserIds(CommonCustomerFormDTO customerFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "volunteerUserIds", customerFormDTO);
}
}

3
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.47
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.49
ports:
- "8111:8111"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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.47</version>
<version>0.0.49</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

16
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java

@ -21,6 +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.CommonCustomerFormDTO;
import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
@ -31,6 +32,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 居民端-志愿者相关api
@ -86,4 +89,17 @@ public class ResiVolunteerController {
volunteerInfoService.sendSmsCode(formDTO);
return new Result();
}
/**
* @Description 根据客户Id查询志愿者用户Id集合
* @param customerFormDTO
* @return
* @author wangc
* @date 2020.08.13 10:22
**/
@PostMapping("volunteeruserids")
public Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO){
ValidatorUtils.validateEntity(customerFormDTO,CommonCustomerFormDTO.CustomerIdGroup.class);
return new Result<List<String>>().ok(volunteerInfoService.getVolunteerIds(customerFormDTO));
}
}

11
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java

@ -23,6 +23,8 @@ import com.epmet.entity.VolunteerInfoEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 志愿者信息
*
@ -63,4 +65,13 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
* @Date 14:33 2020-07-23l
**/
VolunteerInfoDTO selectVolunteerInfoByUserId(@Param("userId") String userId);
/**
* @Description 查询一个客户下的所有志愿者
* @param customerId
* @return
* @author wangc
* @date 2020.08.13 10:06
**/
List<String> selectVolunteerIds(@Param("customerId")String customerId);
}

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java

@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.VolunteerInfoDTO;
import com.epmet.dto.form.CommonCustomerFormDTO;
import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
@ -68,4 +69,13 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
* @Date 09:19 2020-08-10
**/
void sendSmsCode(ResiSendSmsCodeFormDTO formDTO);
/**
* @Description 根据客户Id查询志愿者用户Id集合
* @param customerFormDTO
* @return
* @author wangc
* @date 2020.08.13 10:22
**/
List<String> getVolunteerIds(CommonCustomerFormDTO customerFormDTO);
}

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@ -36,6 +36,7 @@ import com.epmet.constant.SmsTemplateConstant;
import com.epmet.dao.VolunteerInfoDao;
import com.epmet.dto.HeartUserInfoDTO;
import com.epmet.dto.VolunteerInfoDTO;
import com.epmet.dto.form.CommonCustomerFormDTO;
import com.epmet.dto.form.SendVerificationCodeFormDTO;
import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
@ -178,6 +179,18 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile()));
}
/**
* @Description 根据客户Id查询志愿者用户Id集合
* @param customerFormDTO
* @return
* @author wangc
* @date 2020.08.13 10:22
**/
@Override
public List<String> getVolunteerIds(CommonCustomerFormDTO customerFormDTO) {
return baseDao.selectVolunteerIds(customerFormDTO.getCustomerId());
}
/**
* 保存短信验证码(删除现有短信验证码将新的短信验证码存入Redis)
* 过期时长为30分钟

9
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml

@ -64,4 +64,13 @@
WHERE DEL_FLAG = '0'
AND USER_ID = #{userId}
</select>
<!-- 查询一个客户下的所有志愿者用户Id -->
<select id="selectVolunteerIds" resultType="string">
SELECT
USER_ID
FROM volunteer_info
WHERE DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
</select>
</mapper>

3
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-job-server:
container_name: epmet-job-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.24
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.25
ports:
- "8084:8084"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

2
epmet-module/epmet-job/epmet-job-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.24</version>
<version>0.3.25</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId>

3
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
container_name: epmet-message-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.27
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.28
ports:
- "8085:8085"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

2
epmet-module/epmet-message/epmet-message-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.27</version>
<version>0.3.28</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>

3
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.24
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.25
ports:
- "8083:8083"
network_mode: host # 使用现有网络
@ -11,6 +11,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@ -11,6 +11,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@ -11,6 +11,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

2
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.24</version>
<version>0.3.25</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId>

3
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.39
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.40
ports:
- "8112:8112"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

3
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-point-server:
container_name: epmet-point-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.37
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.38
ports:
- "8112:8112"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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

3
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.123
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.124
ports:
- "8110:8110"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

3
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.119
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.123
ports:
- "8110:8110"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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.123</version>
<version>0.0.124</version>
<parent>
<groupId>com.epmet</groupId>

1
epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

3
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.65
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.66
ports:
- "8090:8090"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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.65</version>
<version>0.3.66</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

3
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-customize-server:
container_name: oper-customize-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.25
image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.26
ports:
- "8089:8089"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

2
epmet-module/oper-customize/oper-customize-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.25</version>
<version>0.3.26</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId>

1
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

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

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save