diff --git a/docs/Deploy.md b/docs/Deploy.md index 0517d67..cbbc69e 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -242,6 +242,11 @@ npm install pm2 start npm --name "taoyao-media-server" -- run dev | release pm2 save +# 配置ecosystem +pm2 ecosystem +pm2 start | reload ecosystem.config.json +pm2 save + # 管理服务 pm2 start | stop | restart taoyao-media-server ``` @@ -353,8 +358,6 @@ firewall-cmd --list-ports ## 证书 -正式环境建议关闭项目`SSL`配置,可以使用`Nginx`配置证书。 - ``` keytool -genkeypair -keyalg RSA -dname "CN=localhost, OU=acgist, O=taoyao, L=GZ, ST=GD, C=CN" -alias taoyao -validity 3650 -ext ku:c=dig,keyE -ext eku=serverAuth -ext SAN=dns:localhost,ip:127.0.0.1 -keystore taoyao.jks -keypass 123456 -storepass 123456 ``` diff --git a/taoyao-client-web/README.md b/taoyao-client-web/README.md index 8586219..81d5ec2 100644 --- a/taoyao-client-web/README.md +++ b/taoyao-client-web/README.md @@ -1,3 +1,7 @@ # Web终端 注意部分`API`需要`localhost`或者`https` + +## TODO + +按钮:选择房间、媒体服务、开关 diff --git a/taoyao-client-web/src/App.vue b/taoyao-client-web/src/App.vue index ce548ef..0aff1df 100644 --- a/taoyao-client-web/src/App.vue +++ b/taoyao-client-web/src/App.vue @@ -1,11 +1,10 @@ diff --git a/taoyao-client-web/src/components/Logger.js b/taoyao-client-web/src/components/Logger.js deleted file mode 100644 index ba5876a..0000000 --- a/taoyao-client-web/src/components/Logger.js +++ /dev/null @@ -1,94 +0,0 @@ -/** - * 日志 - */ -import moment from "moment"; -import { config } from "./Config.js"; - -/** - * 日志 - */ -class Logger { - constructor(prefix = "") { - if (prefix) { - this.name = this.name + " : " + prefix; - } - } - - // 名称 - name = config.name; - // 级别 - level = ["DEBUG", "INFO", "WARN", "ERROR", "OFF"]; - // 级别索引 - levelIndex = this.level.indexOf(config.logLevel.toUpperCase()); - - /** - * debug - * - * @param {...any} args 参数 - * - * @returns this - */ - debug(...args) { - return this.log(console.debug, "37m", "DEBUG", args); - } - - /** - * info - * - * @param {...any} args 参数 - * - * @returns this - */ - info(...args) { - return this.log(console.info, "32m", "INFO", args); - } - - /** - * warn - * - * @param {...any} args 参数 - * - * @returns this - */ - warn(...args) { - return this.log(console.warn, "33m", "WARN", args); - } - - /** - * error - * - * @param {...any} args 参数 - * - * @returns this - */ - error(...args) { - return this.log(console.error, "31m", "ERROR", args); - } - - /** - * 日志 - * - * @param {*} out 输出 - * @param {*} color 颜色 - * @param {*} level 级别 - * @param {*} args 参数 - * - * @returns this - */ - log(out, color, level, args) { - if (!args || this.level.indexOf(level) < this.levelIndex) { - return this; - } - if (args.length > 1 && args[0].length > 0) { - out(`\x1B[${color}${this.name} ${moment().format("yyyy-MM-DD HH:mm:ss")} : [${level.padEnd(5, " ")}] :\x1B[0m`, args); - } else if (args.length === 1 && args[0].length > 0) { - out(`\x1B[${color}${this.name} ${moment().format("yyyy-MM-DD HH:mm:ss")} : [${level.padEnd(5, " ")}] :\x1B[0m`, args); - } else { - // 其他情况直接输出换行 - out(""); - } - return this; - } -} - -export { Logger }; diff --git a/taoyao-client-web/src/components/SettingRoom.vue b/taoyao-client-web/src/components/SettingRoom.vue index 85d60b4..c0a34f9 100644 --- a/taoyao-client-web/src/components/SettingRoom.vue +++ b/taoyao-client-web/src/components/SettingRoom.vue @@ -1,34 +1,35 @@