Merge branch 'dev'

bd679447 · Lays-lzq · 52d2fb63 · d12a3047 · bd679447 · 52d2fb63
Commit bd679447 authored Nov 14, 2023 by Lays-lzq
14 changed files
--- a/.yarnrc
+++ b/.yarnrc
+sentrycli_cdnurl=https://npmmirror.com/mirrors/sentry-cli/
--- a/build.yml
+++ b/build.yml
-# 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
--- a/cdzhcmDockerfile
+++ b/cdzhcmDockerfile
+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"]
--- a/cdzhcmStart.sh
+++ b/cdzhcmStart.sh
+#!/bin/sh
+yarn run pm2:cdzhcm
+while true
+do
+sleep 5;
+done
--- a/cmDockerfile
+++ b/cmDockerfile
-FROM alpine AS builder
+FROM registry.cn-hangzhou.aliyuncs.com/cduan/customer-resource-base:zabbix
-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
+RUN yarn install
-COPY --from=builder /home/app/node_modules ./node_modules
 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

--- a/components/Lottery/Instant/Main.vue
+++ b/components/Lottery/Instant/Main.vue
@@ -214,7 +214,8 @@ export default {
        id: 0, // 中奖等级
        name: '谢谢参与' // 中奖等级
      }, // 中奖信息
-      randomType: Math.floor(Math.random() * (2 - 1 + 1)) + 1 // 部分抽奖类型随机进1或2
+      randomType: Math.floor(Math.random() * (2 - 1 + 1)) + 1, // 部分抽奖类型随机进1或2
+      formattedPrizeList: []
    }
  },
  computed: {
@@ -228,13 +229,8 @@ export default {
    prizeList() {
      return this.lotteryInfo.prizeConfigs
    },
-    formattedPrizeList() {
+    prizeLen() {
-      const prizeLen = this.lotteryInfo?.prizeConfigs?.length || 0
+      return this.prizeList.length
-      if (prizeLen >= 6 && prizeLen % 2 === 0) {
-        const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
-        return [...this.lotteryInfo.prizeConfigs, ...freePrizes]
-      }
-      return this.lotteryInfo.prizeConfigs
    },
    isNotStart() {
      // 抽奖不在活动日期内
@@ -251,7 +247,25 @@ export default {
      return ''
    },
  },
+  watch: {
+    prizeLen(nVal, oVal) {
+      if (nVal === oVal) {
+        return
+      }
+      if (this.nVal >= 6 && this.nVal % 2 === 0) {
+        const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
+        this.formattedPrizeList = [...this.lotteryInfo.prizeConfigs, ...freePrizes]
+      }
+      this.formattedPrizeList = this.lotteryInfo.prizeConfigs
+    }
+  },
  mounted() {
+    if (this.prizeLen >= 6 && this.prizeLen % 2 === 0) {
+      const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
+      this.formattedPrizeList = [...this.lotteryInfo.prizeConfigs, ...freePrizes]
+    }else {
+      this.formattedPrizeList = this.lotteryInfo.prizeConfigs
+    }
    // this.lotteryInfo.showType = 4
    Bus.$on('updateMain', data => {
      for (const [key, value] of Object.entries(data)) {

--- a/cucDockerfile
+++ b/cucDockerfile
+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
--- a/cucStart.sh
+++ b/cucStart.sh
+#!/bin/sh
+yarn run pm2:cuc
+while true
+do
+sleep 5;
+done
--- a/layouts/default.vue
+++ b/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>

--- a/nuxt.config.js
+++ b/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
  ? [
      // 优化打包速度

--- a/package.json
+++ b/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",

--- a/pm2.json
+++ b/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
--- a/store/lottery.js
+++ b/store/lottery.js
@@ -30,7 +30,7 @@ export const mutations = {
  },
  SET_ISSHOWBIND: (state, isShow) => {
    state.isShowBind = isShow
-  }
+  },
 }
 export const actions = {
@@ -70,9 +70,9 @@ export const actions = {
      }
    })
  },
-  updateInfo({ state }, val) {
+  updateInfo({ commit, state }, val) {
    // const lotteryInfo = cloneDeep(state.lotteryInfo)
-    state.lotteryInfo = { ...state.lotteryInfo, ...val }
+    commit('SET_LOTTERYINFO', { ...state.lotteryInfo, ...val })
  },
 }
 export const getters = {

--- a/yarn.lock
+++ b/yarn.lock