Skip to content

activities / web-lottery

Go to a project
Commit d12a3047 by Lays-lzq
Options

Merge branch 'test' into dev

parents d0eccc70 49947b06
Showing with 94 additions and 77 deletions
.yarnrc 0 → 100644
sentrycli_cdnurl=https://npmmirror.com/mirrors/sentry-cli/
build.yml deleted 100644 → 0
# build.yml
version: 1.0
vvku:
config:
spa: false
ssr: true
folder: nuxt-dist
proxy: http://172.17.0.1:4002
server: /web\.vvku\.com/
target:
project: Web
location: lottery
command:
build: build:vvku
cbn:
config:
spa: false
ssr: true
folder: nuxt-dist
proxy: http://172.17.0.1:4002
server: /web\.cbnbn\.cn/
target:
project: Web
location: lottery
command:
build: build:cbn
huawei:
config:
spa: false
ssr: true
folder: nuxt-dist
proxy: http://172.17.0.1:34002
server: /web\.huaguangyun\.cn/
target:
project: Web
location: lottery
command:
build: build:huawei
cbnclouds:
config:
spa: false
ssr: true
folder: nuxt-dist
proxy: http://172.17.0.1:4002
server: /web\.cbnclouds\.cn/
target:
project: Web
location: lottery
command:
build: build:cbnclouds
cdzhcmDockerfile 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_lottery
ENV HOST 0.0.0.0
ENV TZ Asia/Shanghai
WORKDIR /var/www/web_lottery
COPY --from=builder /home/app/package.json ./package.json
COPY --from=builder /home/app/node_modules ./node_modules
RUN yarn build:cdzhcm
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 4002
RUN chmod +x cdzhcmStart.sh
ENTRYPOINT ["./cdzhcmStart.sh"]
cdzhcmStart.sh 0 → 100644
#!/bin/sh
yarn run pm2:cdzhcm
while true
do
sleep 5;
done
cmDockerfile
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
FROM registry.cn-hangzhou.aliyuncs.com/cduan/customer-resource-base:zabbix
ADD ./ /var/www/web_lottery
ENV HOST 0.0.0.0
ENV TZ Asia/Shanghai
WORKDIR /var/www/web_lottery
COPY --from=builder /home/app/package.json ./package.json
COPY --from=builder /home/app/node_modules ./node_modules
RUN yarn install
RUN yarn build:cm
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 4002
RUN chmod +x cmStart.sh
ENTRYPOINT ["./cmStart.sh"]
ENTRYPOINT ["./cmStart.sh"]
\ No newline at end of file
cucDockerfile 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/cduan/customer-resource-base:zabbix
ADD ./ /var/www/web_lottery
ENV HOST 0.0.0.0
ENV TZ Asia/Shanghai
WORKDIR /var/www/web_lottery
COPY --from=builder /home/app/package.json ./package.json
COPY --from=builder /home/app/node_modules ./node_modules
RUN yarn build:cuc
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 4002
RUN chmod +x cucStart.sh
ENTRYPOINT ["./cucStart.sh"]
\ No newline at end of file
cucStart.sh 0 → 100644
#!/bin/sh
yarn run pm2:cuc
while true
do
sleep 5;
done
layouts/default.vue
......@@ -15,6 +15,7 @@ export default {
}
},
mounted() {
document.addEventListener('visibilitychange', this.handleVisibilityChange, false)
this.initLoginCenter()
Bus.$on('showLogin', this.toggleLogin)
},
......@@ -23,6 +24,15 @@ export default {
},
methods: {
...mapActions({ jumpToLogin: 'users/jumpToLogin' }),
handleVisibilityChange() {
const { uin = 0 } = this.$route.query
if (document.hidden) {
return 0
} else {
// page has focus, begin running task
this.$store.dispatch('users/getUerInfo', { uin })
}
},
// 云平台登录模块初始化
initLoginCenter() {
if (!window.LoginCenter) return
......@@ -91,7 +101,7 @@ export default {
}
this.loginInstance.show()
}
}
},
}
</script>
<style lang="less" scoped>
......
nuxt.config.js
......@@ -12,7 +12,7 @@ const env = getEnvConfig({
const { X_CA_STAGE, RUN_SERVER, STATIC_SOURCE_DOMAIN, STATIC_OSS_ACCESS, OSS_DOMAIN } = env
const { SERVE_PORT, BASE_URL, PROJECT_NAME, SENTRY_DSN, GTAG_ID } = env.lottery
const IS_USE_OSS = process.env.NODE_ENV === 'production'
const IS_USE_OSS = process.env.NODE_ENV === 'production' && !!STATIC_OSS_ACCESS.accessKeyId
const plugins = IS_USE_OSS
? [
// 优化打包速度
......
package.json
......@@ -15,6 +15,8 @@
"serve:cbn": "cross-env mode=cbn nuxt",
"serve:huawei": "cross-env mode=huawei nuxt",
"serve:cbnclouds": "cross-env mode=cbnclouds nuxt",
"serve:cuc": "cross-env mode=cuc nuxt",
"serve:cdzhcm": "cross-env mode=cdzhcm nuxt",
"build:dev": "cross-env mode=test nuxt build",
"build:pre": "cross-env mode=preview nuxt build",
"build:prod": "cross-env mode=production nuxt build",
......@@ -23,6 +25,8 @@
"build:cbn": "cross-env mode=cbn nuxt build",
"build:huawei": "cross-env mode=huawei nuxt build",
"build:cbnclouds": "cross-env mode=cbnclouds nuxt build",
"build:cuc": "cross-env mode=cuc nuxt build",
"build:cdzhcm": "cross-env mode=cdzhcm nuxt build",
"start:dev": "cross-env mode=test nuxt start",
"start:pre": "cross-env mode=preview nuxt start",
"start:prod": "cross-env mode=production nuxt start",
......@@ -31,6 +35,8 @@
"start:cbn": "cross-env mode=cbn nuxt start",
"start:huawei": "cross-env mode=huawei nuxt start",
"start:cbnclouds": "cross-env mode=cbnclouds nuxt start",
"start:cuc": "cross-env mode=cuc nuxt start",
"start:cdzhcm": "cross-env mode=cdzhcm nuxt start",
"pm2:dev": "pm2 start pm2.json --only lottery-test",
"pm2:pre": "pm2 start pm2.json --only lottery-pre",
"pm2:prod": "pm2 start pm2.json --only lottery-prod",
......@@ -39,6 +45,8 @@
"pm2:cbn": "pm2 start pm2.json --only lottery-cbn",
"pm2:huawei": "pm2 start pm2.json --only lottery-huawei",
"pm2:cbnclouds": "pm2 start pm2.json --only lottery-cbnclouds",
"pm2:cuc": "pm2 start pm2.json --only lottery-cuc",
"pm2:cdzhcm": "pm2 start pm2.json --only lottery-cdzhcm",
"generate": "nuxt generate",
"lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
"lint:style": "stylelint \"**/*.{vue,css}\" --ignore-path .gitignore",
......@@ -46,13 +54,12 @@
},
"dependencies": {
"@easy-messenger/client-connection": "^1.0.3",
"@gdyfe/config": "^1.2.8",
"@gdyfe/config": "^1.3.2",
"@gdyfe/gdy-component-lib": "^0.4.1",
"@gdyfe/rop-client": "1.1.10",
"@nuxtjs/axios": "^5.13.6",
"@nuxtjs/google-gtag": "^1.0.4",
"@nuxtjs/sentry": "^5.1.7",
"alife-logger": "1.8.6",
"core-js": "^3.15.1",
"dayjs": "^1.10.6",
"js-cookie": "2.2.0",
......
pm2.json
......@@ -119,6 +119,21 @@
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-cuc",
"script": "npm",
"args": "run start:cuc",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "32G",
"env": {
"mode": "cuc",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
}
]
}
}
\ 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