Skip to content

activities / web-lottery

Go to a project
Commit c4cf3acf by Lays-lzq
Options

feat: 修复问题

parent 37050237
Showing with 59 additions and 408 deletions
Dockerfile deleted 100644 → 0
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
RUN yarn install
RUN yarn build:prod
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml pDockerfile README.md pStart.sh
EXPOSE 4002
RUN chmod +x start.sh
ENTRYPOINT ["./start.sh"]
cbnDockerfile deleted 100644 → 0
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:cbn
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 cbnStart.sh
ENTRYPOINT ["./cbnStart.sh"]
cbnStart.sh deleted 100644 → 0
#!/bin/sh
yarn run pm2:cbn
while true
do
sleep 5;
done
cbncloudsDockerfile deleted 100644 → 0
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:cbnclouds
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 cbncloudsStart.sh
ENTRYPOINT ["./cbncloudsStart.sh"]
cbncloudsStart.sh deleted 100644 → 0
#!/bin/sh
yarn run pm2:cbnclouds
while true
do
sleep 5;
done
cdzhcmDockerfile deleted 100644 → 0
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 deleted 100644 → 0
#!/bin/sh
yarn run pm2:cdzhcm
while true
do
sleep 5;
done
cmDockerfile deleted 100644 → 0
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
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"]
\ No newline at end of file
cmStart.sh deleted 100644 → 0
#!/bin/sh
yarn run pm2:cm
while true
do
sleep 5;
done
cucDockerfile deleted 100644 → 0
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 deleted 100644 → 0
#!/bin/sh
yarn run pm2:cuc
while true
do
sleep 5;
done
huaweiDockerfile deleted 100644 → 0
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:huawei
RUN rm -rf assets components layouts middleware pages plugins store .eslintrc.js .gitignore build.yml Dockerfile README.md start.sh
EXPOSE 34002
RUN chmod +x huaweiStart.sh
ENTRYPOINT ["./huaweiStart.sh"]
huaweiStart.sh deleted 100644 → 0
#!/bin/sh
yarn run pm2:huawei
while true
do
sleep 5;
done
package.json
...@@ -10,43 +10,23 @@ ...@@ -10,43 +10,23 @@
"serve:dev": "cross-env mode=test vue-cli-service serve", "serve:dev": "cross-env mode=test vue-cli-service serve",
"serve:pre": "cross-env mode=preview vue-cli-service serve", "serve:pre": "cross-env mode=preview vue-cli-service serve",
"serve:prod": "cross-env mode=production vue-cli-service serve", "serve:prod": "cross-env mode=production vue-cli-service serve",
"serve:cm": "cross-env mode=cm nuxt", "serve:cm": "cross-env mode=cm vue-cli-service serve",
"serve:vvku": "cross-env mode=vvku nuxt", "serve:vvku": "cross-env mode=vvku vue-cli-service serve",
"serve:cbn": "cross-env mode=cbn nuxt", "serve:cbn": "cross-env mode=cbn vue-cli-service serve",
"serve:huawei": "cross-env mode=huawei nuxt", "serve:huawei": "cross-env mode=huawei vue-cli-service serve",
"serve:cbnclouds": "cross-env mode=cbnclouds nuxt", "serve:cbnclouds": "cross-env mode=cbnclouds vue-cli-service serve",
"serve:cuc": "cross-env mode=cuc nuxt", "serve:cuc": "cross-env mode=cuc vue-cli-service serve",
"serve:cdzhcm": "cross-env mode=cdzhcm nuxt", "serve:cdzhcm": "cross-env mode=cdzhcm vue-cli-service serve",
"build:dev": "cross-env mode=test nuxt build", "build:dev": "cross-env mode=test vue-cli-service build",
"build:pre": "cross-env mode=preview nuxt build", "build:pre": "cross-env mode=preview vue-cli-service build",
"build:prod": "cross-env mode=production nuxt build", "build:prod": "cross-env mode=production vue-cli-service build",
"build:cm": "cross-env mode=cm nuxt build", "build:cm": "cross-env mode=cm vue-cli-service build",
"build:vvku": "cross-env mode=vvku nuxt build", "build:vvku": "cross-env mode=vvku vue-cli-service build",
"build:cbn": "cross-env mode=cbn nuxt build", "build:cbn": "cross-env mode=cbn vue-cli-service build",
"build:huawei": "cross-env mode=huawei nuxt build", "build:huawei": "cross-env mode=huawei vue-cli-service build",
"build:cbnclouds": "cross-env mode=cbnclouds nuxt build", "build:cbnclouds": "cross-env mode=cbnclouds vue-cli-service build",
"build:cuc": "cross-env mode=cuc nuxt build", "build:cuc": "cross-env mode=cuc vue-cli-service build",
"build:cdzhcm": "cross-env mode=cdzhcm nuxt build", "build:cdzhcm": "cross-env mode=cdzhcm vue-cli-service 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",
"start:cm": "cross-env mode=cm nuxt start",
"start:vvku": "cross-env mode=vvku nuxt start",
"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",
"pm2:cm": "pm2 start pm2.json --only lottery-cm",
"pm2:vvku": "pm2 start pm2.json --only lottery-vvku",
"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", "generate": "nuxt generate",
"lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .", "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
"lint:style": "stylelint \"**/*.{vue,css}\" --ignore-path .gitignore", "lint:style": "stylelint \"**/*.{vue,css}\" --ignore-path .gitignore",
...@@ -58,9 +38,7 @@ ...@@ -58,9 +38,7 @@
"@gdyfe/config": "^2.0.1", "@gdyfe/config": "^2.0.1",
"@gdyfe/gdy-component-lib": "^0.4.1", "@gdyfe/gdy-component-lib": "^0.4.1",
"@gdyfe/rop-client": "1.1.10", "@gdyfe/rop-client": "1.1.10",
"@nuxtjs/axios": "^5.13.6", "axios": "^0.18.0",
"@nuxtjs/google-gtag": "^1.0.4",
"@nuxtjs/sentry": "^5.1.7",
"@vant/area-data": "^1.5.1", "@vant/area-data": "^1.5.1",
"core-js": "^3.15.1", "core-js": "^3.15.1",
"dayjs": "^1.10.6", "dayjs": "^1.10.6",
...@@ -83,9 +61,6 @@ ...@@ -83,9 +61,6 @@
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "^7.14.7", "@babel/eslint-parser": "^7.14.7",
"@gdyfe/webpack-alioss-plugin": "^0.1.6", "@gdyfe/webpack-alioss-plugin": "^0.1.6",
"@nuxtjs/eslint-config": "^6.0.1",
"@nuxtjs/eslint-module": "^3.0.2",
"@nuxtjs/style-resources": "^1.2.0",
"@vant/touch-emulator": "^1.3.2", "@vant/touch-emulator": "^1.3.2",
"@vue/cli-plugin-babel": "^4.0.0", "@vue/cli-plugin-babel": "^4.0.0",
"@vue/cli-plugin-eslint": "^4.0.0", "@vue/cli-plugin-eslint": "^4.0.0",
......
pm2.json deleted 100644 → 0
{
"apps": [
{
"name": "lottery-test",
"script": "npm",
"args": "run start:dev",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "4G",
"env": {
"mode": "test",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-pre",
"script": "npm",
"args": "run start:pre",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "4G",
"env": {
"mode": "preview",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-prod",
"script": "npm",
"args": "run start:prod",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"mode": "production",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-cm",
"script": "npm",
"args": "run start:cm",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"mode": "cm",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-vvku",
"script": "npm",
"args": "run start:vvku",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"mode": "vvku",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-cbn",
"script": "npm",
"args": "run start:cbn",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"mode": "cbn",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-huawei",
"script": "npm",
"args": "run start:huawei",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "8G",
"env": {
"mode": "huawei",
"NODE_ENV": "production"
},
"error_file": "./logs/app-err.log",
"out_file": "./logs/app-out.log"
},
{
"name": "lottery-cbnclouds",
"script": "npm",
"args": "run start:cbnclouds",
"instances": "max",
"exec_mode": "cluster",
"autorestart": true,
"max_memory_restart": "32G",
"env": {
"mode": "cbnclouds",
"NODE_ENV": "production"
},
"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
src/layouts/default.vue
...@@ -12,6 +12,8 @@ import { mapActions } from 'vuex' ...@@ -12,6 +12,8 @@ import { mapActions } from 'vuex'
import loginAction from '@/plugins/UserAction/login' import loginAction from '@/plugins/UserAction/login'
import { ENV_CONFIG } from "@/config"; import { ENV_CONFIG } from "@/config";
import ConfigPopup from '../components/Common/ConfigPopup' import ConfigPopup from '../components/Common/ConfigPopup'
import action from '@/plugins/pvStatisticalService'
import dmsService from '@/plugins/dmsService'
export default { export default {
components: { components: {
ConfigPopup, ConfigPopup,
...@@ -29,6 +31,10 @@ export default { ...@@ -29,6 +31,10 @@ export default {
Bus.$on('showConfig', () => { Bus.$on('showConfig', () => {
this.isShowConfig = true this.isShowConfig = true
}) })
const route = this.$route
const store = this.$store
action({ route, store })
dmsService({ route })
}, },
destroyed() { destroyed() {
Bus.$off('showLogin') Bus.$off('showLogin')
...@@ -47,6 +53,8 @@ export default { ...@@ -47,6 +53,8 @@ export default {
// 云平台登录模块初始化 // 云平台登录模块初始化
initLoginCenter() { initLoginCenter() {
if (!window.LoginCenter) return if (!window.LoginCenter) return
const that = this
console.log(4444);
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
this.loginInstance = LoginCenter({ this.loginInstance = LoginCenter({
target: document.body, target: document.body,
...@@ -90,7 +98,7 @@ export default { ...@@ -90,7 +98,7 @@ export default {
} }
} }
// const loginAction = require("@/plugins/UserAction/login").default; // const loginAction = require("@/plugins/UserAction/login").default;
loginAction.call(this, { token: response.data, onFinished }) loginAction.call(that, { token: response.data, onFinished })
}, },
failCallback: ({ response }) => { failCallback: ({ response }) => {
this.$toast(response.errorMessage) this.$toast(response.errorMessage)
......
src/layouts/error.vue
<template> <template>
<div class="error"> <div class="error">
<div v-if="statusCode === 404" class="error__lost"></div> <div class="error__lost"></div>
<div v-else class="error__other">
<span>{{ errorMessage }}</span>
</div>
</div> </div>
</template> </template>
...@@ -27,7 +24,7 @@ export default { ...@@ -27,7 +24,7 @@ export default {
}, },
mounted() { mounted() {
// console.log(this.error) // console.log(this.error)
this.setTitle(this.statusCode) this.setTitle(404)
}, },
methods: { methods: {
setTitle(type) { setTitle(type) {
......
src/main.js
...@@ -4,13 +4,37 @@ import router from './router' ...@@ -4,13 +4,37 @@ import router from './router'
import store from './store' import store from './store'
import '@/assets/styles/main.less' // global css import '@/assets/styles/main.less' // global css
import '@/plugins/vant' import '@/plugins/vant'
import '@/plugins/routeHooks'
import '@/filters' import '@/filters'
import '@/plugins/vueClipboard' import '@/plugins/vueClipboard'
import '@/plugins/dmsService'
import '@/plugins/pvStatisticalService'
import '@/plugins/deviceId' import '@/plugins/deviceId'
router.beforeEach((to, from, next) => {
const { uin = 0, id = 0, sessionId = 0 } = to.query
if (!uin && !['/error'].includes(to.path)) {
// 处理缺失 uin 的情况
next('/error')
return
}
store.commit('users/SET_UIN', uin)
if (['/list', '/index', '/message', '/winners'].includes(to.path) && !id) {
// 处理缺失 id 的情况
next('/error')
return
}
if (['/index', '/message'].includes(to.path) && !sessionId) {
// 处理缺失 sessionId 的情况
next('/error')
return
}
// 如果一切正常，继续导航
next()
})
new Vue({ new Vue({
router, router,
store, store,
......
src/plugins/routeHooks.js deleted 100644 → 0
export default function ({ store, app, redirect }) {
app.router.beforeEach((to, from, next) => {
// if (to.path === '/') {
// redirect({ path: '/list', query: to.query })
// return
// }
const { uin = 0, id = 0, sessionId = 0 } = to.query
if (!uin) {
app.context.error({ statusCode: 404, message: 'This page could not be found' })
}
store.commit('users/SET_UIN', uin)
if (['/list', '/index', '/message', '/winners'].includes(to.path) && !id) {
app.context.error({ statusCode: 450, message: 'Incomplete route, parameter: ID not found' })
}
if (['/index', '/message'].includes(to.path) && !sessionId) {
app.context.error({ statusCode: 450, message: 'Incomplete route, parameter: found：sessionId not found' })
}
next()
})
}
src/store/modules/lottery.js
...@@ -53,7 +53,7 @@ const actions = { ...@@ -53,7 +53,7 @@ const actions = {
} else { } else {
Toast.fail(errorMessage) Toast.fail(errorMessage)
if (errorCode === 9) { if (errorCode === 9) {
this.app.context.error({ statusCode: 404, message: 'This page could not be found' }) this.$router.push('/error')
} }
} }
return Promise.resolve(res) return Promise.resolve(res)
...@@ -69,7 +69,7 @@ const actions = { ...@@ -69,7 +69,7 @@ const actions = {
} else { } else {
Toast.fail(errorMessage) Toast.fail(errorMessage)
if (errorCode === 9) { if (errorCode === 9) {
this.app.context.error({ statusCode: 404, message: 'This page could not be found' }) this.$router.push('/error')
} }
} }
}) })
...@@ -86,7 +86,7 @@ const actions = { ...@@ -86,7 +86,7 @@ const actions = {
} else { } else {
Toast.fail(errorMessage) Toast.fail(errorMessage)
if (errorCode === 9) { if (errorCode === 9) {
this.app.context.error({ statusCode: 404, message: 'This page could not be found' }) this.$router.push('/error')
} }
} }
}) })
......
start.sh deleted 100644 → 0
#!/bin/sh
/etc/init.d/zabbix_agentd start
yarn run pm2:prod
while true
do
sleep 5;
done
vvkuDockerfile deleted 100644 → 0
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:vvku
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 vvkuStart.sh
ENTRYPOINT ["./vvkuStart.sh"]
vvkuStart.sh deleted 100644 → 0
#!/bin/sh
yarn run pm2:vvku
while true
do
sleep 5;
done
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