Casper Dai 1 anno fa
parent
commit
6c6395a770
11 ha cambiato i file con 62 aggiunte e 43 eliminazioni
  1. 9 9
      .env
  2. 14 0
      .env.alpha
  3. 1 1
      .env.development
  4. 1 3
      .env.fujian
  5. 6 4
      .env.inspur
  6. 6 4
      .env.rc
  7. 10 0
      .env.sc
  8. 0 12
      .env.staging
  9. 9 5
      feature.js
  10. 4 4
      src/constant.js
  11. 2 1
      vue.config.js

+ 9 - 9
.env

@@ -1,4 +1,4 @@
-ENV = 'currency'
+ENV = 'stable'
 
 PLATFORM = 'inspur'
 
@@ -11,11 +11,15 @@ __SUB_DEVICE__ = 'disabled'
 # 设备接管
 __TAKEOVER__ = 'disabled'
 # 短信
-__PHONE_NOTE__ = 'disabled'
+__ALARM_SMS__ = 'disabled'
 # 邮件
-__EMAIL__ = 'disabled'
-# 微信
-__WECHAT__ = 'disabled'
+__ALARM_EMAIL__ = 'disabled'
+# 微信公众号
+__ALARM_WECHAT_OFFICIAL__ = 'disabled'
+# 微信小程序
+__ALARM_WECHAT_APPLAT__ = 'disabled'
+VUE_APP_AD_ORDER_QR = 'https://msr.inspur.com'
+VUE_APP_APPLET_PAGE = 'pages/device/device'
 # 跳审
 __JUMP_REVIEW__ = 'enabled'
 
@@ -69,7 +73,3 @@ VUE_APP_GAODE_MAP_RANGE = '中国'
 # 离线地图访问地址,地址下需存放各图片
 # roadmap 街道图 satellite 卫星图 overlay 混合图
 VUE_APP_OFFLINE_MAP = './tiles'
-
-VUE_APP_AD_ORDER_QR = 'https://msr.inspur.com'
-
-VUE_APP_APPLET_PAGE = 'pages/device/device'

+ 14 - 0
.env.alpha

@@ -0,0 +1,14 @@
+NODE_ENV = 'production'
+
+ENV = 'alpha'
+
+LOGGER = 'enabled'
+
+# 短信
+__ALARM_SMS__ = 'enabled'
+# 邮件
+__ALARM_EMAIL__ = 'enabled'
+# 微信公众号
+__ALARM_WECHAT_OFFICIAL__ = 'enabled'
+# 微信小程序
+__ALARM_WECHAT_APPLAT__ = 'enabled'

+ 1 - 1
.env.development

@@ -1,4 +1,4 @@
-ENV = 'staging'
+ENV = 'alpha'
 
 VUE_APP_BASE_API = '/dev-api'
 

+ 1 - 3
.env.fujian

@@ -5,11 +5,9 @@ ENV = 'fujian'
 PLATFORM = 'fujian'
 
 # 短信
-__PHONE_NOTE__ = 'enabled'
+__ALARM_SMS__ = 'enabled'
 
 VUE_APP_NAME = '万福千屏户外安播云平台'
 
-VUE_APP_THUMBNAIL_ORIGIN = 'http://192.168.63.114'
-
 VUE_APP_GAODE_MAP_RANGE_LEVEL = 'province'
 VUE_APP_GAODE_MAP_RANGE = '福建省'

+ 6 - 4
.env.inspur

@@ -3,11 +3,13 @@ NODE_ENV = 'production'
 ENV = 'inspur'
 
 # 短信
-__PHONE_NOTE__ = 'enabled'
+__ALARM_SMS__ = 'enabled'
 # 邮件
-__EMAIL__ = 'enabled'
-# 微信
-__WECHAT__ = 'enabled'
+__ALARM_EMAIL__ = 'enabled'
+# 微信公众号
+__ALARM_WECHAT_OFFICIAL__ = 'enabled'
+# 微信小程序
+__ALARM_WECHAT_APPLAT__ = 'enabled'
 
 VUE_APP_GAODE_MAP_RANGE_LEVEL = 'city'
 VUE_APP_GAODE_MAP_RANGE = '济南市'

+ 6 - 4
.env.rc

@@ -5,11 +5,13 @@ ENV = 'rc'
 LOGGER = 'enabled'
 
 # 短信
-__PHONE_NOTE__ = 'enabled'
+__ALARM_SMS__ = 'enabled'
 # 邮件
-__EMAIL__ = 'enabled'
-# 微信
-__WECHAT__ = 'enabled'
+__ALARM_EMAIL__ = 'enabled'
+# 微信公众号
+__ALARM_WECHAT_OFFICIAL__ = 'enabled'
+# 微信小程序
+__ALARM_WECHAT_APPLAT__ = 'enabled'
 
 # keycloak
 VUE_APP_KEYCLOAK_OPTIONS_URL = 'https://isoc.artaplay.com:8443/auth'

+ 10 - 0
.env.sc

@@ -0,0 +1,10 @@
+NODE_ENV = 'production'
+
+ENV = 'sc'
+
+# 短信
+__ALARM_SMS__ = 'enabled'
+# 微信小程序
+__ALARM_WECHAT_APPLAT__ = 'enabled'
+VUE_APP_AD_ORDER_QR = 'https://led.inspur.com'
+VUE_APP_APPLET_PAGE = 'pages/device/device'

+ 0 - 12
.env.staging

@@ -1,12 +0,0 @@
-NODE_ENV = 'production'
-
-ENV = 'staging'
-
-LOGGER = 'enabled'
-
-# 短信
-__PHONE_NOTE__ = 'enabled'
-# 邮件
-__EMAIL__ = 'enabled'
-# 微信
-__WECHAT__ = 'enabled'

+ 9 - 5
feature.js

@@ -1,5 +1,5 @@
 const isProd = process.env.NODE_ENV !== 'development'
-const isStaging = process.env.ENV === 'staging' || process.env.ENV === 'rc'
+const isStaging = process.env.ENV === 'alpha' || process.env.ENV === 'rc'
 
 function isEnable (feature) {
   return !isProd || process.env[feature] === 'enabled'
@@ -14,19 +14,23 @@ function getTimestamp () {
   return `${now.getFullYear()}${(now.getMonth() + 1).toString().padStart(2, '0')}${now.getDate().toString().padStart(2, '0')}${now.getHours().toString().padStart(2, '0')}${now.getMinutes().toString().padStart(2, '0')}${now.getSeconds().toString().padStart(2, '0')}`
 }
 
+const version = `v${require('./package.json').version}.${getTimestamp()}`
+
 module.exports = {
+  version,
   isProd,
   logger: isEnable('LOGGER'),
   features: {
-    __VERSION__: JSON.stringify(`v${require('./package.json').version}.${getTimestamp()}`),
+    __VERSION__: JSON.stringify(version),
     __DEV__: !isProd,
     __STAGING__: isStaging,
     ...createFeature('__FEATURE__'),
     ...createFeature('__SUB_DEVICE__'),
     ...createFeature('__TAKEOVER__'),
-    ...createFeature('__PHONE_NOTE__'),
-    ...createFeature('__EMAIL__'),
-    ...createFeature('__WECHAT__'),
+    ...createFeature('__ALARM_SMS__'),
+    ...createFeature('__ALARM_EMAIL__'),
+    ...createFeature('__WECHAT_OFFICIAL__'),
+    ...createFeature('__WECHAT_APPLAT__'),
     ...createFeature('__JUMP_REVIEW__')
   }
 }

+ 4 - 4
src/constant.js

@@ -372,10 +372,10 @@ export const AlarmLevelInfo = {
 }
 
 export const AlarmStrategies = [
-  { key: 'note', label: '短信', support: __PHONE_NOTE__ },
-  { key: 'email', label: '邮件', support: __EMAIL__ },
-  { key: 'wechat', label: '微信', support: __WECHAT__ },
-  { key: 'wechatApplet', label: '小程序', support: __WECHAT__ }
+  { key: 'note', label: '短信', support: __ALARM_SMS__ },
+  { key: 'email', label: '邮件', support: __ALARM_EMAIL__ },
+  { key: 'wechat', label: '公众号', support: __WECHAT_OFFICIAL__ },
+  { key: 'wechatApplet', label: '小程序', support: __WECHAT_APPLAT__ }
 ]
 
 export const SupportedAlarmStrategies = AlarmStrategies.filter(({ support }) => support)

+ 2 - 1
vue.config.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const webpack = require('webpack')
 const {
+  version,
   isProd,
   logger,
   features
@@ -35,7 +36,7 @@ function getCopyFiles () {
 
 module.exports = {
   publicPath: '/',
-  outputDir: `dist/${process.env.ENV}`,
+  outputDir: `dist/msr_${process.env.ENV}_${version}`,
   assetsDir: '',
   lintOnSave: !isProd,
   productionSourceMap: false,