Prechádzať zdrojové kódy

soc-modules-deploy模块后台代码迁移-整合sql脚本到soc库中

humingshi-7@163.com 1 rok pred
rodič
commit
15e67c41da
37 zmenil súbory, kde vykonal 504 pridanie a 274 odobranie
  1. 423 0
      project_data/sql/0.1.1/soc/soc.sql
  2. 0 59
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/SysConfController.java
  3. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/dao/SysConfDao.java
  4. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppInfo.java
  5. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppInfoExtend.java
  6. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppRunInfo.java
  7. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppRunInfoExtend.java
  8. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/BatchHostInfo.java
  9. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/FrontTask.java
  10. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/HostInfo.java
  11. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/HostZipInfo.java
  12. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/OperationLog.java
  13. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/OperationParam.java
  14. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/PackageInfo.java
  15. 15 10
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/SysConf.java
  16. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeBatchInfo.java
  17. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeTask.java
  18. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeTaskHis.java
  19. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UploadAppInfo.java
  20. 1 1
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/ZipPackInfo.java
  21. 0 11
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/SysConfService.java
  22. 2 2
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/BeringServiceImpl.java
  23. 4 4
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/HostInfoServiceImpl.java
  24. 0 128
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/SysConfServicesImpl.java
  25. 2 2
      soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/UploadAppInfoServiceImpl.java
  26. 2 2
      soc-modules/soc-modules-deploy/src/main/resources/mapper/AppInfoDao.xml
  27. 2 2
      soc-modules/soc-modules-deploy/src/main/resources/mapper/AppRunInfoDao.xml
  28. 1 1
      soc-modules/soc-modules-deploy/src/main/resources/mapper/AppinfoExtendDao.xml
  29. 4 4
      soc-modules/soc-modules-deploy/src/main/resources/mapper/BatchHostInfoDao.xml
  30. 18 18
      soc-modules/soc-modules-deploy/src/main/resources/mapper/HostInfoDao.xml
  31. 2 2
      soc-modules/soc-modules-deploy/src/main/resources/mapper/HostZipInfoDao.xml
  32. 1 1
      soc-modules/soc-modules-deploy/src/main/resources/mapper/OperationLogDao.xml
  33. 4 4
      soc-modules/soc-modules-deploy/src/main/resources/mapper/PackageInfoDao.xml
  34. 2 2
      soc-modules/soc-modules-deploy/src/main/resources/mapper/SysConfDao.xml
  35. 1 1
      soc-modules/soc-modules-deploy/src/main/resources/mapper/UpgradeBatchInfoDao.xml
  36. 2 2
      soc-modules/soc-modules-deploy/src/main/resources/mapper/UpgradeTaskDao.xml
  37. 2 2
      soc-modules/soc-modules-deploy/src/main/resources/mapper/ZipPackInfoDao.xml

+ 423 - 0
project_data/sql/0.1.1/soc/soc.sql

@@ -264,3 +264,426 @@ CREATE TABLE `iot_air_conditioner_log` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 
+
+
+
+
+
+-- ----------------------------
+-- 部署中心新增表及视图脚本
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for deploy_app_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_app_info`;
+CREATE TABLE `deploy_app_info`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `product_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品名称',
+  `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '部署中心分配的标识【0-9】组成',
+  `app_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用唯一id',
+  `app_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用类型:BackgroundServices、Deskto、SystemServices、Tool',
+  `app_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用名称',
+  `version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用版本号',
+  `download_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '安装包下载地址',
+  `certificate_authority` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '安装签名',
+  `hash_algorithm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'SHA256' COMMENT '安装签名算法,目前只支持SHA256',
+  `hash` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '安装包的hash值',
+  `os_platforms` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用支持操作系统类型:json数组',
+  `os_architectures` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用支持系统架构:json数组',
+  `start` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '启动参数:json格式数据',
+  `stop` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '停止参数',
+  `run_at_startup` tinyint(1) NULL DEFAULT NULL COMMENT '随操作系统启动',
+  `guard_enabled` tinyint(1) NULL DEFAULT NULL COMMENT '由agent守护',
+  `liveness_probe` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用运行探针:json格式数据',
+  `log_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用日志目录',
+  `host_info_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '前置机信息id',
+  `sort_app` int(5) NULL DEFAULT NULL COMMENT 'app排序',
+  `wait_for_ready` int(5) NULL DEFAULT NULL COMMENT '延时启动时间',
+  `hotfixes` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '补丁包json数组',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX idx_host_info_id ( `host_info_id` )
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for deploy_app_info_extend
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_app_info_extend`;
+CREATE TABLE `deploy_app_info_extend` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `product_name` varchar(255) NOT NULL COMMENT '产品名称',
+  `code` varchar(255) NOT NULL COMMENT '部署中心分配的标识【0-9】组成',
+  `app_id` varchar(255) NOT NULL COMMENT '应用唯一id',
+  `app_type` varchar(255) NOT NULL COMMENT '应用类型:BackgroundServices、Deskto、SystemServices、Tool',
+  `app_name` varchar(255) NOT NULL COMMENT '应用名称',
+  `version` varchar(255) NOT NULL COMMENT '应用版本号',
+  `download_url` varchar(255) DEFAULT NULL COMMENT '安装包下载地址',
+  `certificate_authority` varchar(255) DEFAULT NULL COMMENT '安装签名',
+  `hash_algorithm` varchar(255) DEFAULT 'SHA256' COMMENT '安装签名算法,目前只支持SHA256',
+  `hash` varchar(2000) DEFAULT NULL COMMENT '安装包的hash值',
+  `os_platforms` varchar(255) NOT NULL COMMENT '应用支持操作系统类型:json数组',
+  `os_architectures` varchar(255) NOT NULL COMMENT '应用支持系统架构:json数组',
+  `start` varchar(3000) NOT NULL COMMENT '启动参数:json格式数据',
+  `stop` varchar(3000) NOT NULL COMMENT '停止参数',
+  `run_at_startup` tinyint(1) DEFAULT NULL COMMENT '随操作系统启动',
+  `guard_enabled` tinyint(1) DEFAULT NULL COMMENT '由agent守护',
+  `liveness_probe` varchar(3000) NOT NULL COMMENT '应用运行探针:json格式数据',
+  `log_path` varchar(255) DEFAULT NULL COMMENT '应用日志目录',
+  `host_info_id` varchar(255) NOT NULL COMMENT '前置机信息id',
+  `sort_app` int(11) DEFAULT NULL COMMENT 'app排序',
+  `wait_for_ready` int(11) DEFAULT NULL COMMENT '延时启动时间',
+  `hotfixes` text COMMENT '补丁包json数组',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX idx_host_info_id ( `host_info_id` )
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for deploy_app_run_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_app_run_info`;
+CREATE TABLE `deploy_app_run_info` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(255) DEFAULT NULL COMMENT '白令海的标识',
+  `app_id` varchar(255) DEFAULT NULL COMMENT '应用唯一id',
+  `app_type` varchar(255) DEFAULT NULL COMMENT '应用类型',
+  `app_name` varchar(255) DEFAULT NULL COMMENT '应用名称',
+  `version` varchar(255) DEFAULT NULL COMMENT '应用版本号',
+  `running` bigint(1) DEFAULT NULL COMMENT '应用是否正在运行',
+  `process_id` varchar(255) DEFAULT NULL COMMENT '进程id',
+  `start_time` datetime DEFAULT NULL COMMENT '应用启动时间',
+  `stage` varchar(255) DEFAULT NULL COMMENT '应用部署阶段',
+  `status` varchar(255) DEFAULT NULL COMMENT '应用部署该阶段的状态',
+  `description` varchar(255) DEFAULT NULL COMMENT '描述信息',
+  `host_id` varchar(255) NOT NULL COMMENT '主机id',
+  `hotfixes` varchar(255) DEFAULT NULL COMMENT '补丁包',
+  PRIMARY KEY (`id`),
+  INDEX idx_host_id ( `host_id` )
+) ENGINE=InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for deploy_app_run_info_extend
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_app_run_info_extend`;
+CREATE TABLE `deploy_app_run_info_extend` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(255) DEFAULT NULL COMMENT '白令海的标识',
+  `app_id` varchar(255) DEFAULT NULL COMMENT '应用唯一id',
+  `app_type` varchar(255) DEFAULT NULL COMMENT '应用类型',
+  `app_name` varchar(255) DEFAULT NULL COMMENT '应用名称',
+  `version` varchar(255) DEFAULT NULL COMMENT '应用版本号',
+  `running` bigint(20) DEFAULT NULL COMMENT '应用是否正在运行',
+  `process_id` varchar(255) DEFAULT NULL COMMENT '进程id',
+  `start_time` datetime DEFAULT NULL COMMENT '应用启动时间',
+  `stage` varchar(255) DEFAULT NULL COMMENT '应用部署阶段',
+  `status` varchar(255) DEFAULT NULL COMMENT '应用部署该阶段的状态',
+  `description` varchar(255) DEFAULT NULL COMMENT '描述信息',
+  `host_id` varchar(255) NOT NULL COMMENT '主机id',
+  `hotfixes` varchar(255) DEFAULT NULL COMMENT '补丁包',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX idx_host_id ( `host_id` ) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for deploy_batch_host_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_batch_host_info`;
+CREATE TABLE `deploy_batch_host_info` (
+  `id` varchar(50) NOT NULL,
+  `batch_id` varchar(50) DEFAULT NULL COMMENT '批次id',
+  `batch_code` varchar(100) DEFAULT NULL COMMENT '批次号',
+  `org_name` varchar(50) DEFAULT NULL COMMENT '机构名称',
+  `org_id` varchar(50) DEFAULT NULL COMMENT '机构id',
+  `host_id` varchar(50) DEFAULT NULL COMMENT '主机id',
+  `host_name` varchar(100) DEFAULT NULL COMMENT '主机名称',
+  `status` int(1) DEFAULT NULL COMMENT '状态:0进行中,1成功,2失败',
+  `host_ip` varchar(100) DEFAULT NULL COMMENT '主机ip',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '开始时间',
+  `finish_time` datetime DEFAULT NULL COMMENT '结束时间',
+  PRIMARY KEY (`id`),
+  INDEX idx_host_id ( `host_id` )
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+-- ----------------------------
+-- Table structure for deploy_front_task
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_front_task`;
+CREATE TABLE `deploy_front_task` (
+  `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
+  `host_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主机id',
+  `task_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务类型:rebootNode-重启计算机、updateAppSetting-设置agent信息、startApp-启动应用、stopApp-停止应用、restartApp-重启应用、uploadAppList-推送应用清单、uploadLog-上传日志',
+  `task_status` int(1) NOT NULL DEFAULT 0 COMMENT '任务状态:0-待执行,1-成功,2-失败,3-执行中,4-已发送',
+  `task_status_desc` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务状态描述',
+  `task_start_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '任务开始时间',
+  `task_end_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '任务结束时间',
+  `arguments` varchar(255) DEFAULT NULL COMMENT '任务参数json',
+  `sort_app` int(11) DEFAULT NULL COMMENT '应用启动顺序',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX idx_host_id ( `host_id` )
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for deploy_host_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_host_info`;
+CREATE TABLE `deploy_host_info`  (
+  `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '主键',
+  `hostName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主机名称',
+  `hostIp` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主机ip',
+  `hostSystem` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主机操作系统类型',
+  `hostFrame` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作系统架构',
+  `hostMac` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'MAC地址',
+  `hostOrg` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属机构id',
+  `hostStatus` int(1) NULL DEFAULT NULL COMMENT '主机状态:1-在线 2-离线',
+  `accessToken` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '令牌',
+  `expiresIn` int(255) NULL DEFAULT NULL COMMENT '令牌有效期',
+  `tokenType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型 默认Bearer',
+  `scope` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权范围',
+  `agentVersion` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '白令海版本',
+  `isPush` int(1) NULL DEFAULT NULL COMMENT '是否推送清单,0,未推送,1已推送',
+  `tokenCreateTime` bigint(20) NULL DEFAULT NULL COMMENT '令牌生成时间',
+  `coreTimeStamp` bigint(20) NULL DEFAULT 0 COMMENT '部署中心时间戳',
+  `frontTimeStamp` bigint(20) NULL DEFAULT 0 COMMENT '前置机时间戳',
+  `upload_version` varchar(255) NULL DEFAULT NULL comment '前置机Agent需要升级的版本',
+  `register_date` datetime DEFAULT NULL COMMENT '注册时间',
+  `encryption` int(1) DEFAULT '0' COMMENT '是否开启数据传输加密,0.不开启 1.开启',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for deploy_host_zip_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_host_zip_info`;
+CREATE TABLE `deploy_host_zip_info` (
+  `id` varchar(50) NOT NULL,
+  `host_name` varchar(50) DEFAULT NULL COMMENT '主机名称',
+  `host_id` varchar(50) DEFAULT NULL COMMENT '主机id',
+  `org_id` varchar(50) DEFAULT NULL COMMENT '机构id',
+  `zip_version` varchar(100) DEFAULT NULL COMMENT '当前版本',
+  `target_version` varchar(100) DEFAULT NULL COMMENT '目标版本',
+  `status` varchar(100) DEFAULT NULL COMMENT '状态',
+  `org_name` varchar(100) DEFAULT NULL COMMENT '主机名称',
+  `target_zip_id` varchar(50) DEFAULT NULL COMMENT '目标版本id',
+  `batch_code` varchar(50) DEFAULT NULL COMMENT '最新批次号',
+  `host_ip` varchar(100) DEFAULT NULL COMMENT '主机ip',
+  `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新数据的时间(插入新数据为null)',
+  PRIMARY KEY (`id`),
+  INDEX idx_host_id ( `host_id` )
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for deploy_operation_param
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_operation_param`;
+CREATE TABLE `deploy_operation_param` (
+  `id` int(11) NOT NULL,
+  `server_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务名称',
+  `server_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务标识',
+  `param_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动参数名称',
+  `param_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动参数标识',
+  `param_value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动参数值',
+  `status` int(2) NULL DEFAULT NULL COMMENT '状态:0 未启用 1.启用',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of deploy_operation_param
+-- ----------------------------
+INSERT INTO `deploy_operation_param` VALUES (1, '主机iot服务', 'VIMD', '数据上报平台IP', '--pushIp=', NULL, 1);
+INSERT INTO `deploy_operation_param` VALUES (2, '主机iot服务', 'VIMD', '数据上报平台端口', '--pushP=', '8102', 1);
+
+-- ----------------------------
+-- Table structure for deploy_package_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_package_info`;
+CREATE TABLE `deploy_package_info` (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `package_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '升级包名称',
+  `server_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务code',
+  `server_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '服务名称',
+  `status` tinyint(2) NULL DEFAULT NULL COMMENT '状态:0.未启用 1.启用',
+  `package_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '升级包存放路径',
+  `package_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '升级包版本号',
+  `upload_time` datetime(0) NULL DEFAULT NULL COMMENT '上传时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for deploy_upgrade_batch_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_upgrade_batch_info`;
+CREATE TABLE `deploy_upgrade_batch_info` (
+  `id` varchar(50) NOT NULL,
+  `zip_id` varchar(50) NOT NULL COMMENT '升级包id',
+  `org_size` int(10) DEFAULT NULL COMMENT '机构数量',
+  `host_size` int(10) DEFAULT NULL COMMENT '主机数量',
+  `status` int(1) DEFAULT '0' COMMENT '批次升级状态',
+  `create_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建日期',
+  `batch_code` varchar(100) DEFAULT NULL COMMENT '升级批次号',
+  `zip_version` varchar(100) DEFAULT NULL COMMENT '升级包名称',
+  `finish_time` datetime(0) NULL COMMENT '结束时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for deploy_upgrade_task
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_upgrade_task`;
+CREATE TABLE `deploy_upgrade_task` (
+  `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '升级任务主键',
+  `batch_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '批次号',
+  `task_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务号',
+  `host_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '主机id',
+  `deploy_stages` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部署步骤:download-下载,install-安装,Ready-就绪,Uninstall-卸载,Cleanup-清理',
+  `deploy_status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部署状态:InProgress-进行中,Successed-成功,Failed-失败',
+  `deploy_description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务执行状态描述',
+  `task_start_time` datetime(0) NULL DEFAULT NULL COMMENT '任务开始时间',
+  `task_end_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '任务结束时间',
+  `app_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用标识',
+  `app_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务类型名',
+  `now_version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '当前版本号',
+  `targe_version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标版本号',
+  `app_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用code',
+  `task_status` int(1) NULL DEFAULT NULL COMMENT '任务状态:0-进行中,1-成功,2-失败',
+  `zip_id` varchar(50) DEFAULT NULL COMMENT '升级任务使用的是哪个升级包',
+  `hotfix_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '补丁包',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX idx_host_id ( `host_id` )
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for deploy_upgrade_task_his
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_upgrade_task_his`;
+CREATE TABLE `deploy_upgrade_task_his`  (
+  `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '升级任务主键',
+  `batch_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '批次号',
+  `task_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务号',
+  `host_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '主机id',
+  `deploy_stages` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部署步骤:download-下载,install-安装,Ready-就绪,Uninstall-卸载,Cleanup-清理',
+  `deploy_status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部署状态:InProgress-进行中,Successed-成功,Failed-失败',
+  `deploy_description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务执行状态描述',
+  `task_start_time` datetime(0) NULL DEFAULT NULL COMMENT '任务开始时间',
+  `task_end_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '任务结束时间',
+  `app_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用标识',
+  `app_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务类型名',
+  `now_version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '当前版本号',
+  `targe_version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标版本号',
+  `app_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用code',
+  `task_status` int(1) NULL DEFAULT NULL COMMENT '任务状态:0-进行中,1-成功,2-失败',
+  `zip_id` varchar(50) DEFAULT NULL COMMENT '升级任务使用的是哪个升级包',
+  `hotfix_version` varchar(255) DEFAULT NULL COMMENT '补丁包',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX idx_host_id ( `host_id` )
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for deploy_upload_app_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_upload_app_info`;
+CREATE TABLE `deploy_upload_app_info` (
+  `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '升级应用app主键',
+  `down_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '物理路径',
+  `product_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品名称',
+  `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '部署中心分配的标识【0-9】组成',
+  `app_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用唯一id',
+  `app_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '应用类型:BackgroundServices、Deskto、SystemServices、Tool',
+  `app_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用名称',
+  `version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用版本号',
+  `download_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '安装包下载地址',
+  `certificate_authority` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '安装签名',
+  `hash_algorithm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'SHA256' COMMENT '安装签名算法,目前只支持SHA256',
+  `hash` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '安装包的hash值',
+  `os_platforms` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用支持操作系统类型:json数组',
+  `os_architectures` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用支持系统架构:json数组',
+  `start` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '启动参数:json格式数据',
+  `stop` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '停止参数',
+  `run_at_startup` tinyint(1) NULL DEFAULT NULL COMMENT '随操作系统启动',
+  `guard_enabled` tinyint(1) NULL DEFAULT NULL COMMENT '由agent守护',
+  `liveness_probe` varchar(3000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '应用运行探针:json格式数据',
+  `log_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用日志目录',
+  `zip_id` varchar(50) DEFAULT NULL COMMENT '来源那个zip包',
+  `limit_version` varchar(255) DEFAULT NULL COMMENT '限制版本',
+  `sort_app` int(5) NULL DEFAULT NULL COMMENT 'app排序',
+  `wait_for_ready` int(5) NULL DEFAULT NULL COMMENT '延时启动时间',
+  `type` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT 'app' COMMENT '包类型:app-整包;hotfix-补丁包',
+  `overrides` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '[]' COMMENT '被替代补丁版本字符串json数组集合 这个hotfix替代了哪些hotfix.生成安装部署清单时,清确被替代项不被下发',
+  `hotfix_version` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '补丁包版本',
+  `dependencies` varchar(1000) DEFAULT NULL COMMENT '/依赖项,生成安装部署清单时,请确保依赖项来排列',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+
+-- ----------------------------
+-- Table structure for deploy_zip_pack_info
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_zip_pack_info`;
+CREATE TABLE `deploy_zip_pack_info` (
+  `id` varchar(50) NOT NULL COMMENT '主键',
+  `zip_version` varchar(50) DEFAULT NULL,
+  `zip_service` varchar(100) DEFAULT NULL COMMENT '服务类型',
+  `up_version` varchar(50) DEFAULT NULL COMMENT '针对升级版本',
+  `publish_date` varchar(50) DEFAULT NULL COMMENT '发布时间',
+  `upload_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '上传时间',
+  `upload_user` varchar(50) DEFAULT NULL COMMENT '上传人',
+  `zip_size` varchar(50) DEFAULT NULL COMMENT 'zip包大小',
+  `zip_path` varchar(255) DEFAULT NULL COMMENT 'zip解压解析完后存放的路径',
+  `zip_name` varchar(100) DEFAULT NULL COMMENT '压缩包名称',
+  `host_type` varchar(255) DEFAULT NULL COMMENT '升级包使用主机类型',
+  `host_type_name` varchar(255) DEFAULT NULL COMMENT '升级包使用主机类型名称',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for deploy_operation_log
+-- ----------------------------
+DROP TABLE IF EXISTS `deploy_operation_log`;
+CREATE TABLE `deploy_operation_log`  (
+  `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id',
+  `user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人',
+  `organize_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属机构',
+  `path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机构路径',
+  `org_id` int(0) NULL DEFAULT NULL COMMENT '机构ID',
+  `host_ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主机IP',
+  `host_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主机名称',
+  `host_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主机ID',
+  `target_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标版本号',
+  `mirror_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '当前版本号',
+  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作描述',
+  `opera_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
+  `opera_result` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作结果',
+  `reserve_field1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '预备字段1',
+  `reserve_field2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '预备字段2',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `IDX_PATH`(`organize_name`) USING BTREE,
+  INDEX `IDX_MIRROR_VERSION`(`mirror_version`) USING BTREE,
+  INDEX `IDX_TARGET_VERSION`(`target_version`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+
+-- ----------------------------
+-- view structure for hv_org
+-- ----------------------------
+CREATE VIEW `hv_org` AS
+select id as org_id,code as org_code,name as org_name,parent_id,sort as order_no,path,deleted as is_deleted,type
+from sys_org;
+
+-- ----------------------------
+-- view structure for hv_host_org
+-- ----------------------------
+CREATE VIEW `hv_host_org` AS
+select r.equipment_code as register_code,r.org_id,o.org_code,o.org_name,o.parent_id,o.order_no,o.path,o.is_deleted,o.type,
+h.hostName,h.hostIp,h.hostSystem,h.hostMac,h.accessToken,h.expiresIn,h.tokenCreateTime,h.coreTimeStamp,h.frontTimeStamp
+from iot_device r
+left join hv_org o on r.org_id = o.org_id
+left join deploy_host_info h on r.equipment_code = h.id
+where r.category_id = 3712199107215360;
+
+-- ----------------------------
+-- 系统配置:部署中心允许主机重新注册
+-- ----------------------------
+INSERT INTO `sys_config`(config_name,config_key,config_value,config_type,create_by,create_time,update_by,update_time,remark)
+ VALUES ('部署中心:允许主机重新注册', 'DEPLOY_REGISTER_AGAIN', '1', 'Y', '超级管理员', '2024-07-02 10:25:25', '', null, '0:否,1:是');
+
+

+ 0 - 59
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/SysConfController.java

@@ -1,59 +0,0 @@
-package com.xunmei.deploy.controller;
-
-import com.xunmei.deploy.domain.SysConf;
-import com.xunmei.deploy.util.Message;
-import com.xunmei.deploy.service.SysConfService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@Controller
-@RequestMapping("/sysConf")
-public class SysConfController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private SysConfService sysConfService;
-
-    /**
-     * 配置 “允许主机重复注册”、“数据传输加密”、“删除主机前先验证关闭允许主机重复注册”-获取当前配置
-     */
-    @GetMapping("/getByCode")
-    @ResponseBody
-    public Message getByCode(String code){
-        try {
-            SysConf sysConf = sysConfService.getByCode(code);
-            return Message.success("获取数据成功!",sysConf);
-        }catch (Exception e){
-            logger.error("配置是否运行主机重复注册、数据传输加密获取数据出现异常:{}",e);
-            return Message.error("获取数据失败!");
-        }
-    }
-
-    /**
-     * 配置 “允许主机重复注册”、“数据传输加密”-保存修改配置
-     */
-    @RequestMapping("/saveOrUpdate")
-    @ResponseBody
-    public Message saveOrUpdate(@RequestBody SysConf sysConf){
-        try {
-            if (null != sysConf.getId()){
-                SysConf conf = sysConfService.getById(sysConf.getId());
-                //数据库值和前台值相同,直接返回
-                if (conf.getCode().equals(sysConf.getCode()) && conf.getValue().equals(sysConf.getValue())){
-                    return Message.success("保存成功!",null);
-                }
-            }
-            sysConfService.updateSysConfig(sysConf);
-            return Message.success("保存成功!",null);
-        }catch (Exception e){
-            logger.error("配置是否运行主机重复注册、数据传输加密保存修改配置出现异常:{}",e);
-            return Message.error("保存失败!");
-        }
-    }
-}

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/dao/SysConfDao.java

@@ -7,5 +7,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SysConfDao extends BaseMapper<SysConf> {
 
-    SysConf getByCode(String code);
+    SysConf getByConfigKey(String configKey);
 }

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppInfo.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_app_info")
+@TableName("deploy_app_info")
 @ApiModel(value="AppInfo对象", description="")
 public class AppInfo implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppInfoExtend.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_app_info_extend")
+@TableName("deploy_app_info_extend")
 @ApiModel(value="AppInfoExtend对象", description="")
 public class AppInfoExtend implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppRunInfo.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_app_run_info")
+@TableName("deploy_app_run_info")
 @ApiModel(value="AppRunInfo对象", description="")
 public class AppRunInfo {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/AppRunInfoExtend.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_app_run_info_extend")
+@TableName("deploy_app_run_info_extend")
 @ApiModel(value="AppRunInfoExtend对象", description="")
 public class AppRunInfoExtend {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/BatchHostInfo.java

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_batch_host_info")
+@TableName("deploy_batch_host_info")
 @ApiModel(value="BatchHostInfo对象", description="")
 public class BatchHostInfo implements Serializable{
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/FrontTask.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_front_task")
+@TableName("deploy_front_task")
 @ApiModel(value="FrontTask对象", description="")
 public class FrontTask implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/HostInfo.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_host_info")
+@TableName("deploy_host_info")
 @ApiModel(value="HostInfo对象", description="")
 public class HostInfo implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/HostZipInfo.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_host_zip_info")
+@TableName("deploy_host_zip_info")
 @ApiModel(value="HostZipInfo对象", description="")
 public class HostZipInfo implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/OperationLog.java

@@ -16,7 +16,7 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_operation_log")
+@TableName("deploy_operation_log")
 @ApiModel(value="日志对象", description="")
 public class OperationLog implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/OperationParam.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_operation_param")
+@TableName("deploy_operation_param")
 @ApiModel(value="OperationParam对象", description="")
 public class OperationParam implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/PackageInfo.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-@TableName("t_package_info")
+@TableName("deploy_package_info")
 public class PackageInfo implements Serializable {
     private static final long serialVersionUID = 871349870326625677L;
     /**

+ 15 - 10
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/SysConf.java

@@ -1,6 +1,7 @@
 package com.xunmei.deploy.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -12,18 +13,22 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_sys_conf")
+@TableName("sys_config")
 @ApiModel(value="SysConf对象", description="")
 public class SysConf implements Serializable {
 
     private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    private String code;
-
-    private String value;
-
-    private Date createTime;
+    /** 参数主键 */
+    @TableId(value = "config_id", type = IdType.AUTO)
+    private Long configId;
+    /** 参数名称 */
+    private String configName;
+    /** 参数键名 */
+    private String configKey;
+    /** 参数键值 */
+    private String configValue;
+    /** 系统内置(Y是 N否) */
+    private String configType;
+    /**  备注 */
+    private String remark;
 }

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeBatchInfo.java

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_upgrade_batch_info")
+@TableName("deploy_upgrade_batch_info")
 @ApiModel(value="UpgradeBatchInfo对象", description="")
 public class UpgradeBatchInfo implements Serializable{
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeTask.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_upgrade_task")
+@TableName("deploy_upgrade_task")
 @ApiModel(value="UpgradeTask对象", description="")
 public class UpgradeTask implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeTaskHis.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_upgrade_task_his")
+@TableName("deploy_upgrade_task_his")
 @ApiModel(value="UpgradeTaskHis对象", description="")
 public class UpgradeTaskHis implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UploadAppInfo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_upload_app_info")
+@TableName("deploy_upload_app_info")
 @ApiModel(value="UploadAppInfo对象", description="")
 public class UploadAppInfo implements Serializable {
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/ZipPackInfo.java

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("t_zip_pack_info")
+@TableName("deploy_zip_pack_info")
 @ApiModel(value="ZipPackInfo对象", description="")
 public class ZipPackInfo {
 

+ 0 - 11
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/SysConfService.java

@@ -1,11 +0,0 @@
-package com.xunmei.deploy.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.deploy.domain.SysConf;
-
-public interface SysConfService extends IService<SysConf> {
-
-    SysConf getByCode(String code);
-
-    void updateSysConfig(SysConf sysConf);
-}

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/BeringServiceImpl.java

@@ -131,8 +131,8 @@ public class BeringServiceImpl  extends ServiceImpl<HostInfoDao, HostInfo> imple
         if (hostInfo == null){
             logger.info("主机获取令牌:表hostInfo中不存在id={}主机(数据库注册数据丢失)",clientSecret);
             //判断是否允许重新注册
-            SysConf sysConf = sysConfDao.getByCode("register_again");
-            if ("1".equals(sysConf.getValue())){
+            SysConf sysConf = sysConfDao.getByConfigKey("DEPLOY_REGISTER_AGAIN");
+            if ("1".equals(sysConf.getConfigValue())){
                 logger.info("主机获取令牌:程序允许主机重新注册,开始注册\n{}",clientSecret,JSON.toJSONString(machineInfo));
                 hostInfo = new HostInfo();
                 hostInfo.setId(code);

+ 4 - 4
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/HostInfoServiceImpl.java

@@ -198,13 +198,13 @@ public class HostInfoServiceImpl extends ServiceImpl<HostInfoDao, HostInfo> impl
         baseMapper.deleteUpgradeTaskHis(hostId);
         logger.info("删除UpgradeTaskHis表数据");
         baseMapper.deleteById(hostId);
-        logger.info("删除 t_host_info 表数据");
+        logger.info("删除 deploy_host_info 表数据");
         baseMapper.deleteAppInfoExtend(hostId);
-        logger.info("删除 t_app_info_extend 表数据");
+        logger.info("删除 deploy_app_info_extend 表数据");
         baseMapper.deleteAppRunInfo(hostId);
-        logger.info("删除 t_app_run_info 表数据");
+        logger.info("删除 deploy_app_run_info 表数据");
         baseMapper.deleteAppRunInfoExtend(hostId);
-        logger.info("删除t_app_run_info_extend 表数据");
+        logger.info("删除deploy_app_run_info_extend 表数据");
 
         //清除缓存
         String result = redisTemplateUtil.get(RedisPrefix.CACHE_TOKENS + ":" + hostId);

+ 0 - 128
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/SysConfServicesImpl.java

@@ -1,128 +0,0 @@
-package com.xunmei.deploy.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.deploy.dao.AppInfoDao;
-import com.xunmei.deploy.dao.AppInfoExtendDao;
-import com.xunmei.deploy.dao.HostInfoDao;
-import com.xunmei.deploy.dao.SysConfDao;
-import com.xunmei.deploy.domain.AppInfo;
-import com.xunmei.deploy.domain.AppInfoExtend;
-import com.xunmei.deploy.domain.HostInfo;
-import com.xunmei.deploy.domain.SysConf;
-import com.xunmei.deploy.enums.EncryptionServiceEnum;
-import com.xunmei.deploy.service.SysConfService;
-import com.xunmei.deploy.util.UTCTimeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Service
-public class SysConfServicesImpl extends ServiceImpl<SysConfDao, SysConf> implements SysConfService {
-
-    private final static String MQCode = "--mqP=";
-
-    @Autowired
-    private HostInfoDao hostInfoDao;
-    @Autowired
-    private AppInfoDao appInfoDao;
-    @Autowired
-    private AppInfoExtendDao appInfoExtendDao;
-
-
-    @Override
-    public SysConf getByCode(String code) {
-        return baseMapper.getByCode(code);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void updateSysConfig(SysConf sysConf) {
-        if (null != sysConf){
-            super.saveOrUpdate(sysConf);
-            if ("encryption_port".equals(sysConf.getCode())){
-                //修改已经加密传输主机启动参数中的mq端口
-                QueryWrapper<HostInfo> wrapper = new QueryWrapper<>();
-                wrapper.eq("encryption",1);
-                List<HostInfo> hostInfoList = hostInfoDao.selectList(wrapper);
-                if (null != hostInfoList && hostInfoList.size() > 0){
-                    for (HostInfo hostInfo: hostInfoList) {
-                        //获取对应主机的应用清单
-                        List<AppInfo> appInfoList = appInfoDao.getByHostInfoId(hostInfo.getId());
-                        if (null != appInfoList && appInfoList.size() > 0){
-                            for (AppInfo appInfo:appInfoList) {
-                                //修改对应应用的启动参数
-                                if (appInfo.getAppId().equals(EncryptionServiceEnum.C3M.getServiceName())
-                                        || appInfo.getAppId().equals(EncryptionServiceEnum.VGS.getServiceName())
-                                        || appInfo.getAppId().equals(EncryptionServiceEnum.NORTH.getServiceName())
-                                        || appInfo.getAppId().equals(EncryptionServiceEnum.VIDEO.getServiceName())){
-
-                                    String appInfoStart = this.updateAppInfoStart(appInfo.getStart(),sysConf.getValue());
-                                    appInfo.setStart(appInfoStart);
-                                    appInfoDao.updateById(appInfo);
-                                }
-                            }
-                        }
-                        //查询appInfoExtend
-                        List<AppInfoExtend> extendList = appInfoExtendDao.getByHostId(hostInfo.getId());
-                        if (null != extendList && extendList.size() > 0){
-                            for (AppInfoExtend extend:extendList) {
-                                //修改对应应用的启动参数
-                                if (extend.getAppId().equals(EncryptionServiceEnum.C3M.getServiceName())
-                                        || extend.getAppId().equals(EncryptionServiceEnum.VIDEO.getServiceName())
-                                        || extend.getAppId().equals(EncryptionServiceEnum.NORTH.getServiceName())
-                                        || extend.getAppId().equals(EncryptionServiceEnum.VGS.getServiceName())){
-
-                                    String appInfoStart = this.updateAppInfoStart(extend.getStart(),sysConf.getValue());
-                                    extend.setStart(appInfoStart);
-                                    appInfoExtendDao.updateById(extend);
-                                }
-                            }
-                        }
-
-                        //修改主机两个时间戳
-                        if (hostInfo.getFrontTimeStamp() != 0 && hostInfo.getCoreTimeStamp() != 0){
-                            long utcStr2Long = UTCTimeUtils.getUtcStr2Long(UTCTimeUtils.getUTCTimeStr());
-                            hostInfo.setFrontTimeStamp(utcStr2Long);
-                            hostInfo.setCoreTimeStamp(utcStr2Long);
-                            hostInfoDao.updateById(hostInfo);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private String updateAppInfoStart(String startStr,String encryptionPort) {
-        JSONObject jsonObject = (JSONObject) JSONObject.parse(startStr);
-        String jsonStr = jsonObject.getString("command");
-        List<String> commandList = JSONArray.parseArray(jsonStr, String.class);
-
-        //启动参数中是否有相同参数
-        boolean paramFlag = false;
-        //相同参数的index
-        int index = 0;
-
-        for (int j = 0; j < commandList.size(); j++) {
-            String str = commandList.get(j);
-            if (StringUtils.isNotEmpty(str) && str.indexOf(MQCode) != -1){
-                paramFlag = true;
-                index = j;
-            }
-        }
-
-        //有相同的就修改,没有就添加
-        if (paramFlag){
-            commandList.set(index,MQCode+encryptionPort);
-        }else {
-            commandList.add(MQCode+encryptionPort);
-        }
-        jsonObject.put("command",commandList);
-
-        return jsonObject.toJSONString();
-    }
-}

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/UploadAppInfoServiceImpl.java

@@ -198,7 +198,7 @@ public class UploadAppInfoServiceImpl extends ServiceImpl<UploadAppInfoDao, Uplo
         JSONObject packageJson = JsonUtils.getJsonFile(resolvePath + PACKAGE_SIGN);
         JSONObject appJson = JsonUtils.getJsonFile(resolvePath + APP_DESCRIPTION);
 
-        //解析json字符串,构建t_upload_app_info 数据
+        //解析json字符串,构建deploy_upload_app_info 数据
         UploadAppInfo uploadAppInfo = jsonToObject(packageJson, appJson,path);
 
         //先查询是否存在这个版本的zip安装包信息
@@ -372,7 +372,7 @@ public class UploadAppInfoServiceImpl extends ServiceImpl<UploadAppInfoDao, Uplo
         JSONObject packageJson = JsonUtils.getJsonFile(signJsonPath);
         JSONObject appJson = JsonUtils.getJsonFile(appJsonPath);
 
-        //解析json字符串,构建t_upload_app_info 数据
+        //解析json字符串,构建deploy_upload_app_info 数据
         UploadAppInfo uploadAppInfo = jsonToObject(packageJson, appJson);
 
         //移动publish.zip

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/resources/mapper/AppInfoDao.xml

@@ -20,8 +20,8 @@
         t.start,
         a.hotfixes as hotfixes
         FROM
-        t_app_info t
-        LEFT JOIN t_app_run_info a ON a.`code` = t.`code` AND a.host_id = t.host_info_id
+        deploy_app_info t
+        LEFT JOIN deploy_app_run_info a ON a.`code` = t.`code` AND a.host_id = t.host_info_id
         <where>
             <if test="hostInfoId != '' and hostInfoId != null">
                 t.host_info_id = #{hostInfoId}

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/resources/mapper/AppRunInfoDao.xml

@@ -24,8 +24,8 @@
             t.host_id AS hsotId,
             t.hotfixes
         FROM
-            t_app_run_info t
-            LEFT JOIN t_app_info a ON t.`code` = a.`code` AND t.host_id = a.host_info_id
+            deploy_app_run_info t
+            LEFT JOIN deploy_app_info a ON t.`code` = a.`code` AND t.host_id = a.host_info_id
             <where>
                 <if test="hostId != '' and hostId != null">
                     t.host_id = #{hostId}

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/resources/mapper/AppinfoExtendDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xunmei.deploy.dao.AppInfoExtendDao">
 
     <select id="getByHostId" resultType="com.xunmei.deploy.domain.AppInfoExtend">
-        select * from t_app_info_extend t where t.host_info_id = #{hostId}
+        select * from deploy_app_info_extend t where t.host_info_id = #{hostId}
     </select>
 
 </mapper>

+ 4 - 4
soc-modules/soc-modules-deploy/src/main/resources/mapper/BatchHostInfoDao.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.xunmei.deploy.dao.BatchHostInfoDao">
 
     <select id="selectPage"  resultType="com.xunmei.deploy.domain.BatchHostInfo">
-        select t.*,t1.zip_version from t_batch_host_info t
-        left join t_upgrade_batch_info t1 on t1.id = t.batch_id
+        select t.*,t1.zip_version from deploy_batch_host_info t
+        left join deploy_upgrade_batch_info t1 on t1.id = t.batch_id
         <where>
             <if test="batchId != '' and batchId != null">
                 t.batch_id = #{batchId}
@@ -19,8 +19,8 @@
     </select>
 
     <select id="selectListInfo" resultType="com.xunmei.deploy.domain.BatchHostInfo">
-        select t.*,t1.zip_version from t_batch_host_info t
-        left join t_upgrade_batch_info t1 on t1.id = t.batch_id
+        select t.*,t1.zip_version from deploy_batch_host_info t
+        left join deploy_upgrade_batch_info t1 on t1.id = t.batch_id
         <where>
             <if test="batchId != '' and batchId != null">
                 t.batch_id = #{batchId}

+ 18 - 18
soc-modules/soc-modules-deploy/src/main/resources/mapper/HostInfoDao.xml

@@ -9,10 +9,10 @@
         h.org_id AS hostOrg,h.org_name AS hostOrgName,h.coreTimeStamp,
         t.register_date as registerDateTime,t.encryption,
         z.zip_version as zipVersion,z.target_version as targetVersion,z.status as updateStatus,
-        IF ((( SELECT COUNT(*) FROM t_app_run_info WHERE app_type != 'Tool' and host_id = t.id AND running = 0 ) &lt; 1), 1, 0) AS serverStatus
-        FROM t_host_info t
+        IF ((( SELECT COUNT(*) FROM deploy_app_run_info WHERE app_type != 'Tool' and host_id = t.id AND running = 0 ) &lt; 1), 1, 0) AS serverStatus
+        FROM deploy_host_info t
         LEFT JOIN hv_host_org h ON t.id = h.register_code
-        LEFT JOIN t_host_zip_info z on t.id = z.host_id
+        LEFT JOIN deploy_host_zip_info z on t.id = z.host_id
         <where>
             <if test="infoVo.zipVersion != '' and infoVo.zipVersion != null">
                 z.zip_version = #{infoVo.zipVersion}
@@ -77,47 +77,47 @@
                 z.target_version as targetVersion,
                 z.status as updateStatus,
                 t.encryption,
-                IF ((( SELECT COUNT(*) FROM t_app_run_info WHERE app_type != 'Tool' and host_id = t.id AND running = 0 ) &lt; 1), 1, 0) AS serverStatus
+                IF ((( SELECT COUNT(*) FROM deploy_app_run_info WHERE app_type != 'Tool' and host_id = t.id AND running = 0 ) &lt; 1), 1, 0) AS serverStatus
             FROM
-                t_host_info t
+                deploy_host_info t
                 LEFT JOIN hv_host_org h ON t.id = h.register_code
-                LEFT JOIN t_host_zip_info z on t.id = z.host_id
+                LEFT JOIN deploy_host_zip_info z on t.id = z.host_id
             where t.id = #{id}
     </select>
 
     <delete id="deleteAppInfo">
-        delete from t_app_info where host_info_id = #{hostId};
+        delete from deploy_app_info where host_info_id = #{hostId};
     </delete>
     <delete id="deleteFrontTask">
-        delete from t_front_task where host_id = #{hostId};
+        delete from deploy_front_task where host_id = #{hostId};
     </delete>
     <delete id="deleteHostZipInfo">
-        delete from t_host_zip_info where host_id = #{hostId};
+        delete from deploy_host_zip_info where host_id = #{hostId};
     </delete>
     <delete id="deleteUpgradeTask">
-        delete from t_upgrade_task where host_id = #{hostId};
+        delete from deploy_upgrade_task where host_id = #{hostId};
     </delete>
     <delete id="deleteUpgradeTaskHis">
-        delete from t_upgrade_task_his where host_id = #{hostId};
+        delete from deploy_upgrade_task_his where host_id = #{hostId};
     </delete>
     <delete id="deleteAppInfoExtend">
-        delete from t_app_info_extend where host_info_id = #{hostId};
+        delete from deploy_app_info_extend where host_info_id = #{hostId};
     </delete>
     <delete id="deleteAppRunInfo">
-        delete from t_app_run_info where host_id = #{hostId};
+        delete from deploy_app_run_info where host_id = #{hostId};
     </delete>
     <delete id="deleteAppRunInfoExtend">
-        delete from t_app_run_info_extend where host_id = #{hostId};
+        delete from deploy_app_run_info_extend where host_id = #{hostId};
     </delete>
     <delete id="deleteBatchHostInfo">
-        delete from t_batch_host_info where host_id = #{hostId};
+        delete from deploy_batch_host_info where host_id = #{hostId};
     </delete>
 
     <select id="selectByOrg" resultType="com.xunmei.deploy.domain.HostInfo">
         select h.id,h.hostName,h.hostIp,h.hostSystem,h.hostFrame,h.hostMac,h.hostOrg,
         h.hostStatus,h.accessToken,h.expiresIn,h.tokenType,h.scope,h.agentVersion,
         h.isPush,h.tokenCreateTime,h.coreTimeStamp,h.frontTimeStamp,h.upload_version,h.encryption
-        from t_host_info h
+        from deploy_host_info h
         left join hv_host_org v on h.id = v.register_code
         left join hv_org o on v.org_id = o.org_id
         where 1 =1
@@ -141,9 +141,9 @@
     <select id="selectPage" resultType="com.xunmei.deploy.vo.HostInfoVo">
         SELECT
         h.id,h.hostName,h.hostIp,h.hostSystem,h.hostFrame,h.hostMac,h.hostOrg,h.hostStatus,h.accessToken,h.expiresIn,h.tokenType,h.scope,h.agentVersion,
-        if(h.agentVersion=(SELECT h.agentVersion as version FROM t_host_info  UNION SELECT package_version as version FROM t_package_info order by version DESC limit 1 ),0,1) as upgradeFlag,
+        if(h.agentVersion=(SELECT h.agentVersion as version FROM deploy_host_info  UNION SELECT package_version as version FROM deploy_package_info order by version DESC limit 1 ),0,1) as upgradeFlag,
         h.isPush,h.tokenCreateTime, h.coreTimeStamp,h.frontTimeStamp,h.upload_version,h.encryption,v.org_name AS orgName
-        FROM t_host_info h
+        FROM deploy_host_info h
         LEFT JOIN hv_host_org v ON h.id = v.register_code
         LEFT JOIN hv_org o ON v.org_id = o.org_id
         <where>

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/resources/mapper/HostZipInfoDao.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.xunmei.deploy.dao.HostZipInfoDao">
 
     <select id="selectOldList" resultType="java.lang.String">
-        select zip_version from t_host_zip_info GROUP BY zip_version ORDER BY zip_version
+        select zip_version from deploy_host_zip_info GROUP BY zip_version ORDER BY zip_version
     </select>
 
     <select id="selectTargetList" resultType="java.lang.String">
-        select zip_version from t_zip_pack_info GROUP BY zip_version ORDER BY zip_version desc
+        select zip_version from deploy_zip_pack_info GROUP BY zip_version ORDER BY zip_version desc
     </select>
 
 

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/resources/mapper/OperationLogDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xunmei.deploy.dao.OperationLogDao">
 
     <select id="selectPage"  resultType="com.xunmei.deploy.domain.OperationLog">
-        select * from t_operation_log h where 1=1
+        select * from deploy_operation_log h where 1=1
         <if test="info.startDate != null and info.startDate != ''">
         and h.opera_time >= #{info.startDate}
         </if>

+ 4 - 4
soc-modules/soc-modules-deploy/src/main/resources/mapper/PackageInfoDao.xml

@@ -13,14 +13,14 @@
             package_version,
             upload_time
         FROM
-            t_package_info
+            deploy_package_info
             order by upload_time desc
     </select>
 
     <select id="selectAgentVersion" resultType="java.lang.String">
-        SELECT agentVersion as version FROM t_host_info
+        SELECT agentVersion as version FROM deploy_host_info
         UNION
-        SELECT package_version as version FROM t_package_info
+        SELECT package_version as version FROM deploy_package_info
         order by version DESC;
     </select>
 
@@ -35,7 +35,7 @@
             package_version,
             upload_time
         FROM
-            t_package_info
+            deploy_package_info
             order by package_version desc
     </select>
 

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/resources/mapper/SysConfDao.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.deploy.dao.SysConfDao">
 
-    <select id="getByCode" resultType="com.xunmei.deploy.domain.SysConf">
-        select id,code,`value`,create_time from t_sys_conf where code = #{code}
+    <select id="getByConfigKey" resultType="com.xunmei.deploy.domain.SysConf">
+        select config_id,config_name,config_key,config_value,config_type,remark from sys_config where config_key = #{configKey} limit 1;
     </select>
 
 </mapper>

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/resources/mapper/UpgradeBatchInfoDao.xml

@@ -15,7 +15,7 @@
             t.status,
             t.finish_time,
             z.host_type_name
-        from t_upgrade_batch_info t left join t_zip_pack_info z ON t.zip_id = z.id
+        from deploy_upgrade_batch_info t left join deploy_zip_pack_info z ON t.zip_id = z.id
         where 1=1
         <if test="info.batchCode != null and info.batchCode != ''">
             and t.batch_code like concat('%',#{info.batchCode},'%')

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/resources/mapper/UpgradeTaskDao.xml

@@ -4,9 +4,9 @@
 
     <select id="batchTask" resultType="com.xunmei.deploy.domain.UpgradeTask">
         select * from (
-            select * from t_upgrade_task
+            select * from deploy_upgrade_task
             UNION ALL
-            SELECT * from t_upgrade_task_his
+            SELECT * from deploy_upgrade_task_his
         ) a
         where 1=1
         and a.host_id = #{hostId}

+ 2 - 2
soc-modules/soc-modules-deploy/src/main/resources/mapper/ZipPackInfoDao.xml

@@ -16,7 +16,7 @@
         zip_name,
         host_type,
         host_type_name
-      from t_zip_pack_info
+      from deploy_zip_pack_info
       where 1=1
       <if test="info.zipVersion != null and info.zipVersion != ''">
           and zip_version like concat('%',#{info.zipVersion},'%')
@@ -33,7 +33,7 @@
     <select id="selectHostType" resultType="java.lang.String">
         select
             host_type_name
-        from t_zip_pack_info where host_type_name !="" or host_type_name != null
+        from deploy_zip_pack_info where host_type_name !="" or host_type_name != null
         group by host_type_name
     </select>