Browse Source

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

 Conflicts:
	epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
	epmet-module/gov-project/gov-project-server/pom.xml
master
yinzuomei 5 years ago
parent
commit
bc56eed5d6
  1. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  2. 12
      epmet-module/epmet-message/epmet-message-server/pom.xml
  3. 9
      epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
  4. 5
      epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.1__DDL.sql
  5. 2
      epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__DML.sql
  6. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  7. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  8. 4
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  9. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
  10. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  11. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-module/resi-home/resi-home-server/pom.xml
  13. 40
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
  14. 4
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
  15. 2
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
  16. 2
      epmet-module/resi-voice/resi-voice-server/pom.xml

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

12
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.12</version>
<version>0.3.13</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>
@ -90,6 +90,12 @@
<artifactId>feign-httpclient</artifactId>
<version>10.3.0</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<!--<version>5.1.1</version>-->
</dependency>
</dependencies>
<build>
@ -144,6 +150,8 @@
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>
<nacos.ip/>
<spring.flyway.enabled>false</spring.flyway.enabled>
</properties>
</profile>
<profile>
@ -174,6 +182,8 @@
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>
<nacos.ip/>
<spring.flyway.enabled>true</spring.flyway.enabled>
</properties>
</profile>
</profiles>

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

@ -53,6 +53,15 @@ spring:
# - data-id: common.yaml
# group: ${spring.cloud.nacos.config.group}
# refresh: true
# 数据迁移工具flyway
flyway:
enabled: @spring.flyway.enabled@
locations: classpath:db/migration
url: @spring.datasource.druid.url@
user: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
baseline-on-migrate: true
management:
endpoints:
web:

5
epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.1__DDL.sql

@ -0,0 +1,5 @@
CREATE TABLE `demo_t` (
`device_id` bigint(11) NOT NULL AUTO_INCREMENT,
`device_name` varchar(20) NOT NULL,
PRIMARY KEY (`device_id`)
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;

2
epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__DML.sql

@ -0,0 +1,2 @@
INSERT INTO demo_t (device_name) VALUES ('a');
INSERT INTO demo_t (device_name) VALUES ('b');

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.25
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.26
ports:
- "8102:8102"
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"
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.25</version>
<version>0.3.26</version>
<parent>
<artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId>

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

@ -1,8 +1,8 @@
version: "3.7"
services:
gov-project-server:
gov-voice-server:
container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.3
ports:
- "8105:8105"
network_mode: host # 使用现有网络

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

@ -1,6 +1,6 @@
version: "3.7"
services:
gov-project-server:
gov-voice-server:
container_name: gov-voice-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.1
ports:

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-home-server:
container_name: resi-home-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.13
image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.15
ports:
- "8104:8104"
network_mode: host # 使用现有网络

2
epmet-module/resi-home/resi-home-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.13</version>
<version>0.3.15</version>
<parent>
<artifactId>resi-home</artifactId>

40
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@ -0,0 +1,40 @@
package com.epmet.aspect;
import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 日志/异常处理切面实现调用父类方法完成日志记录和异常处理
*/
@Aspect
@Component
@Order(0)
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
@Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}
/**
* 获取Request对象
*
* @return
*/
private HttpServletRequest getRequest() {
RequestAttributes ra = RequestContextHolder.getRequestAttributes();
ServletRequestAttributes sra = (ServletRequestAttributes) ra;
return sra.getRequest();
}
}

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

@ -1,8 +1,8 @@
version: "3.7"
services:
gov-project-server:
resi-voice-server:
container_name: resi-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.3
ports:
- "8106:8106"
network_mode: host # 使用现有网络

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

@ -1,6 +1,6 @@
version: "3.7"
services:
gov-project-server:
resi-voice-server:
container_name: resi-voice-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-voice-server:0.3.1
ports:

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

Loading…
Cancel
Save