Skip to content

broadcast_cloud / web-live

Go to a project
Commit 4ab07fef by MichaelJier
Options

private 

1. 多私有化配置改造，升级uploader
parent c3f01c09
Showing with 132 additions and 32 deletions
build.yml
# build.yml # build.yml
version: 0.1 version: 0.1
config: cmcc:
config:
spa: false spa: false
ssr: true ssr: true
folder: nuxt-dist folder: nuxt-dist
proxy: http://172.17.0.1:3000 proxy: http://172.17.0.1:3000
server: /web\.guangdianyun\.tv/ server: /web\.guangdianyun\.tv/
target: target:
project: Web project: Web
location: live location: live
command:
build: build:cm
vvku:
config:
spa: false
ssr: true
folder: nuxt-dist
proxy: http://172.17.0.1:3000
server: /web\.vvku\.tv/
target:
project: Web
location: live
command:
build: build:vvku
\ No newline at end of file
pDockerfile → cmDockerfile
...@@ -11,8 +11,8 @@ ENV TZ Asia/Shanghai ...@@ -11,8 +11,8 @@ ENV TZ Asia/Shanghai
WORKDIR /var/www/web_live WORKDIR /var/www/web_live
COPY --from=builder /home/app/package.json ./package.json COPY --from=builder /home/app/package.json ./package.json
COPY --from=builder /home/app/node_modules ./node_modules COPY --from=builder /home/app/node_modules ./node_modules
RUN yarn build:private RUN yarn build:cm
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 3000 EXPOSE 3000
RUN chmod +x pStart.sh RUN chmod +x cmStart.sh
ENTRYPOINT ["./pStart.sh"] ENTRYPOINT ["./cmStart.sh"]
pStart.sh → cmStart.sh
#!/bin/sh #!/bin/sh
yarn run pm2:private yarn run pm2:cm
while true while true
do do
......
components/modules-pc/sendBox/index.vue
...@@ -152,11 +152,7 @@ export default { ...@@ -152,11 +152,7 @@ export default {
return false; return false;
} }
if (process.env.private === true) { if (process.env.private === true) {
const uploader = new Uploader.default('cmecloud', { const uploader = new Uploader.default(process.env.uploaderName, process.env.uploaderOptions)
accessKeyId: 'JH948REBJO5CGXZ1FQMH',
accessKeySecret: 'hOIEE5oUCHSScTMggatG2UxwOvEScrcgeoVdCUZt',
endpoint: 'eos-beijing-4.cmecloud.cn'
});
const res = await uploader.openUploader(); const res = await uploader.openUploader();
this._sendPhoto(res); this._sendPhoto(res);
} else { } else {
......
components/modules/sendBox/more.vue
...@@ -143,11 +143,7 @@ export default { ...@@ -143,11 +143,7 @@ export default {
}); });
} else { } else {
if (process.env.private === true) { if (process.env.private === true) {
const uploader = new Uploader.default('cmecloud', { const uploader = new Uploader.default(process.env.uploaderName, process.env.uploaderOptions)
accessKeyId: 'JH948REBJO5CGXZ1FQMH',
accessKeySecret: 'hOIEE5oUCHSScTMggatG2UxwOvEScrcgeoVdCUZt',
endpoint: 'eos-beijing-4.cmecloud.cn'
});
const res = await uploader.openUploader(); const res = await uploader.openUploader();
this._sendPhoto(res); this._sendPhoto(res);
} else { } else {
......
config/private.js → config/cm.private.js
module.exports = { module.exports = {
DEF_DOMAIM: '//cgateway.aodiansoft.com:8680/v1', DEF_DOMAIM: '//cgateway.aodiansoft.com',
DEF_OSS: '//eos-beijing-4.cmecloud.cn/resource', DEF_OSS: '//eos-beijing-4.cmecloud.cn/resource',
DEF_AODIANYUN: 'http://cdn.aodiansoft.com:8680', DEF_AODIANYUN: 'http://cdn.aodiansoft.com:8680',
DEF_S_AODIANYUN: 'https://cdn.aodiansoft.com:843', DEF_S_AODIANYUN: 'https://cdn.aodiansoft.com:843',
HTTPS_PORT: ':843',
HTTP_PORT: ':8680',
X_CA_STAGE: '', X_CA_STAGE: '',
private: true, private: true,
sentryOptions: {} sentryOptions: {},
uploaderName: 'cmecloud',
uploaderOptions: {
accessKeyId: 'JH948REBJO5CGXZ1FQMH',
accessKeySecret: 'hOIEE5oUCHSScTMggatG2UxwOvEScrcgeoVdCUZt',
endpoint: 'eos-beijing-4.cmecloud.cn',
cname: 'false',
multiFiles: true
}
}; };
config/global.js
...@@ -26,12 +26,24 @@ export const sentryOptions = { ...@@ -26,12 +26,24 @@ export const sentryOptions = {
name: packageEnv.name name: packageEnv.name
}; };
export const uploaderOptions = {
accessKeyId: 'LTAIIgVna8MHelpI',
accessKeySecret: 'fqQNjEGxww3ZZJ9GbUfNp2yzsWUcnl',
endpoint: 'oss-cn-hangzhou.aliyuncs.com',
cname: 'false',
multiFiles: true
};
module.exports = { module.exports = {
DEF_DOMAIM: '//apiliveroom.dev.guangdianyun.tv/v1', DEF_DOMAIM: '//apiliveroom.dev.guangdianyun.tv',
DEF_OSS: '//static-pro.guangdianyun.tv', DEF_OSS: '//static-pro.guangdianyun.tv',
DEF_AODIANYUN: '//cdn.aodianyun.com', DEF_AODIANYUN: '//cdn.aodianyun.com',
DEF_S_AODIANYUN: '//cdn.aodianyun.com', DEF_S_AODIANYUN: '//cdn.aodianyun.com',
HTTPS_PORT: '',
HTTP_PORT: '',
X_CA_STAGE: '', X_CA_STAGE: '',
private: false, private: false,
sentryOptions sentryOptions,
uploaderName: 'aliyun',
uploaderOptions
}; };
config/vvku.private.js 0 → 100644
module.exports = {
DEF_DOMAIM: '//cgateway.vvku.com',
DEF_OSS: '//static.vvku.com',
DEF_AODIANYUN: 'http://cdn.aodiansoft.com:8680',
DEF_S_AODIANYUN: 'https://cdn.aodiansoft.com:843',
X_CA_STAGE: '',
private: true,
sentryOptions: {},
uploaderName: 'aws',
uploaderOptions: {
accessKeyId: 'AKIA27QSGT2TTSQLUVUN',
accessKeySecret: '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',
region: 'cn-northwest-1',
cname: 'gallery.vvku.com',
multiFiles: false
}
};
package.json
...@@ -6,21 +6,29 @@ ...@@ -6,21 +6,29 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "nuxt", "serve": "nuxt",
"serve:private": "cross-env mode=private nuxt", "serve:cm": "cross-env mode=cm.private nuxt",
"serve:vvku": "cross-env mode=vvku.private nuxt",
"serve:pre": "cross-env mode=pre nuxt", "serve:pre": "cross-env mode=pre nuxt",
"serve:test": "cross-env mode=test nuxt", "serve:test": "cross-env mode=test nuxt",
"build": "nuxt build", "build": "nuxt build",
"build:private": "cross-env mode=private nuxt build", "build:cm": "cross-env mode=cm.private nuxt build",
"build:vvku": "cross-env mode=vvku.private nuxt build",
"build:pre": "cross-env mode=pre nuxt build", "build:pre": "cross-env mode=pre nuxt build",
"build:test": "cross-env mode=test nuxt build", "build:test": "cross-env mode=test nuxt build",
"start": "nuxt start", "start": "nuxt start",
"start:private": "cross-env mode=private nuxt start", "start:vvku": "cross-env mode=vvku.private nuxt start",
"start:cm": "cross-env mode=cm.private nuxt start",
"start:pre": "cross-env mode=pre nuxt start", "start:pre": "cross-env mode=pre nuxt start",
"start:test": "cross-env mode=test nuxt start", "start:test": "cross-env mode=test nuxt start",
"pm2": "pm2 start pm2.json --only live", "pm2": "pm2 start pm2.json --only live",
"pm2:private": "pm2 start pm2.json --only live-private", "pm2:cm": "pm2 start pm2.json --only live-cm",
"pm2:vvku": "pm2 start pm2.json --only live-vvku",
"pm2:pre": "pm2 start pm2.json --only live-pre", "pm2:pre": "pm2 start pm2.json --only live-pre",
"pm2:test": "pm2 start pm2.json --only live-test", "pm2:test": "pm2 start pm2.json --only live-test",
"generate": "nuxt generate", "generate": "nuxt generate",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore .", "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
"lintfix": "eslint --fix --ext .js,.vue --ignore-path .gitignore ." "lintfix": "eslint --fix --ext .js,.vue --ignore-path .gitignore ."
......
plugins/API/apiAll.js
...@@ -145,7 +145,9 @@ const privateApi = { ...@@ -145,7 +145,9 @@ const privateApi = {
sendChat: '/php/program/chat/sendChat', // 发送聊天 sendChat: '/php/program/chat/sendChat', // 发送聊天
getpraisenum: '/php/program/praise/praiseNum', // 获取点赞数 getpraisenum: '/php/program/praise/praiseNum', // 获取点赞数
sendPraise: '/php/program/praise/Praise', // 点赞 sendPraise: '/php/program/praise/Praise', // 点赞
getAddressForGet: `https:${process.env.DEF_DOMAIM}/Program/Address/getLivePlayAddressForGet` // 防盗链接口 getAddressForGet: `https:${
process.env.DEF_DOMAIM + process.env.HTTPS_PORT
}/v1/Program/Address/getLivePlayAddressForGet` // 防盗链接口
}; };
if (!process.env.private) { if (!process.env.private) {
if (!process.env.X_CA_STAGE) { if (!process.env.X_CA_STAGE) {
......
plugins/API/request.js
...@@ -13,15 +13,13 @@ const Cookie = process.client ? require('js-cookie') : {}; ...@@ -13,15 +13,13 @@ const Cookie = process.client ? require('js-cookie') : {};
const Sentry = process.client ? require('@sentry/browser') : require('@sentry/node'); const Sentry = process.client ? require('@sentry/browser') : require('@sentry/node');
const DEF_DOMAIM = process.client const DEF_DOMAIM = process.client
? window.location.protocol === 'https:' ? process.env.DEF_DOMAIM + (window.location.protocol.split(':')[0] === 'https' ? process.env.HTTPS_PORT : process.env.HTTP_PORT)
? process.env.DEF_DOMAIM.replace('8680', '843') : `http:${process.env.DEF_DOMAIM + process.env.HTTP_PORT}`;
: process.env.DEF_DOMAIM
: `http:${process.env.DEF_DOMAIM}`;
const service = axios.create({ const service = axios.create({
timeout: 1000 * 10, timeout: 1000 * 10,
withCredentials: false, withCredentials: false,
baseURL: DEF_DOMAIM, baseURL: `${DEF_DOMAIM}/v1`,
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
'X-Ca-Stage': process.env.X_CA_STAGE 'X-Ca-Stage': process.env.X_CA_STAGE
......
pm2.json
...@@ -31,9 +31,24 @@ ...@@ -31,9 +31,24 @@
"out_file": "./logs/app-out.log" "out_file": "./logs/app-out.log"
}, },
{ {
"name": "live-private", "name": "live-cm",
"script": "npm", "script": "npm",
"args": "run start:private", "args": "run start:cm",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"port": 3000,
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "live-vvku",
"script": "npm",
"args": "run start:vvku",
"instances": "max", "instances": "max",
"exec_mode": "cluster", "exec_mode": "cluster",
"autorestart": true, "autorestart": true,
......
vvkuDockerfile 0 → 100644
FROM alpine AS builder
WORKDIR /home/app
RUN apk add --no-cache --update nodejs yarn
COPY package.json yarn.lock ./
RUN yarn install --registry=https://registry.yarnpkg.com
FROM registry.cn-hangzhou.aliyuncs.com/open_images/node12.13.1-pm2
ADD ./ /var/www/web_live
ENV HOST 0.0.0.0
ENV TZ Asia/Shanghai
WORKDIR /var/www/web_live
COPY --from=builder /home/app/package.json ./package.json
COPY --from=builder /home/app/node_modules ./node_modules
RUN yarn build:vvku
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 3000
RUN chmod +x vvkuStart.sh
ENTRYPOINT ["./vvkuStart.sh"]
vvkuStart.sh 0 → 100644
#!/bin/sh
yarn run pm2:vvku
while true
do
sleep 5;
done
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment