merge v1.3.1

README.md

@@ -31,7 +31,7 @@ DHorse是一个简单易用、以应用为中心的云原生DevOps系统，具
 
 2.下载安装文件
 
-[最新稳定版](https://gitee.com/i512team/dhorse/releases/download/v1.3.0/dhorse-v1.3.0-bin.tar.gz)
+[最新稳定版](https://gitee.com/i512team/dhorse/releases/download/v1.3.1/dhorse-v1.3.1-bin.tar.gz)
 
 3.解压
 

dhorse-agent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.dhorse</groupId>
 		<artifactId>dhorse-parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.3.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dhorse-agent</artifactId>

dhorse-api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.dhorse</groupId>
 		<artifactId>dhorse-parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.3.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dhorse-api</artifactId>

dhorse-application/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.dhorse</groupId>
 		<artifactId>dhorse-parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.3.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dhorse-application</artifactId>

dhorse-infrastructure/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.dhorse</groupId>
 		<artifactId>dhorse-parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.3.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dhorse-infrastructure</artifactId>

dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java

@@ -252,7 +252,7 @@ public boolean createDeployment(DeploymentContext context) {
 			if (CollectionUtils.isEmpty(oldDeployment.getItems())) {
 				api.createNamespacedDeployment(namespace, deployment, null, null, null, null);
 			} else {
-				//配合升级，v1.4.0以后版本应该只使用replaceNamespacedDeployment
+				//配合升级，v1.3.1以后版本应该只使用replaceNamespacedDeployment
 				if(oldDeployment.getItems().get(0).getMetadata().getLabels().get(K8sUtils.APP_KEY) == null) {
 					api.replaceNamespacedDeployment(context.getDeploymentName(), namespace, deployment, null, null,
 							null, null);
@@ -315,7 +315,7 @@ private boolean createService(DeploymentContext context) throws ApiException {
 				logger.info("Start to update service");
 			}
 
-			//配合升级，v1.4.0以后版本应当删除
+			//配合升级，v1.3.1以后版本应当删除
 			V1Service service = serviceList.getItems().get(0);
 			if(service.getMetadata().getLabels().get(K8sUtils.APP_KEY) != null) {
 				//先删除，再创建

dhorse-infrastructure/src/main/resources/maven/app_node_pom.xml

@@ -7,7 +7,7 @@
 	<groupId>org.dhorse</groupId>
 	<artifactId>app-node</artifactId>
 	<packaging>pom</packaging>
-	<version>1.4.0</version>
+	<version>1.3.1</version>
 
 	<!-- 该文件的代码行数是固定的，在解析时会用到行号，文件内容谨慎改动 -->
 

dhorse-infrastructure/src/main/resources/maven/app_tmp_pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.dhorse</groupId>
 	<artifactId>app-tmp</artifactId>
-	<version>1.4.0</version>
+	<version>1.3.1</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>

dhorse-rest/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.dhorse</groupId>
 		<artifactId>dhorse-parent</artifactId>
-		<version>1.4.0</version>
+		<version>1.3.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dhorse-rest</artifactId>

dhorse-rest/src/main/resources/application-private.yml

@@ -1,4 +1,4 @@
-version: 1.4.0
+version: 1.3.1
 spring.jackson.default-property-inclusion: non_null
 spring.jackson.date-format: yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone: GMT+8

dhorse-rest/src/main/resources/banner.txt

@@ -4,5 +4,5 @@
   / _` | '_ \ / _ \| '__/ __|/ _ \
  | (_| | | | | (_) | |  \__ \  __/
   \__,_|_| |_|\___/|_|  |___/\___|
- :: DHorse ::             (v1.4.0)
+ :: DHorse ::             (v1.3.1)
 

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.dhorse</groupId>
 	<artifactId>dhorse-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.4.0</version>
+	<version>1.3.1</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,7 +16,7 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<project.version>1.4.0</project.version>
+		<project.version>1.3.1</project.version>
 		<spring.version>5.3.24</spring.version>
 		<springboot.version>2.7.6</springboot.version>
 	</properties>

static/index.html

@@ -107,7 +107,7 @@
 
     <div class="layui-body">
         <div class="layuimini-content-page"></div>
-		<div style="text-align: center; height:60px; line-height:60px; color: #9c9da0">v1.4.0</div>
+		<div style="text-align: center; height:60px; line-height:60px; color: #9c9da0">v1.3.1</div>
     </div>
 
 </div>

static/page/tag/list.html

@@ -145,6 +145,7 @@
 			contentType: 'application/json;charset=UTF-8',
 			data: JSON.stringify({'appId': appId}),
 			success: function(res){
+				var techType = res.data.techType;
 				//SpringBoot、Nodejs、Html
 				if(techType == 1 || techType == 4 || techType == 5){
 					doBuild($, appId, '0', branchName);