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

YeeAmosFireAutoSysCommon/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>3.7.2.3</version>
+		<version>3.7.2.3-d</version>
 	</parent>
 
 	<!-- <dependencies>

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/BasicEntity.java

 package com.yeejoin.amos.fas.dao.entity;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
@@ -17,14 +19,15 @@ import java.util.Date;
 
 @MappedSuperclass
 
-@EntityListeners(AuditingEntityListener.class) 
+@EntityListeners(AuditingEntityListener.class)
 public class BasicEntity /*extends Resource*/ implements Serializable{
 
 	private static final long serialVersionUID = -5464322936854328207L;
-	
+
 	/**
 	 * id
 	 */
+	@JsonSerialize(using = ToStringSerializer.class)
 	private long id;
 
 	@CreatedDate

YeeAmosFireAutoSysService/pom.xml

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>3.7.2.3</version>
+		<version>3.7.2.3-d</version>
 	</parent>
 
 	<dependencies>
 	    <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysCommon</artifactId>
-            <version>3.7.2.3</version>
+            <version>3.7.2.3-d</version>
         </dependency>
         
       <dependency>

YeeAmosFireAutoSysStart/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yeejoin.amos</groupId>
         <artifactId>YeeAmosFireAutoSysRoot</artifactId>
-        <version>3.7.2.3</version>
+        <version>3.7.2.3-d</version>
     </parent>
 
     <dependencies>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysService</artifactId>
-            <version>3.7.2.3</version>
+            <version>3.7.2.3-d</version>
         </dependency>
     </dependencies>
 

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -1032,7 +1032,7 @@
         </sql>
     </changeSet>
     
-     <changeSet author="my" id="2024091301-2">
+     <changeSet author="my" id="2024091311-2">
         <preConditions onFail="MARK_RAN">
             <not>
                 <columnExists tableName="c_plan_detail" columnName="sec_status" />
@@ -1041,7 +1041,7 @@
         <comment>c_plan_detail.sec_status</comment>
         <sql>
            ALTER TABLE `c_plan_detail` 
-		  ADD COLUMN `sec_status` int(0) NULL COMMENT '第二个预案运行状态' AFTER `status`;
+		  ADD COLUMN `sec_status` int(0) NULL DEFAULT 2 COMMENT '第二个预案运行状态' AFTER `status`;
         </sql>
     </changeSet>
     

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.yeejoin.amos</groupId>
 	<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-	<version>3.7.2.3</version>
+	<version>3.7.2.3-d</version>
 	<packaging>pom</packaging>
 	<name>YeeAmosFireAutoSysRoot</name>
 
@@ -233,12 +233,12 @@
 	  <repository>
 		  <id>Releases</id>
 		  <name>Releases</name>
-		  <url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
+		  <url>http://47.92.103.240:8081/nexus/content/repositories/releases/</url>
 	  </repository>
 	  <repository>
 		  <id>Snapshots</id>
 		  <name>Snapshots</name>
-		  <url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
+		  <url>http://47.92.103.240:8081/nexus/content/repositories/snapshots/</url>
 	  </repository>
 <!--	<repository>-->
 <!--		<id>maven-public-ty</id>-->
@@ -256,7 +256,7 @@
     <pluginRepository>
       <id>public</id>
       <name>Public Repositories</name>
-      <url>http://113.142.68.105:8081/nexus/content/groups/public/</url>
+      <url>http://47.92.103.240:8081/nexus/content/groups/public/</url>
     </pluginRepository>
 
   </pluginRepositories>