V2

README.md

@@ -1,75 +1,5 @@
-# deploy_one
-## 脚本说明
-### 全新系统
-1. `sudo ./deploy_one_cloud.sh ip port`
-### php老数据迁移
-1. `sudo ./deploy_one_cloud.sh ip port`
-2. 挂载旧数据(`uploads` 和 `database`)
-3. `sudo ./unserialize_ccloud.sh`
+install/updates steps:
+#1 complete the configuration to fix your webapp : `vim config`
+#2 execute shell : `sh install.sh`
 
-## 修改记录
-> ***2020年5月22日***
->> `nginx/ssl_myconf.conf`,`nginx/myconf.conf`
->>> 增加代理获取截图的配置
 
-> ***2020年5月21日***
->> 新增`db_spring/update_lining_gps_tag_ccloud.sql`
->>> - 增加李宁表`device_status`,`device_info`
->>> - 增加素材标签表`wp_media_custom_tag_record`,`wp_custom_tag`
->>> - 增加素材分享表`wp_share_relationships`,`wp_media_share_record`
->>> - 增加节目特性表`wp_program_feature`
->>> - 增减GPS分表字段
-
->> 新增`add_tables_lining_gps_tag_share_ccloud.sh`建表脚本
-
->> `app/application.yml`增减配置项
->>> `camera-shot.clean.time-range: 10`
-
-> ***2020年3月30日***
->> `deploy_one_cloud.sh`
->>> 删除睡眠300s，增加重启one-mysql
-
->> `ws/application.yml`
->>> 增加websocket配置文件
-
->> `redis/application.yml`
->>> 增加redis配置文件 
-
->> unserialize
->>> - 修改节目中间表转换脚本,增加一种新格式的转换: {"index":"id"}
->>> - `unserialize/ccloud_parse_program_relationships_table.php`
->>> - `unserialize/spring_parse_program_relationships_table.php`
-
-
-
-
-> ***2020年3月23日***
->> `deploy_one_cloud.sh`
->>> 运行one-mysql后增加睡眠300s,等待one-mysql初始化
-
->> `nginx/myconf.conf`
->>> 增加天气请求转发
-
->> `nginx/ssl_myconf.conf`
->>> 增加雅虎天气请求转发
-
-> ***2020年3月20日***
->> `application.yml`
->>> - 增加`device.report.time`
->>> - 增加`request.check.timeout`
->>> - 修改日志级别
-
->> unserialize
->>> - 增加将_terminal_group和_terminal_led解析到新的节目关系表(wp_group_program,wp_terminal_program)的脚本
->>> - `unserialize/ccloud_parse_program_relationships_table.php`
->>> - `unserialize/spring_parse_program_relationships_table.php`
-
->> db_spring
->>> `db_spring/fetch_unserialize_ccloud.sql`增加节目关系表的创建
->>> `db_spring/spring.sql`增加节目关系表的创建
-
->> `deploy_one_cloud.sh`
->>> 增加解析节目关系的语句
-
->> `unserialize_ccloud.sh`
->>> 增加解析节目关系的语句

add_table.sh

@@ -0,0 +1,24 @@
+if [ $# -ne "2" ]
+then
+    echo "Usage: $(basename $0) database sql_file"
+    exit 1
+fi
+
+deploy_path=`pwd`
+database=$1
+sql_file=$2
+password=colorlight
+
+if [ ! -e $deploy_path/db_spring/$sql_file ]; then
+  echo "error: can not find sql file [$sql_file] in [db_spring] folder"
+  exit 1
+else
+  cp $deploy_path/db_spring/$sql_file $deploy_path/mysql/data
+fi
+
+if [ $database = "ccloud" ]; then
+    password=kS4pKJF_3kfdsfOoJ
+fi
+
+docker exec -i one-mysql bash -c "mysql -u root -p${password} <<< 'source /var/lib/mysql/${sql_file}'"
+

config

@@ -0,0 +1,14 @@
+#configuration for you apps
+#应用通用配置
+_address=
+_port=80
+_open_ssl=false
+_port_websocket=8443
+
+#docker services image version
+#docker镜像版本配置
+_one_app=v5.1.200929-548
+_one_nginx=v2.5.6-200928-143
+_one_redis=v1.0
+_one_ws=v2.4
+_one_mysql=v1.2

db_spring/add_heatmap_offline_ccloud.sql

@@ -0,0 +1,47 @@
+/*
+ Date: 01/08/2020 10:38:35
+*/
+use `ccloud`;
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for clt_heat_map_count
+-- ----------------------------
+DROP TABLE IF EXISTS `clt_heat_map_count`;
+CREATE TABLE `clt_heat_map_count`  (
+  `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `heat_map_search_index` bigint(20) NOT NULL COMMENT 'clt_heat_map_search_index表主键',
+  `gps_lng_range` decimal(10, 5) NOT NULL COMMENT 'gps经度范围',
+  `gps_lat_range` decimal(10, 5) NOT NULL COMMENT 'gps维度范围',
+  `count` bigint(20) NULL DEFAULT NULL COMMENT '数量统计',
+  PRIMARY KEY (`ID`) USING BTREE,
+  UNIQUE INDEX `heat_map_count_update_index`(`heat_map_search_index`, `gps_lng_range`, `gps_lat_range`) USING BTREE COMMENT '更新count的查询索引'
+) ENGINE = InnoDB AUTO_INCREMENT = 889 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for clt_heat_map_search_index
+-- ----------------------------
+DROP TABLE IF EXISTS `clt_heat_map_search_index`;
+CREATE TABLE `clt_heat_map_search_index`  (
+  `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `term_id` bigint(20) NULL DEFAULT NULL COMMENT '终端组ID',
+  `date` date NULL DEFAULT NULL,
+  `hour_num` tinyint(2) NULL DEFAULT -1 COMMENT '表示一天的第几个小时',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 250 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for device_offline_record
+-- ----------------------------
+DROP TABLE IF EXISTS `device_offline_record`;
+CREATE TABLE `device_offline_record`  (
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `post_id` bigint(20) NOT NULL COMMENT '终端id',
+  `start_timestamp` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '某天0:00对应的时间戳',
+  `offline_time` bigint(20) NOT NULL COMMENT '离线时长，单位s',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `postId_startTimestamp`(`post_id`, `start_timestamp`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3150 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

db_spring/add_heatmap_offline_spring.sql

@@ -0,0 +1,47 @@
+/*
+ Date: 01/08/2020 10:38:35
+*/
+use `spring`;
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for clt_heat_map_count
+-- ----------------------------
+DROP TABLE IF EXISTS `clt_heat_map_count`;
+CREATE TABLE `clt_heat_map_count`  (
+  `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `heat_map_search_index` bigint(20) NOT NULL COMMENT 'clt_heat_map_search_index表主键',
+  `gps_lng_range` decimal(10, 5) NOT NULL COMMENT 'gps经度范围',
+  `gps_lat_range` decimal(10, 5) NOT NULL COMMENT 'gps维度范围',
+  `count` bigint(20) NULL DEFAULT NULL COMMENT '数量统计',
+  PRIMARY KEY (`ID`) USING BTREE,
+  UNIQUE INDEX `heat_map_count_update_index`(`heat_map_search_index`, `gps_lng_range`, `gps_lat_range`) USING BTREE COMMENT '更新count的查询索引'
+) ENGINE = InnoDB AUTO_INCREMENT = 889 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for clt_heat_map_search_index
+-- ----------------------------
+DROP TABLE IF EXISTS `clt_heat_map_search_index`;
+CREATE TABLE `clt_heat_map_search_index`  (
+  `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `term_id` bigint(20) NULL DEFAULT NULL COMMENT '终端组ID',
+  `date` date NULL DEFAULT NULL,
+  `hour_num` tinyint(2) NULL DEFAULT -1 COMMENT '表示一天的第几个小时',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 250 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for device_offline_record
+-- ----------------------------
+DROP TABLE IF EXISTS `device_offline_record`;
+CREATE TABLE `device_offline_record`  (
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `post_id` bigint(20) NOT NULL COMMENT '终端id',
+  `start_timestamp` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '某天0:00对应的时间戳',
+  `offline_time` bigint(20) NOT NULL COMMENT '离线时长，单位s',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `postId_startTimestamp`(`post_id`, `start_timestamp`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3150 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

db_spring/add_new_monitor_ccloud.sql

@@ -0,0 +1,110 @@
+use `ccloud`;
+
+-- 存储过程用于创建wp_clt_noise的128张表
+DELIMITER //
+DROP PROCEDURE IF EXISTS createTable;
+CREATE PROCEDURE createTable ()
+BEGIN
+	DECLARE table_prefix_noise VARCHAR ( 30 );
+	DECLARE table_number INT DEFAULT 0;
+	DECLARE table_name VARCHAR ( 30 );
+	DECLARE sql_text1 VARCHAR ( 2000 );
+	SET table_prefix_noise = 'wp_clt_noise';
+	WHILE
+			table_number < 128 DO
+
+		SET table_name = CONCAT( table_prefix_noise, table_number );
+		SET @sql_text1 = CONCAT('CREATE TABLE ', table_name, ' (
+			`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+			`led_id` int(11) NOT NULL,
+			`sensorId` int(3) NOT NULL DEFAULT \'1\',
+			`sensorType` varchar(20) COLLATE utf8mb4_unicode_520_ci NOT NULL,
+			`sensorValue` float NOT NULL,
+			`date` datetime NOT NULL,
+			`server_time` datetime NOT NULL,
+			PRIMARY KEY (`id`) USING BTREE,
+			KEY `monitor_ledid` (`led_id`) USING BTREE
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci ROW_FORMAT=DYNAMIC' );
+		PREPARE stmt FROM @sql_text1;
+		EXECUTE stmt;
+		DEALLOCATE PREPARE stmt;
+
+		SET table_number = table_number + 1;
+	END WHILE;
+
+END //
+DELIMITER ;
+CALL createTable ();
+
+
+-- 存储过程用于创建wp_clt_pm25的128张表
+DELIMITER //
+DROP PROCEDURE IF EXISTS createTablePm25;
+CREATE PROCEDURE createTablePm25 ()
+BEGIN
+	DECLARE table_prefix_noise VARCHAR ( 30 );
+	DECLARE table_number INT DEFAULT 0;
+	DECLARE table_name VARCHAR ( 30 );
+	DECLARE sql_text1 VARCHAR ( 2000 );
+	SET table_prefix_noise = 'wp_clt_pm25_';
+	WHILE
+			table_number < 128 DO
+
+		SET table_name = CONCAT( table_prefix_noise, table_number );
+		SET @sql_text1 = CONCAT('CREATE TABLE ', table_name, ' (
+			`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+			`led_id` int(11) NOT NULL,
+			`sensorId` int(3) NOT NULL DEFAULT \'1\',
+			`sensorType` varchar(20) COLLATE utf8mb4_unicode_520_ci NOT NULL,
+			`sensorValue` float NOT NULL,
+			`date` datetime NOT NULL,
+			`server_time` datetime NOT NULL,
+			PRIMARY KEY (`id`) USING BTREE,
+			KEY `monitor_ledid` (`led_id`) USING BTREE
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci ROW_FORMAT=DYNAMIC' );
+		PREPARE stmt FROM @sql_text1;
+		EXECUTE stmt;
+		DEALLOCATE PREPARE stmt;
+
+		SET table_number = table_number + 1;
+	END WHILE;
+
+END //
+DELIMITER ;
+CALL createTablePm25 ();
+
+-- 存储过程用于创建wp_clt_pm10的128张表
+DELIMITER //
+DROP PROCEDURE IF EXISTS createTablePm10;
+CREATE PROCEDURE createTablePm10 ()
+BEGIN
+	DECLARE table_prefix_noise VARCHAR ( 30 );
+	DECLARE table_number INT DEFAULT 0;
+	DECLARE table_name VARCHAR ( 30 );
+	DECLARE sql_text1 VARCHAR ( 2000 );
+	SET table_prefix_noise = 'wp_clt_pm10_';
+	WHILE
+			table_number < 128 DO
+
+		SET table_name = CONCAT( table_prefix_noise, table_number );
+		SET @sql_text1 = CONCAT('CREATE TABLE ', table_name, ' (
+			`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+			`led_id` int(11) NOT NULL,
+			`sensorId` int(3) NOT NULL DEFAULT \'1\',
+			`sensorType` varchar(20) COLLATE utf8mb4_unicode_520_ci NOT NULL,
+			`sensorValue` float NOT NULL,
+			`date` datetime NOT NULL,
+			`server_time` datetime NOT NULL,
+			PRIMARY KEY (`id`) USING BTREE,
+			KEY `monitor_ledid` (`led_id`) USING BTREE
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci ROW_FORMAT=DYNAMIC' );
+		PREPARE stmt FROM @sql_text1;
+		EXECUTE stmt;
+		DEALLOCATE PREPARE stmt;
+
+		SET table_number = table_number + 1;
+	END WHILE;
+
+END //
+DELIMITER ;
+CALL createTablePm10 ();