fstarter 2.10.56 → 2.10.57

package/src/plugins/services/getSystemData.js

@@ -1,128 +1,144 @@
-import ak from '../assets/ak.js'
-import isp_phone from '../platform/isp_phone.js'
-import session from '../session'
-import {ua} from '../assets/ua.js'
-import config from '../assets/config.js'
-
-var service = {
-
-  getData(){
-    return {}
-  },
-  invoke(params){
-    if(ua.isIspPhone){
-      return this.invoke2_isp(params)
-    }else if(ua.microMsg){
-      return this.invoke2_microMsg(params)
-    }else{
-      return this.invoke2_browser(params)
-    }
-  },
-  invoke2_isp(params){
-
-    if(!ak.utils.isEmpty(isp_phone.data.GET_PHONE_INFO)){
-      let data = isp_phone.data.GET_PHONE_INFO.nativeData
-      return Promise.resolve({
-        model:data.model,
-        systemType:data.systemType,
-        version:data.version,
-        brand:data.brand,
-        chancel:data.chancel,
-        isp:data.isp,
-        startTime:data.startTime,
-        timeZone: data.timeZone,
-        uuid: data.uuid,
-        packageInfo: data.packageInfo,
-        loginName: data.loginName,
-        ip:data.ip
-      })
-    }
-
-    isp_phone.callShell('GET_PHONE_INFO', null, null)
-    let self = this
-    var p = new Promise(function(resolve, reject){
-      self.onWait(self,resolve)
-    });
-
-    return p;
-
-  },
-  invoke2_microMsg(params){
-    if(ak.utils.isEmpty(session.sys.uuid))
-      session.sys.uuid = ak.utils.guid2()
-
-    if(ak.utils.isEmpty(session.sys.startTime))
-      session.sys.startTime = Date.parse(new Date())
-    console.log(navigator)
-    let connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || { type:'unknown' }
-    let offset = (new Date()).getTimezoneOffset() / 60
-    return Promise.resolve({
-      model:'NULL',
-      systemType:'microMsg',
-      version:'NULL',
-      brand:'NULL',
-      chancel:'NULL',
-      isp: `${connection.type || connection.effectiveType}`,
-      startTime:session.sys.startTime,
-      timeZone: offset,
-      uuid: session.sys.uuid,
-      packageInfo: config.sys.id + '-1.9.1',
-      loginName: session.userInfo.userId,
-      ip:'0.0.0.0'
-    })
-
-  },
-  invoke2_browser(params){
-    if(ak.utils.isEmpty(session.sys.uuid))
-      session.sys.uuid = ak.utils.guid2()
-
-    if(ak.utils.isEmpty(session.sys.startTime))
-      session.sys.startTime = Date.parse(new Date())
-    console.log(navigator)
-    let connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || { type:'unknown' }
-    let offset = (new Date()).getTimezoneOffset() / 60
-    return Promise.resolve({
-      model:'NULL',
-      systemType:'microMsg',
-      version:'NULL',
-      brand:'NULL',
-      chancel:'NULL',
-      isp: `${connection.type || connection.effectiveType}`,
-      startTime:session.sys.startTime,
-      timeZone: offset,
-      uuid: session.sys.uuid,
-      packageInfo: config.sys.id + '-1.9.1',
-      loginName: session.userInfo.userId,
-      ip:'0.0.0.0'
-    })
-
-  },
-  onWait(self,resolve){
-
-    if(isp_phone.status.GET_PHONE_INFO >= 10){
-      isp_phone.status.GET_PHONE_INFO = 0
-      let data = isp_phone.data.GET_PHONE_INFO.nativeData
-      resolve({
-        model:data.model,
-        systemType:data.systemType,
-        version:data.version,
-        brand:data.brand,
-        chancel:data.chancel,
-        isp:data.isp,
-        startTime:data.startTime,
-        timeZone: data.timeZone,
-        uuid: data.uuid,
-        packageInfo: data.packageInfo,
-        loginName: data.loginName,
-        ip:data.ip
-      })
-    }else{
-      isp_phone.status.GET_PHONE_INFO++
-      setTimeout(function(){self.onWait(self,resolve)}, 500);
-    }
-
-  }
-
-}
-
-export default service;
+import ak from '../assets/ak.js'
+import isp_phone from '../platform/isp_phone.js'
+import session from '../session'
+import {ua} from '../assets/ua.js'
+import config from '../assets/config.js'
+import nativeUtils from '../plugins/nativeUtils'
+
+var service = {
+
+  getData(){
+    return {}
+  },
+  invoke(params){
+    if(ua.isIspPhone){
+      return this.invoke2_isp(params)
+    }else if(ua.microMsg){
+      return this.invoke2_microMsg(params)
+    }else{
+      return this.invoke2_browser(params)
+    }
+  },
+  invoke2_isp(params){
+    return nativeUtils.getDeviceInfo().then(data => {
+      return {
+        model: data.model,
+        systemType: data.osName,
+        version: data.appVersion,
+        brand: data.brand,
+        chancel: data.model,
+        isp: data.isp,
+        startTime: data.StartTime,
+        timeZone: data.timezone,
+        uuid: data.deviceId,
+        packageInfo: data.packageInfo,
+        ip:data.ip
+      }
+    })
+
+    // if(!ak.utils.isEmpty(isp_phone.data.GET_PHONE_INFO)){
+    //   let data = isp_phone.data.GET_PHONE_INFO.nativeData
+    //   return Promise.resolve({
+    //     model:data.model,
+    //     systemType:data.systemType,
+    //     version:data.version,
+    //     brand:data.brand,
+    //     chancel:data.chancel,
+    //     isp:data.isp,
+    //     startTime:data.startTime,
+    //     timeZone: data.timeZone,
+    //     uuid: data.uuid,
+    //     packageInfo: data.packageInfo,
+    //     loginName: data.loginName,
+    //     ip:data.ip
+    //   })
+    // }
+
+    // isp_phone.callShell('GET_PHONE_INFO', null, null)
+    // let self = this
+    // var p = new Promise(function(resolve, reject){
+    //   self.onWait(self,resolve)
+    // });
+
+    // return p;
+
+  },
+  invoke2_microMsg(params){
+    if(ak.utils.isEmpty(session.sys.uuid))
+      session.sys.uuid = ak.utils.guid2()
+
+    if(ak.utils.isEmpty(session.sys.startTime))
+      session.sys.startTime = Date.parse(new Date())
+    console.log(navigator)
+    let connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || { type:'unknown' }
+    let offset = (new Date()).getTimezoneOffset() / 60
+    return Promise.resolve({
+      model:'NULL',
+      systemType:'microMsg',
+      version:'NULL',
+      brand:'NULL',
+      chancel:'NULL',
+      isp: `${connection.type || connection.effectiveType}`,
+      startTime:session.sys.startTime,
+      timeZone: offset,
+      uuid: session.sys.uuid,
+      packageInfo: config.sys.id + '-1.9.1',
+      loginName: session.userInfo.userId,
+      ip:'0.0.0.0'
+    })
+
+  },
+  invoke2_browser(params){
+    if(ak.utils.isEmpty(session.sys.uuid))
+      session.sys.uuid = ak.utils.guid2()
+
+    if(ak.utils.isEmpty(session.sys.startTime))
+      session.sys.startTime = Date.parse(new Date())
+    console.log(navigator)
+    let connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || { type:'unknown' }
+    let offset = (new Date()).getTimezoneOffset() / 60
+    return Promise.resolve({
+      model:'NULL',
+      systemType:'microMsg',
+      version:'NULL',
+      brand:'NULL',
+      chancel:'NULL',
+      isp: `${connection.type || connection.effectiveType}`,
+      startTime:session.sys.startTime,
+      timeZone: offset,
+      uuid: session.sys.uuid,
+      packageInfo: config.sys.id + '-1.9.1',
+      loginName: session.userInfo.userId,
+      ip:'0.0.0.0'
+    })
+
+  },
+  onWait(self,resolve){
+
+    if(isp_phone.status.GET_PHONE_INFO >= 10){
+      isp_phone.status.GET_PHONE_INFO = 0
+      let data = isp_phone.data.GET_PHONE_INFO.nativeData
+      resolve({
+        model:data.model,
+        systemType:data.systemType,
+        version:data.version,
+        brand:data.brand,
+        chancel:data.chancel,
+        isp:data.isp,
+        startTime:data.startTime,
+        timeZone: data.timeZone,
+        uuid: data.uuid,
+        packageInfo: data.packageInfo,
+        loginName: data.loginName,
+        ip:data.ip
+      })
+    }else{
+      isp_phone.status.GET_PHONE_INFO++
+      setTimeout(function(){self.onWait(self,resolve)}, 500);
+    }
+
+  }
+
+}
+
+export default service;

package/src/plugins/services/getToken.js

@@ -1,79 +1,93 @@
-import ak from '../assets/ak.js'
-import isp_phone from '../platform/isp_phone.js'
-import {ua} from '../assets/ua.js'
-import session from "../session";
-
-var service = {
-
-    getData(){
-      return {}
-    },
-    invoke(params){
-
-      if(ua.isIspPhone){
-        return this.invoke2_isp(params)
-      }else if(ua.microMsg){
-        return this.invoke2_microMsg(params)
-      }else{
-        return Promise.resolve()
-      }
-
-    },
-    invoke2_isp(params){
-
-      if(!ak.utils.isEmpty(isp_phone.data.GET_TOKEN)){
-        let data = isp_phone.data.GET_TOKEN.nativeData
-
-        if(session.sys.isLogined == ak.utils.isEmpty(data.token))
-          session.sys.isLogined = !ak.utils.isEmpty(data.token)
-
-        return Promise.resolve({
-          'token':data.token,
-          'type':'Basic'
-        })
-      }
-
-      let self = this
-      isp_phone.callShell('GET_TOKEN', null, null)
-      var p = new Promise(function(resolve, reject){
-        self.onWait(self,resolve)
-      })
-      return p
-    },
-    invoke2_microMsg(params){
-
-      const tokenKey = 'wxjtl'
-      let token = ak.http.getCookie2(tokenKey)
-
-      if(session.sys.isLogined == ak.utils.isEmpty(token))
-        session.sys.isLogined = !ak.utils.isEmpty(token)
-
-      return Promise.resolve({
-        'token': token,
-        'type':'Inner'
-      })
-
-    },
-    onWait(self,resolve){
-
-      if(isp_phone.status.GET_TOKEN >= 10){
-        isp_phone.status.GET_TOKEN = 0
-        let data = isp_phone.data.GET_TOKEN.nativeData
-
-        if(session.sys.isLogined == ak.utils.isEmpty(data.token))
-          session.sys.isLogined = !ak.utils.isEmpty(data.token)
-
-        return resolve({
-          'token':data.token,
-          'type':'Basic'
-        })
-
-      }else{
-        isp_phone.status.GET_TOKEN++
-        setTimeout(function(){self.onWait(self,resolve)}, 500);
-      }
-
-    }
-}
-
-export default service;
+import ak from '../assets/ak.js'
+import isp_phone from '../platform/isp_phone.js'
+import {ua} from '../assets/ua.js'
+import session from "../session";
+import nativeUtils from '../plugins/nativeUtils'
+
+var service = {
+
+    getData(){
+      return {}
+    },
+    invoke(params){
+
+      if(ua.isIspPhone){
+        return this.invoke2_isp(params)
+      }else if(ua.microMsg){
+        return this.invoke2_microMsg(params)
+      }else{
+        // return Promise.resolve()
+        return Promise.resolve({
+          'token': sessionStorage.getItem('token'),
+          'type':'Basic',
+          'loginId': 'NULL'
+        })
+      }
+
+    },
+    invoke2_isp(params){
+      return nativeUtils.getUserInfo().then(res => {
+        return {
+          'token': res.token,
+          'type':'Basic',
+          'loginId': res.userId
+        }
+      })
+
+      // if(!ak.utils.isEmpty(isp_phone.data.GET_TOKEN)){
+      //   let data = isp_phone.data.GET_TOKEN.nativeData
+
+      //   if(session.sys.isLogined == ak.utils.isEmpty(data.token))
+      //     session.sys.isLogined = !ak.utils.isEmpty(data.token)
+
+      //   return Promise.resolve({
+      //     'token':data.token,
+      //     'type':'Basic'
+      //   })
+      // }
+
+      // let self = this
+      // isp_phone.callShell('GET_TOKEN', null, null)
+      // var p = new Promise(function(resolve, reject){
+      //   self.onWait(self,resolve)
+      // })
+      // return p
+    },
+    invoke2_microMsg(params){
+
+      const tokenKey = 'wxjtl'
+      let token = ak.http.getCookie2(tokenKey)
+
+      if(session.sys.isLogined == ak.utils.isEmpty(token))
+        session.sys.isLogined = !ak.utils.isEmpty(token)
+
+      return Promise.resolve({
+        'token': token,
+        'type':'Inner',
+        'loginId': 'NULL'
+      })
+
+    },
+    onWait(self,resolve){
+
+      if(isp_phone.status.GET_TOKEN >= 10){
+        isp_phone.status.GET_TOKEN = 0
+        let data = isp_phone.data.GET_TOKEN.nativeData
+
+        if(session.sys.isLogined == ak.utils.isEmpty(data.token))
+          session.sys.isLogined = !ak.utils.isEmpty(data.token)
+
+        return resolve({
+          'token':data.token,
+          'type':'Basic'
+        })
+
+      }else{
+        isp_phone.status.GET_TOKEN++
+        setTimeout(function(){self.onWait(self,resolve)}, 500);
+      }
+
+    }
+}
+
+export default service;

package/src/plugins/services/getTxFaceResult.js

@@ -1,83 +1,83 @@
-import http from '../assets/http.js'
-import ak from '../assets/ak.js'
-import config from '../assets/config.js'
-import {ua} from "../assets/ua";
-import service from "../service"
-
-var getTxFaceResult = {
-    
-    need(){
-        
-        let token = ak.http.getQueryString('facetoken')
-        if(ak.utils.isEmpty(token)){
-            localStorage.removeItem('faceAbout')
-            return false
-        } else {
-            return true
-        }
-
-    },
-    getData(){
-        
-        let obj = JSON.parse(localStorage.getItem('faceAbout'))
-
-        localStorage.removeItem('faceAbout')
-        return {
-            biz_no: obj.bizSeqNo,
-            userId: obj.userId,
-            orderNo: obj.orderNo,
-            nonce: obj.nonce,
-            expired: '-1000',
-            buz: 'POLICY_FILE',
-            domain: 'POLICY',
-            buzId: radomNum(16),
-            fileName:  radomNum(16)
-
-        }
-    },
-
-    invoke(params){
-    //   let faceType = params.faceType
-    //   delete params.faceType
-
-      if(ua.isIspPhone){
-
-
-      }else if(ua.microMsg){
-        let apiUrl = config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/getTXFaceCompareResult'
-        return http.post(apiUrl,params,true,true).then((data)=>{
-          let res = data.result
-          let resData = {
-            confidence: res.similarity,
-            imageFile: res.faceFileId,
-            success: true
-          }
-          service.saveInitService('getTxFaceResult',resData)
-          let reUrl = ak.http.deleteParams(window.location.href,'facetoken')
-          window.location.href = reUrl
-          return Promise.resolve(resData)
-        }).catch(err => {
-          let reUrl = ak.http.deleteParams(window.location.href,'facetoken')
-          reUrl = ak.http.deleteParams(reUrl,'orderNo')
-          reUrl = ak.http.deleteParams(reUrl,'signature')
-          reUrl = ak.http.deleteParams(reUrl,'h5faceId')
-          reUrl = ak.http.deleteParams(reUrl,'code')
-          window.location.href = reUrl
-          return  Promise.reject(err)
-        })
-
-      }else{
-        Promise.reject()
-      }
-
-    }
-    
-}
-function radomNum(n) {
-  var rnd = ''
-  for (var i = 0; i < n; i++) {
-    rnd += Math.floor(Math.random() * 10)
-  }
-  return rnd
-}
-export default getTxFaceResult;
+import http from '../assets/http.js'
+import ak from '../assets/ak.js'
+import config from '../assets/config.js'
+import {ua} from "../assets/ua";
+import service from "../service"
+
+var getTxFaceResult = {
+    
+    need(){
+        
+        let token = ak.http.getQueryString('facetoken')
+        if(ak.utils.isEmpty(token)){
+            localStorage.removeItem('faceAbout')
+            return false
+        } else {
+            return true
+        }
+
+    },
+    getData(){
+        
+        let obj = JSON.parse(localStorage.getItem('faceAbout'))
+
+        localStorage.removeItem('faceAbout')
+        return {
+            biz_no: obj.bizSeqNo,
+            userId: obj.userId,
+            orderNo: obj.orderNo,
+            nonce: obj.nonce,
+            expired: '-1000',
+            buz: 'POLICY_FILE',
+            domain: 'POLICY',
+            buzId: radomNum(16),
+            fileName:  radomNum(16)
+
+        }
+    },
+
+    invoke(params){
+    //   let faceType = params.faceType
+    //   delete params.faceType
+
+      if(ua.isIspPhone){
+
+
+      }else if(ua.microMsg){
+        let apiUrl = config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/getTXFaceCompareResult'
+        return http.post(apiUrl,params,true,true).then((data)=>{
+          let res = data.result
+          let resData = {
+            confidence: res.similarity,
+            imageFile: res.faceFileId,
+            success: true
+          }
+          service.saveInitService('getTxFaceResult',resData)
+          let reUrl = ak.http.deleteParams(window.location.href,'facetoken')
+          window.location.href = reUrl
+          return Promise.resolve(resData)
+        }).catch(err => {
+          let reUrl = ak.http.deleteParams(window.location.href,'facetoken')
+          reUrl = ak.http.deleteParams(reUrl,'orderNo')
+          reUrl = ak.http.deleteParams(reUrl,'signature')
+          reUrl = ak.http.deleteParams(reUrl,'h5faceId')
+          reUrl = ak.http.deleteParams(reUrl,'code')
+          window.location.href = reUrl
+          return  Promise.reject(err)
+        })
+
+      }else{
+        Promise.reject()
+      }
+
+    }
+    
+}
+function radomNum(n) {
+  var rnd = ''
+  for (var i = 0; i < n; i++) {
+    rnd += Math.floor(Math.random() * 10)
+  }
+  return rnd
+}
+export default getTxFaceResult;