From 3d71e181be80c0a1cbb03aff2afecb4351496d46 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 十一月 2022 11:19:21 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/api/index.js |   81 ++++++++++++++++++++++++++++------------
 1 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 2623ef3..23bdeca 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -219,7 +219,8 @@
       timestamp: moment().format('YYYY-MM-DD HH:mm:ss'), 
       SessionUid: _SessionUid,
       TypeCharOne: 'pc',
-      kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host))
+      kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
+      appkey: window.GLOB.appkey || ''
     }
 
     let url = '/webapi/dologon/s_visitor_login'
@@ -253,8 +254,6 @@
     param.v_type = param.v_type || 'Y'
     param.secretkey = md5(param.LText + solt + param.timestamp)
 
-    param.appkey = window.GLOB.appkey || ''
-
     return axios({
       url: url,
       method: 'post',
@@ -277,10 +276,9 @@
       login_city: city,
       login_id_address: ipAddress,
       kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
-      device_id: localStorage.getItem('SessionUid')
+      device_id: localStorage.getItem('SessionUid'),
+      appkey: window.GLOB.appkey || ''
     }
-
-    param.appkey = window.GLOB.appkey || ''
 
     let url = '/webapi/dologon'
     if (isCloud) {
@@ -314,10 +312,10 @@
       login_city: city,
       login_id_address: ipAddress,
       kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
-      device_id: localStorage.getItem('SessionUid')
+      device_id: localStorage.getItem('SessionUid'),
+      timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+      appkey: window.GLOB.appkey || ''
     }
-
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
 
     let sys_datetime = sessionStorage.getItem('sys_datetime')
     let app_datetime = sessionStorage.getItem('app_datetime')
@@ -342,22 +340,54 @@
     // Type: 'X' 鏃�
     // param.Password = Utils.formatOptions(password)
 
-    param.appkey = window.GLOB.appkey || ''
+    // positecgroup
+    if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+      param.svccode = 'oms'
+    }
+
     let url = '/webapi/dologon'
 
     if (isCloud) {
       param.debug = 'Y'
       if (options.cloudServiceApi) {
-        // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
         param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       }
     } else if (window.GLOB.mainSystemApi) {
       if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
         param.linkurl = window.GLOB.linkurl
       }
-      // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
     }
+
+    return axios({
+      url,
+      method: 'post',
+      data: param
+    })
+  }
+
+  /**
+   * @description 鐧诲綍浜屾楠岃瘉 // positecgroup
+   */
+  verifycode (verify) {
+    let param = {
+      certificate: 'certificate',
+      captcha: verify.code,
+      token: verify.token,
+      ati: verify.ati,
+      vid: verify.vid,
+      uid: verify.uid,
+      shopId: verify.shopId,
+      loginId: verify.loginId,
+      phone: verify.phone,
+      sellerNick: verify.sellerNick,
+      isRisk: verify.isRisk,
+      requestId: verify.requestId,
+      riskNum: verify.riskNum,
+      username: verify.username
+    }
+
+    let url = '/webapi/dologon'
 
     return axios({
       url,
@@ -797,17 +827,20 @@
     param.appkey = window.GLOB.appkey || ''
 
     let url = '/webapi/dostars'
-    if (param.rduri && !window.GLOB.transfer) {
+    if (param.rduri && !window.GLOB.transfer) { // positecgroup
       url = param.rduri
       delete param.rduri
     }
 
-    let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
-    delete _param.timestamp
-    delete _param.secretkey
-    delete _param.open_key
-    _param = JSON.stringify(_param)
-    _param  = md5(_param)
+    let _param = ''
+    if (cache) {
+      _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
+      delete _param.timestamp
+      delete _param.secretkey
+      delete _param.open_key
+      _param = JSON.stringify(_param)
+      _param  = md5(_param)
+    }
 
     if (cache && window.GLOB.CacheMap.has(_param)) {
       return Promise.resolve(window.GLOB.CacheMap.get(_param))
@@ -891,17 +924,17 @@
         UserName: token.username,
         systemType: options.sysType,
         login_city: sessionStorage.getItem('city') || '',
-        device_id: localStorage.getItem('SessionUid')
+        device_id: token.appkey || '',
+        timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+        Type: token.publicKey,
+        appkey: token.appkey || ''
       }
   
-      _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-
-      _param.Type = token.publicKey
       let shaObj = new jsSHA('SHA-1', 'TEXT')
       shaObj.update(token.password)
       _param.Password = shaObj.getHash('HEX').toUpperCase()
       _param.Password = md5(token.privateKey + token.username + _param.Password + _param.timestamp)
-      _param.appkey = token.appkey || ''
+
       let url = token.interface.replace(/\/webapi(.*)/, '/webapi/dologon')
   
       if (token.ssoInterface) {

--
Gitblit v1.8.0