Merge remote-tracking branch 'origin/dev' into dev

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

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

@@ -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.11
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.14
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

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.13</version>
+    <version>0.3.16</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

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

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

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

@@ -61,6 +61,7 @@ spring:
     user: @spring.datasource.druid.username@
     password: @spring.datasource.druid.password@
     baseline-on-migrate: true
+    baseline-version: 0
 
 management:
   endpoints: