提交到阿里云仓库的版本

file

@@ -1,2 +0,0 @@
-2021-11-25 17:07:07,883 INFO [MQTT Call: dagent5d1a727991f34d3a9c1220a1899e6ebd] c.r.a.d.m.DagentConnActionListener [DagentConnActionListener.java:41] MQTT 连接建立成功，开始订阅 topic
-2021-11-25 17:08:22,123 INFO [main-shutdown-hook] c.r.a.d.DagentApp [DagentApp.java:49] 清理资源后关闭应用...

schema/reghao_devops_rdb.sql → schema/devops_rdb.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50732
  File Encoding         : 65001
 
- Date: 11/11/2021 20:59:35
+ Date: 27/12/2021 18:04:19
 */
 
 SET NAMES utf8mb4;
@@ -72,7 +72,7 @@ CREATE TABLE `app_config` (
   `repo_auth_config_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_boipwfawtfve9o09lnb5le29a` (`app_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of app_config
@@ -100,7 +100,7 @@ CREATE TABLE `app_deploy_config` (
   KEY `FK7ionisohyo4pv58vwkkdugt35` (`machine_host_id`),
   CONSTRAINT `FK7ionisohyo4pv58vwkkdugt35` FOREIGN KEY (`machine_host_id`) REFERENCES `machine_host` (`id`),
   CONSTRAINT `FKhqgrewybinoowtbsbf63kf4pl` FOREIGN KEY (`app_config_id`) REFERENCES `app_config` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of app_deploy_config
@@ -127,7 +127,7 @@ CREATE TABLE `app_deploying` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_qahn6tavk8skmp27vhi1pna17` (`app_deploy_config_id`),
   CONSTRAINT `FK2tkqafeq2bi3gi4ec4s113hj2` FOREIGN KEY (`app_deploy_config_id`) REFERENCES `app_deploy_config` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of app_deploying
@@ -287,7 +287,7 @@ CREATE TABLE `machine_host` (
   `status` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_lo1x88vamyh2o34gdap4aw7jr` (`machine_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of machine_host
@@ -319,7 +319,7 @@ CREATE TABLE `machine_info` (
   `version` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_qtvbx85mqly0sgycqp1xt208s` (`machine_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of machine_info
@@ -437,7 +437,7 @@ CREATE TABLE `notify_group` (
   `receiver` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_gvaf84xd3bnxxf60r4whgv4e9` (`notify_account_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of notify_group
@@ -462,7 +462,7 @@ CREATE TABLE `packer_config` (
   `type` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_ilu7yfvuir3cvd8oqiemwrqh8` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of packer_config
@@ -487,7 +487,7 @@ CREATE TABLE `repo_auth_config` (
   `username` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_cfu57vn4gixedymokbkcnjpd0` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Records of repo_auth_config
@@ -515,10 +515,6 @@ CREATE TABLE `role` (
 -- ----------------------------
 BEGIN;
 INSERT INTO `role` VALUES (52, '2021-05-11 15:20:05.958407', b'0', '2021-07-12 11:19:41.558512', 'ROLE_ADMIN', '管理员', '具有所有访问权限');
-INSERT INTO `role` VALUES (53, '2021-05-11 15:20:05.959707', b'0', '2021-05-11 15:20:05.959727', 'ROLE_USER', '用户', '具有最基本的访问权限');
-INSERT INTO `role` VALUES (202, '2021-05-11 19:08:52.083053', b'0', '2021-06-10 15:33:37.816616', 'ROLE_BACKEND', '后端开发', '');
-INSERT INTO `role` VALUES (252, '2021-05-11 19:13:33.632519', b'0', '2021-06-10 15:34:46.823274', 'ROLE_FRONTEND', '前端开发', '');
-INSERT INTO `role` VALUES (352, '2021-05-13 10:59:19.220410', b'0', '2021-05-13 10:59:19.220456', 'ROLE_TEST', '测试', '');
 COMMIT;
 
 -- ----------------------------
@@ -539,22 +535,13 @@ CREATE TABLE `role_menu` (
 -- ----------------------------
 BEGIN;
 INSERT INTO `role_menu` VALUES (52, 152);
-INSERT INTO `role_menu` VALUES (53, 152);
-INSERT INTO `role_menu` VALUES (202, 152);
-INSERT INTO `role_menu` VALUES (252, 152);
-INSERT INTO `role_menu` VALUES (352, 152);
 INSERT INTO `role_menu` VALUES (52, 153);
 INSERT INTO `role_menu` VALUES (52, 154);
 INSERT INTO `role_menu` VALUES (52, 155);
 INSERT INTO `role_menu` VALUES (52, 156);
 INSERT INTO `role_menu` VALUES (52, 302);
-INSERT INTO `role_menu` VALUES (202, 302);
-INSERT INTO `role_menu` VALUES (252, 302);
 INSERT INTO `role_menu` VALUES (52, 303);
-INSERT INTO `role_menu` VALUES (202, 303);
-INSERT INTO `role_menu` VALUES (252, 303);
 INSERT INTO `role_menu` VALUES (52, 305);
-INSERT INTO `role_menu` VALUES (202, 305);
 INSERT INTO `role_menu` VALUES (52, 502);
 INSERT INTO `role_menu` VALUES (52, 503);
 INSERT INTO `role_menu` VALUES (52, 703);
@@ -564,7 +551,6 @@ INSERT INTO `role_menu` VALUES (52, 802);
 INSERT INTO `role_menu` VALUES (52, 803);
 INSERT INTO `role_menu` VALUES (52, 804);
 INSERT INTO `role_menu` VALUES (52, 809);
-INSERT INTO `role_menu` VALUES (202, 809);
 INSERT INTO `role_menu` VALUES (52, 810);
 INSERT INTO `role_menu` VALUES (52, 811);
 INSERT INTO `role_menu` VALUES (52, 1502);
@@ -576,7 +562,6 @@ INSERT INTO `role_menu` VALUES (52, 6752);
 INSERT INTO `role_menu` VALUES (52, 9452);
 INSERT INTO `role_menu` VALUES (52, 9502);
 INSERT INTO `role_menu` VALUES (52, 13352);
-INSERT INTO `role_menu` VALUES (202, 13352);
 COMMIT;
 
 -- ----------------------------
@@ -628,13 +613,7 @@ CREATE TABLE `user` (
 -- Records of user
 -- ----------------------------
 BEGIN;
-INSERT INTO `user` VALUES (102, '2021-05-11 15:20:05.995018', b'0', '2021-07-14 11:14:19.658896', '/imgs/avatar/default.png', '', 1, '管理员', '5b9a079ebe999bf0edbe2f665e6fc9f2', '13012345678', 'AeC0rlakx6nkIs6xJYqQYQTlvNRISLbdz7K4aKa04T39wxRTL1oOZs5rlTDos9ryXoZCniedn5a4eSZJNxk2mw==', 'admin', b'1', b'0');
-INSERT INTO `user` VALUES (402, '2021-05-13 13:56:39.105994', b'0', '2021-07-14 17:06:55.598989', '/imgs/avatar/default.png', '', 1, '黄虹钦', '61d79d1565c6f468fc9942f8adfa9a08', '', 'A9z3nYQsYtyicjqaERD0LRfKEXlcjxIFWQXXT3RZeIbsaGi9lkDEv0nm2hHFpRQV53rXRjnpLX9tX9L9iCL5Qw==', 'hhq', b'1', b'0');
-INSERT INTO `user` VALUES (403, '2021-05-13 13:57:13.312625', b'0', '2021-05-13 13:57:13.312657', '/imgs/avatar/default.png', '', 1, '杨耿', 'c25b13b638fc66f2c348d9aff62ea0db', '', 'XWfTtUMO6HXktQbavlg9Lf9Hkirbf2VdYOzzfFurFKZpdOZDGkBaPnuWHKcl3gInAR1qRgrG3BII+zPSx2Mmng==', 'yg', b'1', b'0');
-INSERT INTO `user` VALUES (404, '2021-05-13 13:57:59.326378', b'0', '2021-05-13 13:57:59.326398', '/imgs/avatar/default.png', '', 1, ' 吴敏 ', '6871c02cbea20be164ebb38586179ddb', '', 'tlqRs6HekLU2ceuEKYctyBj46AKwqnb0QPbfnflb9ZWnW7upx1VE2spNbXStenvk7nQ1QaGism8al9oIM/UBSg==', 'wm', b'1', b'0');
-INSERT INTO `user` VALUES (405, '2021-05-13 13:58:26.108142', b'0', '2021-05-13 13:58:26.108162', '/imgs/avatar/default.png', '', 1, '詹先平', '5f3f027740273c53a7eb7af1416d0701', '', 'HeIAuJbkQxpnw1E0lTrPW4QoL5NkhvwsvKN2j9D//tlnws+2t61ujLFY5796m8Wp7NV+f7dxO86w+yaAUd5WkQ==', 'zxp', b'1', b'0');
-INSERT INTO `user` VALUES (406, '2021-05-13 13:58:58.735900', b'0', '2021-07-14 11:13:42.725731', '/imgs/avatar/default.png', '', 0, '刘宏', 'd895fd40c14a098354a0248fe68f8aa5', '', 'HerF7LEu5TSJCM3mKCZdMILdJ12EgBDA89ddutrQfNtYmFP9Fx9fv4Mw67VCc2iDs5updWQzufK8RdYMSSF/fQ==', 'lh', b'1', b'0');
-INSERT INTO `user` VALUES (407, '2021-05-13 13:59:36.762631', b'0', '2021-07-14 11:13:42.746650', '/imgs/avatar/default.png', 'haohao@hao.com', 1, '官劲松', '7ce8e5cfcde85dfaedf0f4fce2dcc1e5', '13109876543', 'jHU1qLuP/6hS7XB1f6FZ/ZrM67C5/YNQT9pBss7E1Ftm9cZchqGhZrsGK2onQuJ3Qed/Pbj+c2FyXmCaUlWk6A==', 'gjs', b'1', b'0');
+INSERT INTO `user` VALUES (1, '2021-05-11 15:20:05.995018', b'0', '2021-07-14 11:14:19.658896', '/imgs/avatar/default.png', '', 1, '管理员', '5b9a079ebe999bf0edbe2f665e6fc9f2', '13012345678', 'AeC0rlakx6nkIs6xJYqQYQTlvNRISLbdz7K4aKa04T39wxRTL1oOZs5rlTDos9ryXoZCniedn5a4eSZJNxk2mw==', 'admin', b'1', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -652,14 +631,7 @@ CREATE TABLE `user_role` (
 -- Records of user_role
 -- ----------------------------
 BEGIN;
-INSERT INTO `user_role` VALUES (102, 'ROLE_ADMIN');
-INSERT INTO `user_role` VALUES (406, 'ROLE_TEST');
-INSERT INTO `user_role` VALUES (405, 'ROLE_FRONTEND');
-INSERT INTO `user_role` VALUES (403, 'ROLE_FRONTEND');
-INSERT INTO `user_role` VALUES (404, 'ROLE_BACKEND');
-INSERT INTO `user_role` VALUES (407, 'ROLE_BACKEND');
-INSERT INTO `user_role` VALUES (402, 'ROLE_BACKEND');
-INSERT INTO `user_role` VALUES (402, 'ROLE_ADMIN');
+INSERT INTO `user_role` VALUES (1, 'ROLE_ADMIN');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

scripts/build.sh

@@ -3,39 +3,7 @@
 #######################################################################################################################
 #!/bin/bash
 
-app=$1
-env=$2
-if [[ -z ${app} ]] || [ -z ${env} ]; then
-  echo 'error: sh build.sh app env'
-  exit -1
-fi
-
-# 项目根目录
-proj_home="/home/reghao/code/aha/autodop"
-proj=`basename ${proj_home}`
-app_name=${proj}-${app}
-cd ${proj_home}
-mvn clean package -am -Dmaven.test.skip=true -pl ${app} -P${env}
-
-# 存放应用的根目录
-jar_home="/home/reghao/dev/tmp/apps"
-if [[ -d ${jar_home}/${app_name} ]]; then
-  rm -rf ${jar_home}/${app_name}/*
-else
-  mkdir -p ${jar_home}/${app_name}
-fi
-cp ${app}/target/${app_name}.jar ${jar_home}/${app_name}
-cp scripts/runner.sh ${jar_home}/${app_name}
-
-cd ${jar_home}
-sed -i "s/placeholder/${app_name}/" ${app_name}/runner.sh
-zip -r ${app_name}.zip ${app_name}
-rm -rf ${app_name}
-
-cd ${proj_home}
-mvn clean
-
-#mvn clean package -am -Dmaven.test.skip=true -Ptest
-#mvn clean package -am -Dmaven.test.skip=true -pl dmaster -Pdev
-#mvn clean package -am -Dmaven.test.skip=true -pl dmaster -Ptest
-#mvn clean package -am -Dmaven.test.skip=true -pl dagent -Ptest
+mvn clean package -am -Dmaven.test.skip=true -Ptest
+mvn clean package -am -Dmaven.test.skip=true -pl dmaster -Pdev
+mvn clean package -am -Dmaven.test.skip=true -pl dmaster -Ptest
+mvn clean package -am -Dmaven.test.skip=true -pl dagent -Ptest

scripts/build_and_deploy.sh

@@ -1,29 +0,0 @@
-##############################################################
-# 构建部署脚本
-##############################################################
-#!/bin/bash
-
-set -e
-
-sh build.sh test dmaster
-#sh deploy.sh autodop-dmaster 192.168.0.211 azy &
-
-# 构建
-#sh build.sh test dagent
-
-##############################################################
-# 测试环境
-##############################################################
-#sh deploy.sh autodop-dagent 192.168.0.171 azy
-#sh deploy.sh autodop-dagent 192.168.0.172 azy
-#sh deploy.sh autodop-dagent 192.168.0.173 azy
-#sh deploy.sh autodop-dagent 192.168.0.174 azy
-
-
-
-##############################################################
-# 生产环境
-##############################################################
-#sh deploy.sh autodop-dagent 121.40.29.55 CYsZufT56vX6rr6FLD6IF1YCXiJbwv
-#sh deploy.sh autodop-dagent 121.41.79.44 YcxtZI6yQeeSDw0mDD7eeunwOEhAca &
-#sh deploy.sh autodop-dagent 121.43.234.233 sjUIYQzBEaMm1!hbh9sB &

scripts/deploy.sh

@@ -1,29 +0,0 @@
-##############################################################
-# 部署脚本
-##############################################################
-#!/bin/bash
-
-set -e
-
-app_name=$1
-remote_host=$2
-password=$3
-
-if [[ -z ${app_name} ]] || [ -z ${remote_host} ] || [ -z ${password} ]; then
-  echo 'error: sh deploy.sh build remote_host password'
-  exit -1
-fi
-
-# 存放应用的根目录
-#remote_jar_home="/opt/services/dmaster"
-#remote_jar_home="/opt/services/dagent"
-remote_jar_home="/opt/apps/dagent"
-local_jar_home="/home/reghao/dev/tmp/apps"
-cd ${local_jar_home}/${app_name}
-
-# 拷贝 runner.sh 到远程主机
-sshpass -p ${password} scp runner.sh root@${remote_host}:${remote_jar_home}
-# 拷贝应用到远程主机
-sshpass -p ${password} scp ${app_name}.jar root@${remote_host}:${remote_jar_home}
-# 运行远程主机上的应用
-#sshpass -p ${password} ssh root@${remote_host} "source /etc/profile && cd ${remote_jar_home} && sh runner.sh start"

scripts/deploy1.sh

@@ -1,11 +0,0 @@
-##############################################################
-# 部署脚本
-##############################################################
-#!/bin/bash
-
-jarFile='/home/reghao/dev/tmp/apps/autodop-dagent/autodop-dagent.jar'
-
-sshpass -p azy scp ${jarFile} root@192.168.0.171:/opt/apps/dagent
-sshpass -p azy scp ${jarFile} root@192.168.0.172:/opt/apps/dagent
-sshpass -p azy scp ${jarFile} root@192.168.0.173:/opt/apps/dagent
-sshpass -p azy scp ${jarFile} root@192.168.0.174:/opt/apps/dagent

scripts/docker.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd /home/reghao/code/aha/autodop/
-mvn clean package -am -Dmaven.test.skip=true -pl dmaster -Pdev
-
-cd /home/reghao/code/aha/autodop/dmaster/
-docker build -t docker.reghao.icu/devops/dmaster .
-docker push docker.reghao.icu/devops/dmaster

scripts/runner.sh

@@ -1,81 +0,0 @@
-#######################################################################################################################
-# Java 应用进程管理脚本
-#######################################################################################################################
-#!/bin/bash
-
-jarfile_name="spiderlab-dagent.jar"
-
-# 启动进程
-start() {
-    pid=`jps | grep ${jarfile_name} | awk '{print $1}'`
-    if [ ! -z ${pid} ]
-    then
-        echo "${jarfile_name} has been running with pid ${pid}..."
-        exit 0
-    fi
-
-    nohup java -jar ${jarfile_name} > console.log 2>&1 &
-
-    declare count=0
-    declare max=60
-    while [[ ${count} -lt ${max} && -z ${pid} ]]; do
-        ((count++))
-        echo "sleep ${count}s to wait ${jarfile_name} start..."
-        sleep 1
-        pid=`jps | grep ${jarfile_name} | awk '{print $1}'`
-    done
-
-    if [ ${count} -gt ${max} ]; then
-        echo "${jarfile_name} started failed..."
-        exit 1
-    else
-        echo "${jarfile_name} has been started with pid ${pid}..."
-        exit 0
-    fi
-}
-
-# 结束进程
-stop() {
-    pid=`jps | grep ${jarfile_name} | awk '{print $1}'`
-    if [ -z ${pid} ]
-    then
-        echo "${jarfile_name} not running..."
-    else
-        kill -15 ${pid}
-
-        oldpid=${pid}
-        declare count=0
-        declare max=60
-        while [[ ${count} -lt ${max} && ! -z ${pid} ]]; do
-            ((count++))
-            echo "sleep ${count}s to wait ${jarfile_name} shutdown..."
-            sleep 1
-            pid=`jps | grep ${jarfile_name} | awk '{print $1}'`
-        done
-
-        if [ ${count} -gt ${max} ]; then
-            echo "${jarfile_name} shutdown failed..."
-            exit 1
-        else
-            echo "${jarfile_name} with pid ${oldpid} has been killed..."
-            exit 0
-        fi
-    fi
-}
-
-case $1 in
-start)
-    start
-    ;;
-stop)
-    stop
-    ;;
-restart)
-    stop
-    start
-    ;;
-*)
-    echo "Usage: sh runner.sh [start|stop|restart]"
-    exit 1
-    ;;
-esac