Browse Source

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

dev_shibei_match
jianjun 5 years ago
parent
commit
7cf76fde8b
  1. 11
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
  2. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
  3. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
  4. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
  5. 2
      epmet-module/data-report/data-report-server/pom.xml
  6. 2
      epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
  7. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  8. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  9. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  10. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  11. 9
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
  12. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  13. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  14. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  15. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  16. 3
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
  17. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
  18. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
  19. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
  20. 2
      epmet-openapi/epmet-openapi-scan/pom.xml

11
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java

@ -34,6 +34,7 @@ public class IpUtils {
String ip = null; String ip = null;
try { try {
ip = request.getHeader("x-forwarded-for"); ip = request.getHeader("x-forwarded-for");
logger.warn("x-forwarded-for:"+ip);
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP"); ip = request.getHeader("Proxy-Client-IP");
} }
@ -46,9 +47,18 @@ public class IpUtils {
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR"); ip = request.getHeader("HTTP_X_FORWARDED_FOR");
} }
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("X-Real-IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr(); ip = request.getRemoteAddr();
} }
//对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割
if (ip != null && ip.length() > 15) { //"***.***.***.***".length() = 15
if (ip.indexOf(",") > 0) {
ip = ip.substring(0, ip.indexOf(","));
}
}
} catch (Exception e) { } catch (Exception e) {
logger.error("IpUtils ERROR ", e); logger.error("IpUtils ERROR ", e);
} }
@ -58,6 +68,7 @@ public class IpUtils {
/** /**
* desc:获取本地Ip * desc:获取本地Ip
*
* @return * @return
*/ */
public static String getServerIp() { public static String getServerIp() {

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
data-report-server: data-report-server:
container_name: data-report-server-dev container_name: data-report-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.26 image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.27
ports: ports:
- "8109:8109" - "8109:8109"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

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

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

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

2
epmet-module/data-report/data-report-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.26</version> <version>0.3.27</version>
<artifactId>data-report-server</artifactId> <artifactId>data-report-server</artifactId>
<parent> <parent>

2
epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@ -113,7 +113,7 @@
) )
) a ) a
ORDER BY ORDER BY
a.projectTotal DESC a.projectTotal DESC, a.type ASC
</select> </select>
<select id="selectSubGrid" resultType="com.epmet.project.dto.result.ProjectSubGridResultDTO"> <select id="selectSubGrid" resultType="com.epmet.project.dto.result.ProjectSubGridResultDTO">

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-message-server: epmet-message-server:
container_name: epmet-message-server-dev container_name: epmet-message-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.24 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.25
ports: ports:
- "8085:8085" - "8085:8085"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

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

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

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

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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.24</version> <version>0.3.25</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId> <artifactId>epmet-message</artifactId>

9
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@ -70,16 +70,19 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
@Override @Override
public void send(SysSmsDTO sysSmsDTO) { public void send(SysSmsDTO sysSmsDTO) {
logger.info(String.format("发送短信接口(/message/sms/send)入参:%s", JSON.toJSONString(sysSmsDTO)));
LinkedHashMap<String, String> map; LinkedHashMap<String, String> map;
try { try {
map = JSON.parseObject(sysSmsDTO.getParams(), LinkedHashMap.class); map = JSON.parseObject(sysSmsDTO.getParams(), LinkedHashMap.class);
}catch (Exception e){ }catch (Exception e){
logger.error(String.format("发送短信异常,ErrorCode:%s,异常%s",ErrorCode.JSON_FORMAT_ERROR,e.getMessage()));
throw new RenException(ErrorCode.JSON_FORMAT_ERROR); throw new RenException(ErrorCode.JSON_FORMAT_ERROR);
} }
//短信服务 //短信服务
AbstractSmsService service = SmsFactory.build(); AbstractSmsService service = SmsFactory.build();
if(service == null){ if(service == null){
logger.error("发送短信异常,ErrorCode:%s,异常AbstractSmsService is null",ModuleErrorCode.SMS_CONFIG);
throw new RenException(ModuleErrorCode.SMS_CONFIG); throw new RenException(ModuleErrorCode.SMS_CONFIG);
} }
//发送短信 //发送短信
@ -162,13 +165,15 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
sysSmsDTO.setMobile(formDTO.getMobile()); sysSmsDTO.setMobile(formDTO.getMobile());
sysSmsDTO.setParams(paramJson); sysSmsDTO.setParams(paramJson);
sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode()); sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode());
Result result = epmetMessageOpenFeignClient.send(sysSmsDTO); this.send(sysSmsDTO);
data.setCode(codeStr);
/*Result result = epmetMessageOpenFeignClient.send(sysSmsDTO);
if (result != null && result.success()) { if (result != null && result.success()) {
data.setCode(codeStr); data.setCode(codeStr);
} else { } else {
logger.error(String.format("短信验证码发送失败,手机号:%s。code:%d,msg:%s", formDTO.getMobile(), result.getCode(), result.getMsg())); logger.error(String.format("短信验证码发送失败,手机号:%s。code:%d,msg:%s", formDTO.getMobile(), result.getCode(), result.getMsg()));
throw new RenException(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode()); throw new RenException(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode());
} }*/
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", formDTO.getMobile(), e.getMessage())); logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", formDTO.getMobile(), e.getMessage()));

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-dev container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.36 image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.37
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-prod container_name: gov-project-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.36 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.37
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

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

2
epmet-module/gov-project/gov-project-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.36</version> <version>0.3.37</version>
<parent> <parent>
<artifactId>gov-project</artifactId> <artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

3
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@ -88,7 +88,8 @@
FROM FROM
project_staff ps project_staff ps
INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0' INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
AND pp.OPERATION != 'created' AND (pp.OPERATION != 'created'
OR (pp.OPERATION = 'created' AND pp.STAFF_ID != #{userId}))
WHERE WHERE
ps.DEL_FLAG = '0' ps.DEL_FLAG = '0'
AND ps.STAFF_ID = #{userId} AND ps.STAFF_ID = #{userId}

2
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-openapi-scan: epmet-openapi-scan:
container_name: epmet-openapi-scan-dev container_name: epmet-openapi-scan-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.14 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.16
ports: ports:
- "8107:8107" - "8107:8107"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-openapi-scan: epmet-openapi-scan:
container_name: epmet-openapi-scan-prod container_name: epmet-openapi-scan-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.14 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.16
ports: ports:
- "8107:8107" - "8107:8107"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-openapi-scan: epmet-openapi-scan:
container_name: epmet-openapi-scan-test container_name: epmet-openapi-scan-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.14 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.16
ports: ports:
- "8107:8107" - "8107:8107"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-openapi/epmet-openapi-scan/pom.xml

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.14</version> <version>0.3.16</version>
<artifactId>epmet-openapi-scan</artifactId> <artifactId>epmet-openapi-scan</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

Loading…
Cancel
Save