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

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.109
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.110
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.109</version>
+    <version>0.0.110</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -312,9 +312,9 @@ public class WarrantServiceImpl implements WarrantService {
         sb.append("<xml>");
         sb.append("<ToUserName><![CDATA["+toUserName+"]]></ToUserName>");
         sb.append("<FromUserName><![CDATA["+fromUserName+"]]></FromUserName>");
-        sb.append("<CreateTime>"+createTime+"</CreateTime>");
-        sb.append("<Content><![CDATA["+content+"]]></Content>");
+        sb.append("<CreateTime><![CDATA["+createTime+"]]></CreateTime>");
         sb.append("<MsgType><![CDATA[text]]></MsgType>");
+        sb.append("<Content><![CDATA["+content+"]]></Content>");
         sb.append("</xml>");
         String replyMsg = sb.toString();
         log.info(String.format(ThirdRunTimeInfoConstant.SEND_MESSAGE_XML,replyMsg));

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.112
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.113
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-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.112</version>
+    <version>0.3.113</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>