Merge branch 'master' of http://git.qiniu1314.com/cmy/jztAdmin

package.json

@@ -3,7 +3,7 @@
   "version": "2.0.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve --open  --mode=dev",
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open  --mode=dev ",
     "dev": "npm run serve --mode=dev",
     "build": "vue-cli-service build --mode=production"
   },

src/setting.js

@@ -11,11 +11,11 @@
  * iView Admin Pro 业务配置
  * */
 // 请求接口地址 如果没有配置自动获取当前网址路径
-// const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
-const VUE_APP_API_URL = 'https://wx.junhailan.com/adminapi'
+const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
+// const VUE_APP_API_URL = 'https://wx.junhailan.com/adminapi'
 // 管理端ws
-// const VUE_APP_WS_ADMIN_URL = process.env.VUE_APP_WS_ADMIN_URL || `ws:${location.hostname}/ws`
-const VUE_APP_WS_ADMIN_URL = 'wss:wx.junhailan.com/ws'
+const VUE_APP_WS_ADMIN_URL = process.env.VUE_APP_WS_ADMIN_URL || `ws:${location.hostname}/ws`
+// const VUE_APP_WS_ADMIN_URL = 'wss:wx.junhailan.com/ws'
 // 路由前缀
 const roterPre = '/admin'
 // 客服路由前缀