From 9854499f5ae1a186bbed7ae1b58b213fc1e5963b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 27 Apr 2023 07:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/public/config.js              |  1 +
 fe/PC/public/version.json           |  3 +++
 fe/PC/src/api/wms-api.js            |  8 ++++++++
 fe/PC/src/components/News/index.vue |  5 +++++
 fe/PC/src/main.js                   |  1 -
 fe/PC/src/permission.js             |  2 +-
 fe/PC/src/utils/request.js          |  3 ---
 fe/PC/src/utils/upDateVersion.js    | 29 ++++++++++++++++++++---------
 fe/PC/vue.config.js                 |  6 ------
 9 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 fe/PC/public/version.json

diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js
index 3a2b1bdb8..a11082d81 100644
--- a/fe/PC/public/config.js
+++ b/fe/PC/public/config.js
@@ -19,6 +19,7 @@ window.SITE_CONFIG['warehouseCode'] = 'T8'
 window.SITE_CONFIG['company'] = 'DongYang'
 window.SITE_CONFIG['client_secret'] = '1q2w3E*'
 window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60074/#/reports/'
+window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070'
 
 // mock
 // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33'
diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
new file mode 100644
index 000000000..8d32f918e
--- /dev/null
+++ b/fe/PC/public/version.json
@@ -0,0 +1,3 @@
+{
+    "version": "1.0.6"
+}
\ No newline at end of file
diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 8f8c59486..429cb0759 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -557,6 +557,14 @@ export function getOneCustomerInfoByCode(code) {
     method: 'get'
   })
 }
+
+// 获取版本编号
+export function getVsersion() {
+  return request({
+    url: window.SITE_CONFIG['versionUrl'] + `/version.json?t=${new Date().getTime()}`,
+    method: 'get'
+  })
+}
 // 根据编号获取字典信息
 // export function getDictByCode(code) {
 //   return request({
diff --git a/fe/PC/src/components/News/index.vue b/fe/PC/src/components/News/index.vue
index eb82e3c80..5f9119752 100644
--- a/fe/PC/src/components/News/index.vue
+++ b/fe/PC/src/components/News/index.vue
@@ -12,6 +12,7 @@
 <script>
 import { userNotifyNotReadList, userNotifyHasRead, userNotifyMessageNotReadList, userNotifyMessageUpdate, notifyMessage, getPageList } from "@/api/wms-api"
 import dialogIndex from "@/components/News/dialogIndex"
+import { updateVersion } from '@/utils/upDateVersion'
 export default {
   name: 'News',
   data() {
@@ -27,12 +28,16 @@ export default {
     this.userId = this.$store.getters.name.id
     this.getNoReadCount(this.userId)
     this.getSetInterval()
+    // 检测版本是否有更新
+    updateVersion()
   },
   methods: {
     getSetInterval() {
       let that = this
       setInterval(function () {
         that.getNoReadCount(that.userId)
+        // 检测版本是否有更新
+        updateVersion()
       },120000)
     },
     getNoReadCount(userId) {
diff --git a/fe/PC/src/main.js b/fe/PC/src/main.js
index 831c80e89..147bbbac4 100644
--- a/fe/PC/src/main.js
+++ b/fe/PC/src/main.js
@@ -45,7 +45,6 @@ Vue.prototype.defaultExportBtn = defaultExportBtn;
 
 import * as filters from './filters' // global filters
 
-console.log("V421.20.52.win");
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
diff --git a/fe/PC/src/permission.js b/fe/PC/src/permission.js
index 2a413983e..3a23b98f8 100644
--- a/fe/PC/src/permission.js
+++ b/fe/PC/src/permission.js
@@ -21,7 +21,7 @@ const whiteList = ['/login', '/auth-redirect', '/testForm'] // no redirect white
 
 router.beforeEach(async (to, from, next) => {
   // 添加路由信息，方便代码修改定位
-  console.log('----------------' + to.meta.title + '-----------------------'+ to.fullPath.substring(to.fullPath.lastIndexOf('-')+1,to.fullPath.length) + '.vue' );
+  // console.log('----------------' + to.meta.title + '-----------------------'+ to.fullPath.substring(to.fullPath.lastIndexOf('-')+1,to.fullPath.length) + '.vue' );
   // start progress bar
   NProgress.start()
 
diff --git a/fe/PC/src/utils/request.js b/fe/PC/src/utils/request.js
index 89277c7f1..63726ff7e 100644
--- a/fe/PC/src/utils/request.js
+++ b/fe/PC/src/utils/request.js
@@ -7,7 +7,6 @@ import store from '@/store'
 import {
   getToken
 } from '@/utils/auth'
-import { updateVersion } from '@/utils/upDateVersion'
 
 // create an axios instance
 const service = axios.create({
@@ -22,8 +21,6 @@ service.interceptors.request.use(
     // do something before request is sent
 
     if (store.getters.token) {
-      // 检测版本是否有更新
-      updateVersion()
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
diff --git a/fe/PC/src/utils/upDateVersion.js b/fe/PC/src/utils/upDateVersion.js
index c38f6bfc3..7e98551e8 100644
--- a/fe/PC/src/utils/upDateVersion.js
+++ b/fe/PC/src/utils/upDateVersion.js
@@ -1,20 +1,31 @@
 /**
- * 检测版本更新
+ * 检测版本更新 触发机制在 news/index 中 跟随消息定时器一并触发
  */
 import Vue from 'vue'
+import { getVsersion } from '@/api/wms-api'
 export function updateVersion () {
-	const versionConfig = process.env.VUE_APP_INFO
-	let version = localStorage.getItem('upDateVersion')
-	if (version != versionConfig) {
-		localStorage.setItem('upDateVersion', versionConfig)
-		setTimeout(() => {
-			save()
-		}, 1000 * 3)
+	let versionConfig = ''
+	// dev模式不开启更新功能
+	if (window.SITE_CONFIG['versionUrl'] && process.env.NODE_ENV != 'development') {
+		getVsersion().then(res => {
+			versionConfig = res.version
+			if (versionConfig) {
+				let version = localStorage.getItem('upDateVersion')
+				if (version != versionConfig) {
+					localStorage.setItem('upDateVersion', versionConfig)
+					setTimeout(() => {
+						save()
+					}, 1000 * 3)
+				}
+			}
+		}).catch(err => {
+			console.log(err)
+		})
 	}
 }
 function save () {
 	var vm = new Vue()
-	vm.$message.success('正在更新, 预计5秒后更新完成')
+	vm.$message.warning('有新版本发布，自动更新升级中')
 	setTimeout(() => {
 		vm.$message.success('更新完成')
 	}, 1000 * 3)
diff --git a/fe/PC/vue.config.js b/fe/PC/vue.config.js
index ed0970dd2..c72b2a27b 100644
--- a/fe/PC/vue.config.js
+++ b/fe/PC/vue.config.js
@@ -8,12 +8,6 @@ function resolve(dir) {
 
 const name = defaultSettings.title || '基础数据管理网站' // page title
 
-const pkg = require('./package.json')
-const info = {
-  ...pkg
-}
-process.env.VUE_APP_INFO = info.version
-
 // If your port is set to 80,
 // use administrator privileges to execute the command line.
 // For example, Mac: sudo npm run