使用 mgr 关键字

agent/bin/devopsagent.json

@@ -1,4 +1,4 @@
 {
-  "managerAddress": "localhost",
-  "managerPort": 4020
+  "mgrAddress": "localhost",
+  "mgrPort": 4020
 }

agent/src/main/java/cn/reghao/devops/agent/AgentApp.java

@@ -69,7 +69,7 @@ public class AgentApp {
 		AppDeploy appDeploy = new AppDeployImpl(dockerApp);
 		AppStat appStat = new AppStatImpl(dockerApp);
 
-		if (tryConnect(dagentConfig.getManagerAddress(), dagentConfig.getManagerPort())) {
+		if (tryConnect(dagentConfig.getMgrAddress(), dagentConfig.getMgrPort())) {
 			messageSender = new WsClient(dagentConfig, scheduler, appDeploy, appStat);
 			return messageSender;
 		}

agent/src/main/java/cn/reghao/devops/agent/config/DagentConfig.java

@@ -10,6 +10,6 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public class DagentConfig {
-    private String managerAddress;
-    private int managerPort;
+    private String mgrAddress;
+    private int mgrPort;
 }

agent/src/main/java/cn/reghao/devops/agent/ws/WsClient.java

@@ -29,8 +29,8 @@ public class WsClient implements MessageSender {
     private int retryCount;
 
     public WsClient(DagentConfig dagentConfig, ScheduledExecutorService scheduler, AppDeploy appDeploy, AppStat appStat) {
-        String host = dagentConfig.getManagerAddress();
-        int port = dagentConfig.getManagerPort();
+        String host = dagentConfig.getMgrAddress();
+        int port = dagentConfig.getMgrPort();
         this.url = String.format("ws://%s:%s/ws/agent?token=%s", host, port, Machine.ID);
 
         EventCenter eventCenter = new EventCenter(this, appDeploy, appStat);

agent/src/main/java/cn/reghao/devops/agent/ws/event/EventCenter.java

@@ -38,7 +38,7 @@ public class EventCenter {
         try {
             long sendTime = eventMessage.getSendTime();
             if (sendTime < startTime) {
-                log.info("忽略 agent 启动前 manager 发送的事件...");
+                log.info("忽略 agent 启动前 mgr 发送的事件...");
                 return;
             }
 

common/src/main/java/cn/reghao/devops/common/msg/constant/AppId.java

@@ -5,5 +5,5 @@ package cn.reghao.devops.common.msg.constant;
  * @date 2021-08-27 17:32:08
  */
 public enum AppId {
-    manager, build, agent
+    mgr, build, agent
 }

mgr/src/main/java/cn/reghao/devops/mgr/mgr/build/model/AppDto.java

@@ -16,7 +16,7 @@ public class AppDto implements Serializable {
 
     private String appId;
     private String env;
-    // 仅在 cn.reghao.devops.manager.build.tool.BuilderUtil 中使用
+    // 仅在 cn.reghao.devops.mgr.mgr.build.tool.BuilderUtil 中使用
     @Deprecated
     private String appType;
     private String appRepo;

mgr/src/main/java/cn/reghao/devops/mgr/mgr/build/tool/compiler/MavenCompiler.java

@@ -85,7 +85,7 @@ public class MavenCompiler implements CodeCompiler {
     }
 
     /**
-     * mvn clean package -Dmaven.test.skip=true -am -Pdev -pl manager
+     * mvn clean package -Dmaven.test.skip=true -am -Pdev -pl mgr
      *
      * @param
      * @return

zzz/build_jar.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 
+###############################################################################
+# 构建 devops-mgr 和 devops-agent 应用的 jar 包
+###############################################################################
+
+set -e
+
 cd ..
 #mvn clean package -Dmaven.test.skip=true -Ptest
-mvn clean package -Dmaven.test.skip=true -am -pl web -Ptest
+mvn clean package -Dmaven.test.skip=true -am -pl mgr -Ptest
 mvn clean package -Dmaven.test.skip=true -am -pl agent

zzz/deploy.sh

@@ -2,20 +2,23 @@
 
 set -e
 
+###############################################################################
+# 部署 devops-mgr 和 devops-agent 应用
+###############################################################################
+
 #cd /home/reghao/Downloads
 #git clone https://git.reghao.cn/reghao/devops
 
-base_dir='/home/reghao/Downloads/devops'
-#base_dir='/home/reghao/code/java/devops'
+base_dir='~/devops'
 cd ${base_dir}
 mvn clean package -Dmaven.test.skip=true -Ptest
 #
 cd ${base_dir}/deployer/bin
 
-manager_local_dir=${base_dir}'/manager/bin'
-manager_remote_dir='/opt/apps/devops-mgr1'
-manager_server_file='/home/reghao/Downloads/servers1.csv'
-java -jar devops-deployer.jar "devops-mgr" ${manager_local_dir} ${manager_remote_dir} ${manager_server_file}
+mgr_local_dir=${base_dir}'/mgr/bin'
+mgr_remote_dir='/opt/apps/devops-mgr1'
+mgr_server_file='/home/reghao/Downloads/servers1.csv'
+java -jar devops-deployer.jar "devops-mgr" ${mgr_local_dir} ${mgr_remote_dir} ${mgr_server_file}
 
 #agent_local_dir=${base_dir}'/agent/bin'
 #agent_remote_dir='/opt/apps/devops-agent1'

zzz/init_schema.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+###############################################################################
+# 创建和初始化数据库
+###############################################################################
+
+set -e
+
+host='192.168.0.112'
+username='test'
+password='Test@123456'
+db=devops_db
+
+sql="CREATE DATABASE `${db}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_bin;"
+
+mysql -h${host} -u${username} -p${password} << EOF
+${sql}
+use ${db}
+source ./schema.sql;
+EOF
+exit;