api请求是传递APP版本号

TruthHun · May 11, 2020 · e58d7e3 · e58d7e3
1 parent 269e6c2
commit e58d7e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/App.vue b/App.vue
@@ -6,7 +6,8 @@
 		onLaunch: function() {
 			let info = uni.getSystemInfoSync()
 			info.versionCode = 0
-			info.version = "v1.0.0"
+			info.version = config.info.version
+			info.appVersion = config.info.version
 			info.bookshelfChanged = false
 			
 			if (info.model && info.model.indexOf('iPhone') !== -1) {

diff --git a/utils/api.js b/utils/api.js
@@ -3,7 +3,7 @@ import util from "./util.js"
 
 const keyCategories = 'categories';
 const keyCacheExpire = 'categories-expire';
-const expire = 600; // 600 second
+const expire = 60; // 600 second
 
 // 获取书籍分类
 const getCategories = () => {
@@ -63,7 +63,6 @@ const getCategoryByCid = (cid) => {
 }
 
 
-
 module.exports = {
   getCategories,
   getCategoryByCid,

diff --git a/utils/util.js b/utils/util.js
@@ -116,6 +116,12 @@ Promise.prototype.finally = function(callback) {
 	);
 }
 
+const _getVersion = () => {
+	let version = getSysInfo().appVersion
+	if (version != undefined && version != "") return version
+	return ''
+}
+
 // 只有请求结果返回 200 的时候，才会resolve，否则reject
 const request = (api, params = {}, method = "GET", header = {}) => {
 	return new Promise(function(resolve, reject) {
@@ -127,6 +133,8 @@ const request = (api, params = {}, method = "GET", header = {}) => {
 
 		let token = getToken()
 		if (token) header['authorization'] = token
+
+		header['x-version'] = _getVersion()
 
 		uni.request({
 			url: api,