Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-03-04 bb50a243145dba2b3bf5f3bf225c63a092697a16

 sql/mysql.sql

@@ -389,7 +389,7 @@
CREATE TABLE `platform_gb_stream` (
                                      `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
                                      `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
                                      `gbStreamId` int NOT NULL,
                                      `gbStreamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
                                      `id` int NOT NULL AUTO_INCREMENT,
                                      PRIMARY KEY (`id`),
                                      UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
@@ -415,7 +415,9 @@
CREATE TABLE `stream_proxy` (
                                `id` int NOT NULL AUTO_INCREMENT,
                                `type` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
                                `name` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
                                `app` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
                                `name` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
                                `stream` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
                                `url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
                                `src_url` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,