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

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

master
yinzuomei 5 years ago
parent
e15800c3aa 8a17c4079b
commit
0bb417331e
19 changed files with 42 additions and 17 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. 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-prod.yml
  3. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
  4. 14
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
  5. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  6. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  7. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  8. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  9. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  10. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  11. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
  12. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  13. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  14. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  15. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  16. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
  17. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
  18. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
  19. 2
      epmet-openapi/epmet-openapi-scan/pom.xml

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

@ -34,6 +34,7 @@ public class IpUtils {
String ip = null;
try {
ip = request.getHeader("x-forwarded-for");
logger.debug("x-forwarded-for:"+ip);
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
@ -46,9 +47,18 @@ public class IpUtils {
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
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)) {
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) {
logger.error("IpUtils ERROR ", e);
}
@ -58,6 +68,7 @@ public class IpUtils {
/**
* desc:获取本地Ip
*
* @return
*/
public static String getServerIp() {

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

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
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:
- "8108:8108"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
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:
- "8108:8108"
network_mode: host # 使用现有网络

14
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
View File

@ -49,6 +49,17 @@
<if test='null != customerId and "" != customerId'>
AND groupp.CUSTOMER_ID = #{customerId}
</if>
<choose>
<when test="null != targetDate">
AND topic.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
AND groupp.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
</when>
<otherwise>
AND topic.CREATED_TIME <![CDATA[<]]> CURDATE( )
AND groupp.CREATED_TIME <![CDATA[<]]> CURDATE( )
</otherwise>
</choose>
ORDER BY groupp.GRID_ID
</select>
@ -98,6 +109,9 @@
<if test='null != customerId and "" != customerId'>
AND groupp.CUSTOMER_ID = #{customerId}
</if>
AND topic.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{endDate}, INTERVAL - 1 DAY)
AND groupp.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{endDate}, INTERVAL - 1 DAY)
ORDER BY groupp.GRID_ID
</select>

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

@ -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.24
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.25
ports:
- "8085:8085"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
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:
- "8085:8085"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
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:
- "8085:8085"
network_mode: host # 使用现有网络

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

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

@ -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.72
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.74
ports:
- "8092:8092"
network_mode: host # 使用现有网络

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

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
View File

@ -88,7 +88,7 @@ public class DepartmentController {
* @Description 获取部门详情
*/
@PostMapping("departmentdetail")
@RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_LIST)
@RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_LIST)
public Result<DepartmentDetailResultDTO> departmentDetail(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentdetailFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return departmentService.departmentDetail(formDTO);

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
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:
- "8102:8102"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
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:
- "8102:8102"
network_mode: host # 使用现有网络

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

@ -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.16
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.17
ports:
- "8091:8091"
network_mode: host # 使用现有网络

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
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:
- "8107:8107"
network_mode: host # 不会创建新的网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
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:
- "8107:8107"
network_mode: host # 不会创建新的网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
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:
- "8107:8107"
network_mode: host # 不会创建新的网络

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

@ -4,7 +4,7 @@
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.14</version>
<version>0.3.16</version>
<artifactId>epmet-openapi-scan</artifactId>
<packaging>jar</packaging>

Write Preview
Loading…
Cancel
Save