多余的jar依赖

页面提示等
caishuxueqian · Oct 22, 2022 · 49e3b52 · 49e3b52
1 parent b7c6fc4
commit 49e3b52
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/dhorse-api/src/main/java/org/dhorse/api/enums/MessageCodeEnum.java b/dhorse-api/src/main/java/org/dhorse/api/enums/MessageCodeEnum.java
@@ -77,6 +77,7 @@ public enum MessageCodeEnum {
 
 	//镜像仓库
 	IMAGE_REPO_PROJECT_FAILURE("200000", "创建镜像仓库项目失败"),
+	IMAGE_REPO_IS_EMPTY("200000", "请先完成镜像仓库配置"),
 	SSL_CLIENT_FAILURE("200000", "创建https客户端失败"),
 	PACK("200000", "打包失败"),
 	JAVA_HOME_IS_EMPTY("200000", "Java安装目录不能为空"),

diff --git a/...se-application/src/main/java/org/dhorse/application/service/DeployApplicationService.java b/...se-application/src/main/java/org/dhorse/application/service/DeployApplicationService.java
@@ -466,6 +466,9 @@ public boolean buildImage(DeployContext context) {
 	}
 
 	private String fullNameOfImage(ImageRepo imageRepo, String nameOfImage) {
+		if(imageRepo == null) {
+			LogUtils.throwException(logger, MessageCodeEnum.IMAGE_REPO_IS_EMPTY);
+		}
 		String imgUrl = imageRepo.getUrl();
 		if(imgUrl.startsWith("http")) {
 			imgUrl = imgUrl.substring(imgUrl.indexOf("//") + 2);

diff --git a/dhorse-infrastructure/pom.xml b/dhorse-infrastructure/pom.xml
@@ -57,10 +57,6 @@
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.shared</groupId>
-			<artifactId>maven-invoker</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-embedder</artifactId>
@@ -75,6 +71,7 @@
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-compat</artifactId>
 		</dependency>
+		<!-- deploy时需要
 		<dependency>
 			<groupId>org.apache.maven.resolver</groupId>
 			<artifactId>maven-resolver-connector-basic</artifactId>
@@ -83,6 +80,7 @@
 			<groupId>org.apache.maven.resolver</groupId>
 			<artifactId>maven-resolver-transport-http</artifactId>
 		</dependency>
+		-->
 		<dependency>
 			<groupId>org.gitlab4j</groupId>
 			<artifactId>gitlab4j-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -120,6 +120,7 @@
 				<artifactId>maven-compat</artifactId>
 				<version>3.8.1</version>
 			</dependency>
+			<!-- deploy时需要
 			<dependency>
 				<groupId>org.apache.maven.resolver</groupId>
 				<artifactId>maven-resolver-connector-basic</artifactId>
@@ -130,11 +131,7 @@
 				<artifactId>maven-resolver-transport-http</artifactId>
 				<version>1.7.1</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.maven.shared</groupId>
-				<artifactId>maven-invoker</artifactId>
-				<version>3.1.0</version>
-			</dependency>
+			-->
 			<dependency>
 				<groupId>com.google.cloud.tools</groupId>
 				<artifactId>jib-core</artifactId>

diff --git a/static/images/home.jpg b/static/images/home.jpg
diff --git a/static/page/env/add.html b/static/page/env/add.html
@@ -3,14 +3,14 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label required">环境名称</label>
 			<div class="layui-input-block">
-				<input type="text" name="envName" lay-verify="required" lay-reqtext="环境名称不能为空" placeholder="请输入环境名称" autocomplete="off" class="layui-input">
+				<input type="text" name="envName" lay-verify="required" lay-reqtext="环境名称不能为空" placeholder="如：测试" autocomplete="off" class="layui-input">
 				<input type="hidden" name="projectId" id="projectId2"/>
 			</div>
 		</div>
 		<div class="layui-form-item">
 			<label class="layui-form-label required">环境标识</label>
 			<div class="layui-input-block">
-				<input type="text" name="tag" lay-verify="required" lay-reqtext="环境标识不能为空" placeholder="请输入环境标识" autocomplete="off" class="layui-input">
+				<input type="text" name="tag" lay-verify="required" lay-reqtext="环境标识不能为空" placeholder="如：qa" autocomplete="off" class="layui-input">
 			</div>
 		</div>
 		<div class="layui-form-item">

diff --git a/static/page/env/update.html b/static/page/env/update.html
@@ -3,14 +3,14 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label required">环境名称</label>
 			<div class="layui-input-block">
-				<input type="text" name="envName" lay-verify="required" lay-reqtext="环境名称不能为空" placeholder="请输入环境名称" autocomplete="off" class="layui-input">
+				<input type="text" name="envName" lay-verify="required" lay-reqtext="环境名称不能为空" placeholder="如：测试" autocomplete="off" class="layui-input">
 				<input type="hidden" name="projectId" id="projectId2"/>
 			</div>
 		</div>
 		<div class="layui-form-item">
 			<label class="layui-form-label required">环境标识</label>
 			<div class="layui-input-block">
-				<input type="text" name="tag" lay-verify="required" lay-reqtext="环境标识不能为空" placeholder="请输入环境标识" autocomplete="off" class="layui-input" disabled="disabled">
+				<input type="text" name="tag" lay-verify="required" lay-reqtext="环境标识不能为空" placeholder="如：qa" autocomplete="off" class="layui-input" disabled="disabled">
 			</div>
 		</div>
 		<div class="layui-form-item">

diff --git a/static/page/sys_user/update_password.html b/static/page/sys_user/update_password.html
@@ -40,7 +40,7 @@
 			var password = data.field.password;
 			var confirmPassword = data.field.confirmPassword;
 			if(confirmPassword != password){
-				layer.msg("登录密码不一致", {icon: 5, shift: 6});
+				layer.msg("新密码和确认新不一致", {icon: 5, shift: 6});
 				return false;
 			}
 			data.field.oldPassword = data.field.oldPassword.md5(32).toUpperCase();
@@ -63,7 +63,10 @@
 						time: 1000,
 						shade: 0.01,
 						shadeClose: false}, function(){
-						miniPage.hashHome();
+						//回到欢迎页面
+						//miniPage.hashHome();
+						//跳转到首页
+						window.location = '/page/login.html';
 					});
 					return false;
 				},