Browse Source

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

dev_shibei_match
yinzuomei 5 years ago
parent
commit
72cda61ade
  1. 5
      epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
  2. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  3. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  4. 4
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java
  5. 5
      epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
  6. 5
      epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
  7. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
  8. 4
      epmet-module/gov-access/gov-access-server/pom.xml
  9. 23
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
  10. 6
      epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
  11. 5
      epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
  12. 5
      epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
  13. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  14. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  15. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  17. 5
      epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
  18. 5
      epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
  19. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  20. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  21. 5
      epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
  22. 5
      epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
  23. 5
      epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
  24. 5
      epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
  25. 5
      epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
  26. 5
      epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
  27. 5
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
  28. 2
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
  29. 2
      epmet-module/resi-voice/resi-voice-server/pom.xml
  30. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
  31. 2
      epmet-openapi/epmet-openapi-scan/pom.xml
  32. 5
      epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

5
epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@ -113,3 +113,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

2
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.16
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.17
ports:
- "8085:8085"
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"
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>epmet-message</artifactId>

4
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java

@ -37,10 +37,6 @@ public class MailLogController {
@Autowired
private SysMailLogService sysMailLogService;
public MailLogController() {
int i = 1/0;
}
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({

5
epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@ -114,3 +114,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@ -124,3 +124,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.27
image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.29
ports:
- "8099:8099"
network_mode: host # 使用现有网络

4
epmet-module/gov-access/gov-access-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">
<version>0.3.27</version>
<version>0.3.29</version>
<parent>
<artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId>
@ -120,7 +120,7 @@
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>

23
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@ -161,23 +161,27 @@ public class AccessServiceImpl implements AccessService {
}
if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_GRID)) {
if (CollectionUtils.isEmpty(gridIds)) {
if (gridIds == null) {
String error = String.format("DataFilter:拼接SQL语句出错:需要in grid权限,但是代码中没有获取到gridIds");
logger.error(error);
throw new RenException(error);
}
if (gridIds.size() != 0) {
genInGrid(sb, gridIds, tableAlias);
}
}
if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_DEPARTMENT)) {
if (CollectionUtils.isEmpty(departmentIds)) {
if (departmentIds == null) {
String error = String.format("DataFilter:拼接SQL语句出错:需要in department权限,但是代码中没有获取到, departmentIds");
logger.error(error);
throw new RenException(error);
}
if (departmentIds.size() != 0) {
genDepartmentFilterSql(sb, departmentIds, tableAlias);
}
}
}
/**
* sql我发起的
@ -221,6 +225,21 @@ public class AccessServiceImpl implements AccessService {
hasConditions.set(true);
}
/**
* sql语句拼接FALSE
* @param sb
*/
private void genFalseCondition(StringBuilder sb) {
if (hasConditions.get()) {
// 之前没有条件
sb.append(" OR ");
}
sb.append(" FALSE ");
hasConditions.set(true);
}
/**
* 生成部门过滤sql
*

6
epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@ -112,3 +112,9 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@ -78,3 +78,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@ -102,3 +102,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

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

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

2
epmet-module/gov-mine/gov-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">
<version>0.3.26</version>
<version>0.3.27</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>

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.63
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.65
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.63</version>
<version>0.3.65</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

5
epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@ -126,3 +126,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@ -102,3 +102,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

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

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

2
epmet-module/gov-voice/gov-voice-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.3.14</version>
<version>0.3.31</version>
<parent>
<artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId>

5
epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@ -110,3 +110,8 @@ openapi:
method:
imgSyncScan: /imgSyncScan
textSyncScan: /textSyncScan
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@ -113,3 +113,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@ -119,3 +119,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@ -113,3 +113,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@ -113,3 +113,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml

@ -114,3 +114,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

5
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml

@ -113,3 +113,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1

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

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-voice-server:
container_name: resi-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.5
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.6
ports:
- "8106:8106"
network_mode: host # 使用现有网络

2
epmet-module/resi-voice/resi-voice-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.3.5</version>
<version>0.3.6</version>
<parent>
<artifactId>resi-voice</artifactId>
<groupId>com.epmet</groupId>

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

@ -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.5
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.6
ports:
- "8107:8107"
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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.5</version>
<version>0.3.6</version>
<artifactId>epmet-openapi-scan</artifactId>
<packaging>jar</packaging>

5
epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@ -127,3 +127,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1
Loading…
Cancel
Save