Merge branch 'v1.5.x'

kerven88 · Jun 16, 2024 · 63859f0 · 63859f0
2 parents c1cadd7 + 7c7f2ee
commit 63859f0
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -28,11 +28,11 @@ DHorse是一个轻量级、简单易用的云应用管理平台，具有多云
 
 | Java | kubernetes | Harbor |
 | :----: | :----: | :----: |
-| >=8 | [1.18, 1.28] | >=2.0.0 |
+| >=8 | [1.18, 1.30] | >=2.0.0 |
 
 2.下载安装文件
 
-[最新稳定版](https://gitee.com/i512team/dhorse/releases/download/v1.5.0/dhorse-v1.5.0-bin.tar.gz)
+[最新稳定版](https://gitee.com/i512team/dhorse/releases/download/v1.5.1/dhorse-v1.5.1-bin.tar.gz)
 
 3.解压
 

diff --git a/dhorse-application/src/main/java/org/dhorse/application/service/AppApplicationService.java b/dhorse-application/src/main/java/org/dhorse/application/service/AppApplicationService.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.apache.http.client.config.RequestConfig;
@@ -373,6 +374,9 @@ private void validateAddParam(AppCreationParam addParam) {
 		if(addParam.getAppName().length() > 32) {
 			throw new ApplicationException(MessageCodeEnum.INVALID_PARAM.getCode(), "应用名称不能大于32个字符");
 		}
+		if(!Pattern.compile("^[a-z]+[\\-a-z]*$").matcher(addParam.getAppName()).matches()) {
+			throw new ApplicationException(MessageCodeEnum.INVALID_PARAM.getCode(), "应用名称只能包含小写字母、中划线");
+		}
 		if(addParam.getBaseImage() != null && addParam.getBaseImage().length() > 128) {
 			throw new ApplicationException(MessageCodeEnum.INVALID_PARAM.getCode(), "基础镜像不能大于128个字符");
 		}

diff --git a/dhorse-rest/src/main/java/org/dhorse/rest/component/DynamicBeanRegistry.java b/dhorse-rest/src/main/java/org/dhorse/rest/component/DynamicBeanRegistry.java
@@ -0,0 +1,23 @@
+package org.dhorse.rest.component;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class DynamicBeanRegistry implements BeanDefinitionRegistryPostProcessor {
+
+    @Override
+    public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
+//        BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ClassUtils.class);
+//        BeanDefinition beanDefinition = builder.getRawBeanDefinition();
+//        registry.registerBeanDefinition("classUtils", beanDefinition);
+    }
+
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException {
+
+    }
+}
diff --git a/pom.xml b/pom.xml
@@ -144,7 +144,7 @@
 			<dependency>
 				<groupId>io.fabric8</groupId>
 				<artifactId>kubernetes-client</artifactId>
-				<version>6.9.2</version>
+				<version>6.13.0</version>
 			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>

diff --git a/static/page/app/add.html b/static/page/app/add.html
@@ -6,7 +6,7 @@
 					<div class="layui-form-item">
 						<label class="layui-form-label required">应用名称</label>
 						<div class="layui-input-block">
-							<input type="text" name="appName" lay-verify="required" lay-reqtext="应用名称不能为空" placeholder="请输入应用名称" autocomplete="off" class="layui-input">
+							<input type="text" name="appName" lay-verify="required" lay-reqtext="应用名称不能为空" placeholder="请输入应用名称，如：hello，或hello-springboot" autocomplete="off" class="layui-input">
 						</div>
 					</div>
 					<div class="layui-form-item">

diff --git a/static/page/deployment_version/list.html b/static/page/deployment_version/list.html
@@ -114,12 +114,12 @@
 				};
 			},
             cols: [[
-				{field: 'versionName', title: '版本号', width: '35%'},
+				{field: 'versionName', title: '版本号', width: '25%'},
                 {field: 'branchName', title: '分支(标签)'},
 				{field: 'envName', title: '环境名称', hide: envName},
-				{field: 'status', title: '状态', width: '7%', templet: '#statusBar'},
-				{field: 'creationTime', title: '构建开始时间', width: '13%'},
-				{field: 'updateTime', title: '构建结束时间',  width: '13%'},
+				{field: 'status', title: '状态', width: '14%', templet: '#statusBar'},
+				{field: 'creationTime', title: '构建开始时间', width: '16%'},
+				{field: 'updateTime', title: '构建结束时间',  width: '16%'},
 				{title: '操作', toolbar: '#currentTableBar'}
 			]],
             limits: [10, 20],