|
@@ -3,7 +3,7 @@ const SM4Exten = require('../js/SM4Exten');
|
|
|
const miniprogramsm4 = require("../miniprogram_npm/miniprogram-sm-crypto/index").sm4;
|
|
|
const secretId = "D2BCF8DE-AA24-4BF6-9C34-C8DD325E412B";//小程序应用ID
|
|
|
const Secret = "6C680A47B87740138DFB299FC69A64E1";//小程序应用密钥
|
|
|
-const api_root = 'http://192.168.0.202:5006/'
|
|
|
+const api_root = 'http://192.168.88.140:5006/'
|
|
|
const CurrentBuId = '12345678-9abc-def0-1234-56789abcdef0';
|
|
|
|
|
|
function request(path, method = 'GET', data = null) {
|
|
@@ -13,14 +13,18 @@ function request(path, method = 'GET', data = null) {
|
|
|
var url = api_root + path;
|
|
|
var nonce = generateRandomString();
|
|
|
const timestamp = Date.now();
|
|
|
+ console.log('data :' + data);
|
|
|
let jsonString = (data != null && method != 'GET') ? JSON.stringify(data) : '';
|
|
|
console.log('request :' + jsonString);
|
|
|
var stringToSign = "sign_method=" +sign_method +
|
|
|
"&secret_id=" +secretId+
|
|
|
"&nonce=" + nonce +
|
|
|
- "×tamp=" + timestamp +
|
|
|
- jsonString;
|
|
|
- debugger
|
|
|
+ "×tamp=" + timestamp;
|
|
|
+ if(jsonString != '')
|
|
|
+ {
|
|
|
+ stringToSign += "&"+jsonString
|
|
|
+ }
|
|
|
+ debugger
|
|
|
console.log('加密串 :' + stringToSign);
|
|
|
let key = stringToHex(Secret);//key转16进制
|
|
|
key = getFirst32Chars(key);//截取前16位
|
|
@@ -174,8 +178,28 @@ function request_GetMiniProgramTransactionsUnpaidNozzle(data) {
|
|
|
function request_Wechatlogin(data) {
|
|
|
return request('api/Auth/Wechatlogin?code='+ data, "GET",data);
|
|
|
}
|
|
|
+
|
|
|
+//添加用户信息
|
|
|
+function request_AddMiniprogramUser(data) {
|
|
|
+ return request('api/Site/AddMiniprogramUser', "POST",data);
|
|
|
+}
|
|
|
+
|
|
|
+//向fcc发起油枪授权
|
|
|
+function request_NozzleAuthorization(data) {
|
|
|
+ return request('api/Nozzle/NozzleAuthorization?trxid=' +data, "GET",data);
|
|
|
+}
|
|
|
+
|
|
|
+//向fcc发起取消油枪授权
|
|
|
+function request_CancelNozzleAuthorization(data) {
|
|
|
+ return request('api/Nozzle/CancelNozzleAuthorization?trxid=' +data, "GET",data);
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
export default {
|
|
|
- request_getSite,
|
|
|
+ request_GetSiteInfo,
|
|
|
request_wechatPay,
|
|
|
- request_Wechatlogin
|
|
|
+ request_Wechatlogin,
|
|
|
+ request_AddMiniprogramUser,
|
|
|
+ request_NozzleAuthorization,
|
|
|
+ request_CancelNozzleAuthorization
|
|
|
}
|