From a95060e60386a9fc5bf553d7be1b04c533f49efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 12 Sep 2024 15:43:37 +0800
Subject: [PATCH] 'commit'

---
 ds-build/src/main/java/Util/PublishUtil.java           |  5 ++++-
 ds-build/src/main/java/build_ds_base.java              | 10 ++++++++++
 ds-build/src/main/resources/publishImage.json          |  7 +++++++
 ds-build/target/classes/publishImage.json              |  7 +++++++
 ...众号配合基础数据需要做的修改工作.md |  4 ++++
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 ds-build/src/main/java/build_ds_base.java

diff --git a/ds-build/src/main/java/Util/PublishUtil.java b/ds-build/src/main/java/Util/PublishUtil.java
index 1d7ea361..d30b0e53 100644
--- a/ds-build/src/main/java/Util/PublishUtil.java
+++ b/ds-build/src/main/java/Util/PublishUtil.java
@@ -133,7 +133,10 @@ public class PublishUtil {
         String imageId = kv.getStr("message").replace("[", "").replace("]", "");
         System.out.println("镜像打包完成，镜像ID=" + imageId);
 
-        System.out.println("测试命令:docker run -p 80:80 -d " + projectName + ":" + newVersion);
+        //登录镜像仓库
+        cmd = "docker login --username=驿来特充电 --password=ylt5033. registry.cn-hangzhou.aliyuncs.com";
+        ssh.exec(cmd);
+        //  System.out.println("测试命令:docker run -p 80:80 -d " + projectName + ":" + newVersion);
 //        System.out.println("打标签...");
 //        cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/yltcharge/" + projectName + ":" + newVersion;
 //        ssh.exec(cmd);
diff --git a/ds-build/src/main/java/build_ds_base.java b/ds-build/src/main/java/build_ds_base.java
new file mode 100644
index 00000000..91f9139b
--- /dev/null
+++ b/ds-build/src/main/java/build_ds_base.java
@@ -0,0 +1,10 @@
+import Util.PublishUtil;
+
+public class build_ds_base {
+    public static void main(String[] args) throws Exception {
+        //项目名称
+        String projectName = "ds-base";
+        PublishUtil.publish(projectName);
+        System.out.println("开始生成镜像");
+    }
+}
diff --git a/ds-build/src/main/resources/publishImage.json b/ds-build/src/main/resources/publishImage.json
index ec6aad1b..38725e0f 100644
--- a/ds-build/src/main/resources/publishImage.json
+++ b/ds-build/src/main/resources/publishImage.json
@@ -10,6 +10,13 @@
       "localLibPath": "",
       "localStatic": "static",
       "localNginxConf": "nginx.conf"
+    },
+    {
+      "projectName": "ds-base",
+      "workingPath": "D:/dsWork/dsExam/ds-base/",
+      "localLibPath": "D:/dsWork/dsExam/ds-base/lib/",
+      "localStatic": "D:/dsWork/dsExam/ds-base/WebRoot/",
+      "localNginxConf": ""
     }
   ]
 }
diff --git a/ds-build/target/classes/publishImage.json b/ds-build/target/classes/publishImage.json
index ec6aad1b..38725e0f 100644
--- a/ds-build/target/classes/publishImage.json
+++ b/ds-build/target/classes/publishImage.json
@@ -10,6 +10,13 @@
       "localLibPath": "",
       "localStatic": "static",
       "localNginxConf": "nginx.conf"
+    },
+    {
+      "projectName": "ds-base",
+      "workingPath": "D:/dsWork/dsExam/ds-base/",
+      "localLibPath": "D:/dsWork/dsExam/ds-base/lib/",
+      "localStatic": "D:/dsWork/dsExam/ds-base/WebRoot/",
+      "localNginxConf": ""
     }
   ]
 }
diff --git a/操作文档/驿来特公众号配合基础数据需要做的修改工作.md b/操作文档/驿来特公众号配合基础数据需要做的修改工作.md
index 8a91ce5d..90b1aa30 100644
--- a/操作文档/驿来特公众号配合基础数据需要做的修改工作.md
+++ b/操作文档/驿来特公众号配合基础数据需要做的修改工作.md
@@ -28,6 +28,10 @@
 
 
 
+#### 模拟一个JWT出来测试一下
+
+
+
 #### 4、数据权限功能增加
 
 - 原来没有数据权限的概念，需要增加上，为以后的功能接口做准备。