From 1b7f0a066c94945d850935ef5a922ab605e48df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 24 Sep 2024 08:12:13 +0800 Subject: [PATCH] 'commit' --- .../Controller/LoginPersonController.java | 16 ----- dsBuild/src/main/java/Util/ProjectBean.java | 35 ++++++++++ dsBuild/src/main/java/Util/PublishUtil.java | 67 +++++++++++++++--- dsBuild/src/main/java/publishAll.java | 68 +++++++++++++++++++ dsGw/target/classes/logo.txt | 17 +++-- 5 files changed, 170 insertions(+), 33 deletions(-) create mode 100644 dsBuild/src/main/java/Util/ProjectBean.java create mode 100644 dsBuild/src/main/java/publishAll.java diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index 0469d0c4..bc19f3e8 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java @@ -28,22 +28,6 @@ public class LoginPersonController extends Controller { renderJson(jo); } - @Before({POST.class}) - public void doLoginV2(String username, String password, String platform) { - try { - JSONObject jo = model.doLogin(username, password, platform, getResponse()); - RetBean ret = new RetBean(RetBean.SUCCESS, "成功!", jo); - renderJson(ret); - } catch (Exception err) { - JSONObject jo = new JSONObject(); - jo.put("success", false); - jo.put("msg", err.getMessage()); - RetBean ret = new RetBean(RetBean.ERROR, "失败!", jo); - renderJson(ret); - } - } - - @Before({GET.class}) public void logout() { CookieUtil.remove(getRequest(), getResponse(), "identity_id"); diff --git a/dsBuild/src/main/java/Util/ProjectBean.java b/dsBuild/src/main/java/Util/ProjectBean.java new file mode 100644 index 00000000..e4d892a8 --- /dev/null +++ b/dsBuild/src/main/java/Util/ProjectBean.java @@ -0,0 +1,35 @@ +package Util; + +public class ProjectBean { + private String devProjectName; + private String publishProjectName; + private int id; + + public String getDevProjectName() { + return devProjectName; + } + + public void setDevProjectName(String devProjectName) { + this.devProjectName = devProjectName; + } + + public String getPublishProjectName() { + return publishProjectName; + } + + public void setPublishProjectName(String publishProjectName) { + this.publishProjectName = publishProjectName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String toString() { + return "ProjectBean [devProjectName=" + devProjectName + ", publishProjectName=" + publishProjectName + ", id=" + id + "]"; + } +} diff --git a/dsBuild/src/main/java/Util/PublishUtil.java b/dsBuild/src/main/java/Util/PublishUtil.java index 70c8de27..d2fd0c2b 100644 --- a/dsBuild/src/main/java/Util/PublishUtil.java +++ b/dsBuild/src/main/java/Util/PublishUtil.java @@ -9,25 +9,28 @@ import com.jfinal.kit.PathKit; import com.jfinal.kit.StrKit; import java.io.File; +import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; public class PublishUtil { /** * 删除本机所有Docker镜像 * docker images --format "{{.Repository}}:{{.Tag}}" | xargs -r docker rmi -f * 登录远程仓库 - docker login --username=东师黄海 registry.cn-hangzhou.aliyuncs.com --password DsideaL4r5t6y7u - docker login --username=驿来特充电 registry.cn-hangzhou.aliyuncs.com --password=ylt5033. + * docker login --username=东师黄海 registry.cn-hangzhou.aliyuncs.com --password DsideaL4r5t6y7u + * docker login --username=驿来特充电 registry.cn-hangzhou.aliyuncs.com --password=ylt5033. *
* # 搜索 * docker search registry.cn-hangzhou.aliyuncs.com/yltcharge/zhu-que:20240903 * #拉取 * docker pull registry.cn-hangzhou.aliyuncs.com/yltcharge/zhu-que:20240903 - * - docker pull registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21 - docker tag 19a54d2204aa registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 - docker push registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 + *
+ * docker pull registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21
+ * docker tag 19a54d2204aa registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21
+ * docker push registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21
*/
public static void publish(String projectName) throws Exception {
System.out.println("正在生成" + projectName + "的镜像...");
@@ -143,11 +146,11 @@ public class PublishUtil {
ssh.exec(cmd);
//删除所有镜像
- cmd="docker rmi $(docker images -q)";
+ cmd = "docker rmi $(docker images -q)";
ssh.exec(cmd);
//获取最新打包后的镜像ID
- cmd = "docker images --format \"{{.Repository}} {{.Tag}} {{.ID}} {{.CreatedAt}}\" | grep "+projectName+" | head -n1 | awk '{print $3}'";
+ cmd = "docker images --format \"{{.Repository}} {{.Tag}} {{.ID}} {{.CreatedAt}}\" | grep " + projectName + " | head -n1 | awk '{print $3}'";
Kv kv = ssh.exec(cmd);
String imageId = kv.getStr("message").replace("[", "").replace("]", "");
System.out.println("镜像打包完成,镜像ID=" + imageId);
@@ -172,4 +175,52 @@ public class PublishUtil {
ssh.disconnect();
System.out.println("恭喜,镜像打包成功!");
}
+
+ /**
+ * 功能:获取项目列表
+ * @return
+ * @throws IOException
+ */
+ public static List