fstarter 2.10.56 → 2.11.1

package/src/plugins/assets/http.js

@@ -1,344 +1,344 @@
-import axios from 'axios';
-import config from './config';
-import ak from './ak';
-import {ua} from './ua'
-import session from '../session';
-import service from '../service';
-
-var axiosInstance = axios.create({
-  baseURL: config.http.gwURL,
-  timeout: config.http.timeout,
-  withCredentials: false
-});
-
-var axiosInstanceFile = axios.create({
-  baseURL: config.file.baseURL,
-  timeout: config.file.timeout,
-  withCredentials: false
-});
-
-
-axiosInstance.interceptors.response.use(
-  function (response) {
-    session.sys.loadcnt--
-    return response;
-  },
-  function (error) {
-    session.sys.loadcnt--
-    if (error.message === 'Network Error') {
-      ak.msg.alert('网络不可用，请重试！')
-      return Promise.reject(error)
-    }
-    if (error.message.indexOf('timeout') > -1) {
-      ak.msg.alert('网络超时，请重试！')
-      return Promise.reject(error)
-    }
-    if (!error.response) {
-      ak.msg.alert(error.message)
-      return Promise.reject(error)
-    }
-
-    if (error.response.status === 401) {
-
-      service.callService(['logout'])
-      return Promise.reject(error)
-
-    } else if (error.response.status === 200) {
-
-      return Promise.resolve(error.response);
-
-    } else {
-
-      ak.msg.alert('服务调用错误，请重试')
-      return Promise.reject(error)
-    }
-
-
-  });
-
-
-axiosInstanceFile.interceptors.response.use(
-  function (response) {
-    session.sys.loadcnt--
-    return response;
-  },
-  function (error) {
-    session.sys.loadcnt--
-    if (error.message === 'Network Error') {
-      ak.msg.alert('网络不可用，请重试！')
-      return Promise.reject(error)
-    }
-    if (error.message.indexOf('timeout') > -1) {
-      ak.msg.alert('网络超时，请重试！')
-      return Promise.reject(error)
-    }
-    if (!error.response) {
-      ak.msg.alert(error.message)
-      return Promise.reject(error)
-    }
-
-    if (error.response.status === 401) {
-
-      service.callService(['logout'])
-      return Promise.reject(error)
-
-    } else if (error.response.status === 200) {
-
-      return Promise.resolve(error.response);
-
-    } else {
-
-      ak.msg.alert('服务调用错误，请重试')
-
-    }
-
-
-  });
-
-axiosInstance.interceptors.request.use(
-  function (config2) {
-    session.sys.loadcnt++
-    return config2;
-  },
-  function (error) {
-    console.log(error)
-    session.sys.loadcnt--
-    return Promise.reject(error);
-  }
-);
-
-
-axiosInstanceFile.interceptors.request.use(
-  function (config) {
-    session.sys.loadcnt++
-    return config;
-  },
-  function (error) {
-    session.sys.loadcnt--
-    return Promise.reject(error);
-  }
-);
-
-
-var http = {
-
-  getHeader: function (needAuth, fillBearer) {
-
-    let services = []
-    if (needAuth) {
-      services = ['getToken', 'getSystemData']
-    } else {
-      services = ['getSystemData']
-    }
-
-    let getToken = service.callServices(services).then((data) => {
-
-      let attr2 = ua.iPad ? 'PAD' : (ua.mobile ? 'PHONE' : 'PC')
-      if (!needAuth) data = [null, data[0]]
-      let header = {
-        'Content-Type': 'application/json',
-        'Accept-Device': data[1].model + '-' + data[1].systemType + '-' + data[1].version,
-        'Accept-DeviceOS': data[1].brand + '' + data[1].chancel,
-        'Accept-Location': 'NULL', // 设置位置
-        'Accept-ISP': data[1].isp,
-        'Accept-StartTime': data[1].startTime,
-        'Accept-TimeZone': data[1].timeZone,
-        'Accept-Attr1': data[1].uuid,
-        'Accept-Attr2': attr2,
-        'Accept-Attr3': 'zh_CN',
-        'Accept-Attr4': 'NULL',
-        'Accept-Attr6': data[1].loginName,
-        'Real-Ip': data[1].ip
-      }
-
-      if (needAuth) {
-
-        if (fillBearer && ak.utils.isEmpty(data[0].token)) {
-          header['Authorization'] = 'Bearer ' + SSOToken.getToken(config.auth.userId, config.auth.privatKey, 60 * 10)
-        } else {
-          header['Authorization'] = data[0].type + ' ' + data[0].token
-        }
-
-      } else if (fillBearer) {
-        header['Authorization'] = 'Bearer ' + SSOToken.getToken(config.auth.userId, config.auth.privatKey, 60 * 10)
-      }
-
-      console.log(header, session)
-      return Promise.resolve(header)
-
-    })
-
-    return getToken.then((data) => {
-
-      if (!needAuth)
-        return Promise.resolve(data)
-
-      if (ak.utils.isEmpty(data.Authorization)) {
-        service.callService(['logout'])
-        return Promise.reject()
-      } else {
-        return Promise.resolve(data)
-      }
-
-    })
-
-  },
-  getHeaderForUpload: function (needAuth, fillBearer) {
-
-    return this.getHeader(needAuth, fillBearer).then((data) => {
-      delete data['Content-Type']
-      return data
-    })
-
-  },
-  get: function (resource, params) {
-
-    let url = resource.startWith('http') ? resource : (config.http.gwURL + resource)
-
-    return axiosInstance
-      .get(url, {params: params, timeout: config.http.timeout})
-      .then(function (res) {
-        return Promise.resolve(res.data)
-      })
-      .catch(function (err) {
-
-      });
-
-  },
-
-  post: function (resource, params, needAuth = false, fillBearer = false, reject = true) {
-
-    let url = resource.startWith('http') ? resource : (config.http.gwURL + resource)
-    let pro = this.getHeader(needAuth, fillBearer).then((data) => {
-      return axiosInstance
-        .post(url, JSON.stringify(params), {
-          headers: data,
-          timeout: config.http.timeout
-        })
-        .then(function (res) {
-
-          let data = res.data
-          if (Object.prototype.toString.call(data) == "[object String]") {
-            data = JSON.parse(data)
-          }
-
-          if (data.result.isSuccess) {
-            if (!ak.utils.isEmpty(data.result.message)) {
-              return new Promise(function (resolve, reject) {
-                ak.msg.alert(data.result.message, () => {
-                  resolve(data.data)
-                })
-              })
-            } else {
-              return Promise.resolve(data.data)
-            }
-          } else {
-
-            if (data.result.errorCode == 'E401' || data.result.errorCode == 'E403') {
-              service.callService(['logout'])
-              return Promise.reject(res)
-            }
-
-            var errorm = ''
-            for (let err2 = 0; err2 < data.result.errors.length; err2++) {
-              errorm += data.result.errors[err2].error + '\r\n'
-            }
-
-            if (errorm != '') {
-              return new Promise(function (resolve, reject) {
-                ak.msg.alert(errorm, () => {
-                  reject(res)
-                })
-              })
-            } else {
-              return new Promise(function (resolve, reject) {
-                ak.msg.alert(data.result.error, () => {
-                  reject(res)
-                })
-              })
-            }
-          }
-
-        })
-
-    })
-
-    if (reject) {
-      pro.catch(function () {
-        return Promise.reject()
-      })
-    }
-
-    return pro
-
-  },
-
-  uploadFile: function (opts, needAuth = false, fillBearer = false, reject = true) {
-
-    let param = new FormData();
-    param.append("file", opts.file);
-    param.append("name", opts.name);
-    param.append("domain", opts.domain);
-    param.append("buz", opts.buz);
-    param.append("buzId", opts.buzId);
-    param.append("expired", opts.expired);
-    param.append("actions", opts.actions);
-    if (opts.auth !== undefined) {
-      param.append("auth", opts.auth);
-    }
-
-    console.log(param.get("file"));
-
-    return this.getHeaderForUpload(needAuth, fillBearer).then((data) => {
-
-      let pro = axiosInstanceFile
-        .post(config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/upload', param, {
-          headers: data,
-          timeout: config.file.timeout,
-          onUploadProgress: e => {
-            var completeProgress = ((e.loaded / e.total * 100) | 0) + "%";
-            opts.process(completeProgress)
-          }
-        })
-        .then(function (res) {
-
-          let data = res.data
-          if (Object.prototype.toString.call(data) == "[object String]") {
-            data = JSON.parse(data)
-          }
-
-          if (data.result.isSuccess) {
-            if (!ak.utils.isEmpty(data.result.message)) {
-              return new Promise(function (resolve, reject) {
-                ak.msg.alert(data.result.message, () => {
-                  resolve(data.data)
-                })
-              })
-            } else {
-              return Promise.resolve(data.data)
-            }
-          } else {
-            return new Promise(function (resolve, reject) {
-              ak.msg.alert(data.result.error, () => {
-                reject(res)
-              })
-            })
-          }
-
-        })
-
-      if (reject) {
-        pro.catch(function () {
-          return Promise.reject()
-        })
-      }
-
-      return pro
-
-    })
-
-
-  }
-};
-
-export default http;
+import axios from 'axios';
+import config from './config';
+import ak from './ak';
+import {ua} from './ua'
+import session from '../session';
+import service from '../service';
+
+var axiosInstance = axios.create({
+  baseURL: config.http.gwURL,
+  timeout: config.http.timeout,
+  withCredentials: false
+});
+
+var axiosInstanceFile = axios.create({
+  baseURL: config.file.baseURL,
+  timeout: config.file.timeout,
+  withCredentials: false
+});
+
+axiosInstance.interceptors.response.use(
+  function (response) {
+    session.sys.loadcnt--
+    return response;
+  },
+  function (error) {
+    session.sys.loadcnt--
+    if (error.message === 'Network Error') {
+      ak.msg.alert('网络不可用，请重试！')
+      return Promise.reject(error)
+    }
+    if (error.message.indexOf('timeout') > -1) {
+      ak.msg.alert('网络超时，请重试！')
+      return Promise.reject(error)
+    }
+    if (!error.response) {
+      ak.msg.alert(error.message)
+      return Promise.reject(error)
+    }
+
+    if (error.response.status === 401) {
+
+      service.callService(['logout']);
+      return Promise.reject(error)
+
+    } else if (error.response.status === 200) {
+
+      return Promise.resolve(error.response);
+
+    } else {
+
+      ak.msg.alert('服务调用错误，请重试')
+      return Promise.reject(error)
+    }
+
+
+  });
+
+
+axiosInstanceFile.interceptors.response.use(
+  function (response) {
+    session.sys.loadcnt--
+    return response;
+  },
+  function (error) {
+    session.sys.loadcnt--
+    if (error.message === 'Network Error') {
+      ak.msg.alert('网络不可用，请重试！')
+      return Promise.reject(error)
+    }
+    if (error.message.indexOf('timeout') > -1) {
+      ak.msg.alert('网络超时，请重试！')
+      return Promise.reject(error)
+    }
+    if (!error.response) {
+      ak.msg.alert(error.message)
+      return Promise.reject(error)
+    }
+
+    if (error.response.status === 401) {
+
+      service.callService(['logout']);
+      return Promise.reject(error)
+
+    } else if (error.response.status === 200) {
+
+      return Promise.resolve(error.response);
+
+    } else {
+
+      ak.msg.alert('服务调用错误，请重试')
+
+    }
+
+
+  });
+
+axiosInstance.interceptors.request.use(
+  function (config2) {
+    session.sys.loadcnt++
+    return config2;
+  },
+  function (error) {
+    console.log(error)
+    session.sys.loadcnt--
+    return Promise.reject(error);
+  }
+);
+
+
+axiosInstanceFile.interceptors.request.use(
+  function (config) {
+    session.sys.loadcnt++
+    return config;
+  },
+  function (error) {
+    session.sys.loadcnt--
+    return Promise.reject(error);
+  }
+);
+
+
+var http = {
+
+  getHeader: function (needAuth, fillBearer) {
+
+    let services = []
+    if (needAuth) {
+      services = ['getToken', 'getSystemData']
+    } else {
+      services = ['getSystemData']
+    }
+
+    let getToken = service.callServices(services).then((data) => {
+
+      let attr2 = ua.iPad ? 'PAD' : (ua.mobile ? 'PHONE' : 'PC')
+      if (!needAuth) data = [null, data[0]]
+      let header = {
+        'Content-Type': 'application/json',
+        'Accept-Device': data[1].model + '-' + data[1].systemType + '-' + data[1].version,
+        'Accept-DeviceOS': data[1].brand + '-' + data[1].chancel,
+        'Accept-Location': 'NULL', // location
+        'Accept-ISP': 'NULL',
+        'Accept-StartTime': 'NULL',
+        'Accept-TimeZone': 28800000,
+        'Accept-Attr1': data[1].uuid,
+        'Accept-Attr2': attr2,
+        'Accept-Attr3': 'zh_CN',
+        'Accept-Attr4': 'NULL', // 包名 传空
+        'Accept-Attr6': data[0]?data[0].loginId:'NULL',
+        'Real-Ip': 'NULL'
+      }
+
+      if (needAuth) {
+
+        if (fillBearer && ak.utils.isEmpty(data[0].token)) {
+          header['Authorization'] = 'Bearer ' + SSOToken.getToken(config.auth.userId, config.auth.privatKey, 60 * 10)
+        } else {
+          header['Authorization'] = data[0].type + ' ' + data[0].token
+        }
+
+      } else if (fillBearer) {
+        header['Authorization'] = 'Bearer ' + SSOToken.getToken(config.auth.userId, config.auth.privatKey, 60 * 10)
+      }
+
+      console.log(header, session)
+      return Promise.resolve(header)
+
+    })
+
+    return getToken.then((data) => {
+
+      if (!needAuth)
+        return Promise.resolve(data)
+
+      if (ak.utils.isEmpty(data.Authorization)) {
+        // getToken获取不到的时候 跳转登录 注释这块的处理
+        // service.callService(['logout'])
+        return Promise.reject()
+      } else {
+        return Promise.resolve(data)
+      }
+
+    })
+
+  },
+  getHeaderForUpload: function (needAuth, fillBearer) {
+
+    return this.getHeader(needAuth, fillBearer).then((data) => {
+      delete data['Content-Type']
+      return data
+    })
+
+  },
+  get: function (resource, params) {
+
+    let url = resource.startWith('http') ? resource : (config.http.gwURL + resource)
+
+    return axiosInstance
+      .get(url, {params: params, timeout: config.http.timeout})
+      .then(function (res) {
+        return Promise.resolve(res.data)
+      })
+      .catch(function (err) {
+
+      });
+
+  },
+
+  post: function (resource, params, needAuth = false, fillBearer = false, reject = true) {
+
+    let url = resource.startWith('http') ? resource : (config.http.gwURL + resource)
+    let pro = this.getHeader(needAuth, fillBearer).then((data) => {
+      return axiosInstance
+        .post(url, JSON.stringify(params), {
+          headers: data,
+          timeout: config.http.timeout
+        })
+        .then(function (res) {
+
+          let data = res.data
+          if (Object.prototype.toString.call(data) == "[object String]") {
+            data = JSON.parse(data)
+          }
+
+          if (data.result.isSuccess) {
+            if (!ak.utils.isEmpty(data.result.message)) {
+              return new Promise(function (resolve, reject) {
+                ak.msg.alert(data.result.message, () => {
+                  resolve(data.data)
+                })
+              })
+            } else {
+              return Promise.resolve(data.data)
+            }
+          } else {
+
+            if (data.result.errorCode == 'E401' || data.result.errorCode == 'E403') {
+              service.callService(['logout'])
+              return Promise.reject(res)
+            }
+
+            var errorm = ''
+            for (let err2 = 0; err2 < data.result.errors.length; err2++) {
+              errorm += data.result.errors[err2].error + '\r\n'
+            }
+
+            if (errorm != '') {
+              return new Promise(function (resolve, reject) {
+                ak.msg.alert(errorm, () => {
+                  reject(res)
+                })
+              })
+            } else {
+              return new Promise(function (resolve, reject) {
+                ak.msg.alert(data.result.error, () => {
+                  reject(res)
+                })
+              })
+            }
+          }
+
+        })
+
+    })
+
+    if (reject) {
+      pro.catch(function () {
+        return Promise.reject()
+      })
+    }
+
+    return pro
+
+  },
+
+  uploadFile: function (opts, needAuth = false, fillBearer = false, reject = true) {
+
+    let param = new FormData();
+    param.append("file", opts.file);
+    param.append("name", opts.name);
+    param.append("domain", opts.domain);
+    param.append("buz", opts.buz);
+    param.append("buzId", opts.buzId);
+    param.append("expired", opts.expired);
+    param.append("actions", opts.actions);
+    if (opts.auth !== undefined) {
+      param.append("auth", opts.auth);
+    }
+
+    console.log(param.get("file"));
+
+    return this.getHeaderForUpload(needAuth, fillBearer).then((data) => {
+
+      let pro = axiosInstanceFile
+        .post(config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/upload', param, {
+          headers: data,
+          timeout: config.file.timeout,
+          onUploadProgress: e => {
+            var completeProgress = ((e.loaded / e.total * 100) | 0) + "%";
+            opts.process(completeProgress)
+          }
+        })
+        .then(function (res) {
+
+          let data = res.data
+          if (Object.prototype.toString.call(data) == "[object String]") {
+            data = JSON.parse(data)
+          }
+
+          if (data.result.isSuccess) {
+            if (!ak.utils.isEmpty(data.result.message)) {
+              return new Promise(function (resolve, reject) {
+                ak.msg.alert(data.result.message, () => {
+                  resolve(data.data)
+                })
+              })
+            } else {
+              return Promise.resolve(data.data)
+            }
+          } else {
+            return new Promise(function (resolve, reject) {
+              ak.msg.alert(data.result.error, () => {
+                reject(res)
+              })
+            })
+          }
+
+        })
+
+      if (reject) {
+        pro.catch(function () {
+          return Promise.reject()
+        })
+      }
+
+      return pro
+
+    })
+
+
+  }
+};
+
+export default http;