Commit a95c16ce by liangjianmin

新增供应链WMS系统登录功能,优化请求封装,更新相关API地址

parent b5ca6d69
import App from './App'
import {request} from './util/util.js'
import {request, scRequest} from './util/util.js'
// #ifndef VUE3
import Vue from 'vue'
Vue.config.productionTip = false;
Vue.prototype.request = request;
Vue.prototype.scRequest = scRequest;
App.mpType = 'app'
const app = new Vue({
...App
......
......@@ -13,12 +13,13 @@
</view>
<button class="btn row rowCenter verCenter" @click="submit()">登录</button>
</view>
<view class="copyright">©2022深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
<view class="copyright">©2026深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
import md5 from '@/util/md5.js';
export default {
data() {
......@@ -57,6 +58,9 @@
uni.setStorageSync('token', res.data.token);
uni.setStorageSync('email', res.data.email);
// 静默登录供应链WMS系统,获取 oa_skey/oa_user_id,失败不影响主流程
this.silentLoginScWms();
uni.switchTab({
url: '/pages/home/index'
})
......@@ -68,6 +72,26 @@
});
}
});
},
/**
* 静默登录供应链WMS(sc_wms_app)系统
* 使用 scRequest(对齐 sc_wms_app 请求规范)获取并写入 oa_skey、oa_user_id,失败不影响主流程
*/
silentLoginScWms() {
var params = {
name: this.account,
passwd: md5.hex_md5_32(this.passwd)
};
this.scRequest(API.scWmsLogin, 'POST', params, false).then(res => {
if (res && res.retcode === 0 && res.data) {
uni.setStorageSync('oa_skey', res.data.skey);
uni.setStorageSync('oa_user_id', res.data.userId);
} else {
console.log('[静默登录 scWms] 失败:', res && (res.errMsg || res));
}
}).catch(err => {
console.log('[静默登录 scWms] 异常:', err);
});
}
}
};
......
......@@ -226,7 +226,7 @@
*/
getData() {
var currentPage = this.searchParams.page;
this.request(API.stockOutList, 'POST', this.searchParams, false).then(res => {
this.scRequest(API.stockOutList, 'POST', this.searchParams, false).then(res => {
// 关闭骨架屏、下拉刷新和加载更多
this.skeleton = false;
this.refreshing = false;
......@@ -354,7 +354,7 @@
var remainingImages = imageArray.join(',');
// 调用接口更新
this.request(API.uploadExpressPic, 'POST', { stock_out_id: stock_out_id, sign_file: remainingImages }, true).then(res => {
this.scRequest(API.uploadExpressPic, 'POST', { stock_out_id: stock_out_id, sign_file: remainingImages }, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '删除成功',
......@@ -387,7 +387,7 @@
allSignFiles = this.sign_file;
}
this.request(API.uploadExpressPic, 'POST', { stock_out_id: this.stock_out_id, sign_file: allSignFiles }, true).then(res => {
this.scRequest(API.uploadExpressPic, 'POST', { stock_out_id: this.stock_out_id, sign_file: allSignFiles }, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '上传成功',
......
......@@ -8,14 +8,16 @@ var ENV_CONFIG = {
API_BASE_OSS: 'https://image.ichunt.net',
API_BASE_OSS_HK: 'http://hk.image.semour.com',
API_BASE_WMS: 'https://wms.ichunt.net',
API_BASE_SCWMS: 'http://scwms.ichunt.net'
API_BASE_SCWMS: 'http://scwms.ichunt.net',
API_BASE_USER: 'https://user.ichunt.net'
},
development: {
API_BASE: 'http://api.liexin.com',
API_BASE_OSS: 'http://image.liexindev.net',
API_BASE_OSS_HK: 'http://image.liexindev.net',
API_BASE_WMS: 'http://wms.liexindev.net',
API_BASE_SCWMS: 'http://adminwms.liexindev.net'
API_BASE_SCWMS: 'http://adminwms.liexindev.net',
API_BASE_USER: 'http://user.liexindev.net'
}
};
......@@ -26,6 +28,7 @@ var API_BASE_OSS = currentEnv.API_BASE_OSS;
var API_BASE_OSS_HK = currentEnv.API_BASE_OSS_HK;
var API_BASE_WMS = currentEnv.API_BASE_WMS;
var API_BASE_SCWMS = currentEnv.API_BASE_SCWMS;
var API_BASE_USER = currentEnv.API_BASE_USER;
// 环境日志输出
var envText = ENV === 'production' ? '🔴 正式环境' : '🟢 测试环境';
......@@ -436,7 +439,11 @@ var API = {
/**
* 快递回单上传
*/
uploadExpressPic: API_BASE_SCWMS + '/api/stockOut/uploadExpressPic'
uploadExpressPic: API_BASE_SCWMS + '/api/stockOut/uploadExpressPic',
/**
* 供应链WMS系统登录(用户系统,用于获取 oa_skey/oa_user_id)
*/
scWmsLogin: API_BASE_USER + '/api/login'
}
......
let w_md5 = {}
function hex_md5(string,bit) {
function md5_RotateLeft(lValue, iShiftBits) {
return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
}
function md5_AddUnsigned(lX, lY) {
var lX4, lY4, lX8, lY8, lResult;
lX8 = (lX & 0x80000000);
lY8 = (lY & 0x80000000);
lX4 = (lX & 0x40000000);
lY4 = (lY & 0x40000000);
lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
if (lX4 & lY4) {
return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
}
if (lX4 | lY4) {
if (lResult & 0x40000000) {
return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
} else {
return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
}
} else {
return (lResult ^ lX8 ^ lY8);
}
}
function md5_F(x, y, z) {
return (x & y) | ((~x) & z);
}
function md5_G(x, y, z) {
return (x & z) | (y & (~z));
}
function md5_H(x, y, z) {
return (x ^ y ^ z);
}
function md5_I(x, y, z) {
return (y ^ (x | (~z)));
}
function md5_FF(a, b, c, d, x, s, ac) {
a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_F(b, c, d), x), ac));
return md5_AddUnsigned(md5_RotateLeft(a, s), b);
};
function md5_GG(a, b, c, d, x, s, ac) {
a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_G(b, c, d), x), ac));
return md5_AddUnsigned(md5_RotateLeft(a, s), b);
};
function md5_HH(a, b, c, d, x, s, ac) {
a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_H(b, c, d), x), ac));
return md5_AddUnsigned(md5_RotateLeft(a, s), b);
};
function md5_II(a, b, c, d, x, s, ac) {
a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_I(b, c, d), x), ac));
return md5_AddUnsigned(md5_RotateLeft(a, s), b);
};
function md5_ConvertToWordArray(string) {
var lWordCount;
var lMessageLength = string.length;
var lNumberOfWords_temp1 = lMessageLength + 8;
var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
var lWordArray = Array(lNumberOfWords - 1);
var lBytePosition = 0;
var lByteCount = 0;
while (lByteCount < lMessageLength) {
lWordCount = (lByteCount - (lByteCount % 4)) / 4;
lBytePosition = (lByteCount % 4) * 8;
lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
lByteCount++;
}
lWordCount = (lByteCount - (lByteCount % 4)) / 4;
lBytePosition = (lByteCount % 4) * 8;
lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
return lWordArray;
};
function md5_WordToHex(lValue) {
var WordToHexValue = "", WordToHexValue_temp = "", lByte, lCount;
for (lCount = 0; lCount <= 3; lCount++) {
lByte = (lValue >>> (lCount * 8)) & 255;
WordToHexValue_temp = "0" + lByte.toString(16);
WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length - 2, 2);
}
return WordToHexValue;
};
function md5_Utf8Encode(string) {
string = string.replace(/\r\n/g, "\n");
var utftext = "";
for (var n = 0; n < string.length; n++) {
var c = string.charCodeAt(n);
if (c < 128) {
utftext += String.fromCharCode(c);
} else if ((c > 127) && (c < 2048)) {
utftext += String.fromCharCode((c >> 6) | 192);
utftext += String.fromCharCode((c & 63) | 128);
} else {
utftext += String.fromCharCode((c >> 12) | 224);
utftext += String.fromCharCode(((c >> 6) & 63) | 128);
utftext += String.fromCharCode((c & 63) | 128);
}
}
return utftext;
};
var x = Array();
var k, AA, BB, CC, DD, a, b, c, d;
var S11 = 7, S12 = 12, S13 = 17, S14 = 22;
var S21 = 5, S22 = 9, S23 = 14, S24 = 20;
var S31 = 4, S32 = 11, S33 = 16, S34 = 23;
var S41 = 6, S42 = 10, S43 = 15, S44 = 21;
string = md5_Utf8Encode(string);
x = md5_ConvertToWordArray(string);
a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
for (k = 0; k < x.length; k += 16) {
AA = a; BB = b; CC = c; DD = d;
a = md5_FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
d = md5_FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
c = md5_FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
b = md5_FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
a = md5_FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
d = md5_FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
c = md5_FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
b = md5_FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
a = md5_FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
d = md5_FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
c = md5_FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
b = md5_FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
a = md5_FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
d = md5_FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
c = md5_FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
b = md5_FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
a = md5_GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
d = md5_GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
c = md5_GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
b = md5_GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
a = md5_GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
d = md5_GG(d, a, b, c, x[k + 10], S22, 0x2441453);
c = md5_GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
b = md5_GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
a = md5_GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
d = md5_GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
c = md5_GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
b = md5_GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
a = md5_GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
d = md5_GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
c = md5_GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
b = md5_GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
a = md5_HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
d = md5_HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
c = md5_HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
b = md5_HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
a = md5_HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
d = md5_HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
c = md5_HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
b = md5_HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
a = md5_HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
d = md5_HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
c = md5_HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
b = md5_HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
a = md5_HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
d = md5_HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
c = md5_HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
b = md5_HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
a = md5_II(a, b, c, d, x[k + 0], S41, 0xF4292244);
d = md5_II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
c = md5_II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
b = md5_II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
a = md5_II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
d = md5_II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
c = md5_II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
b = md5_II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
a = md5_II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
d = md5_II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
c = md5_II(c, d, a, b, x[k + 6], S43, 0xA3014314);
b = md5_II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
a = md5_II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
d = md5_II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
c = md5_II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
b = md5_II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
a = md5_AddUnsigned(a, AA);
b = md5_AddUnsigned(b, BB);
c = md5_AddUnsigned(c, CC);
d = md5_AddUnsigned(d, DD);
}
if(bit==32){
return (md5_WordToHex(a) + md5_WordToHex(b) + md5_WordToHex(c) + md5_WordToHex(d)).toLowerCase();
}
return (md5_WordToHex(b) + md5_WordToHex(c)).toLowerCase();
}
//16位小写
w_md5.hex_md5_16 = function (string) {
return hex_md5(string,16);
}
//16位大写
w_md5.hex_md5_16Upper = function (string) {
return hex_md5(string,16).toUpperCase();
}
//32位小写
w_md5.hex_md5_32 = function (string) {
return hex_md5(string,32);
}
//32位大写
w_md5.hex_md5_32Upper = function (string) {
return hex_md5(string,32).toUpperCase();
}
export default w_md5
\ No newline at end of file
......@@ -43,6 +43,57 @@ const request = (url = '', type = 'GET', param = {}, Loading) => {
/**
* 供应链WMS(sc_wms_app)系统请求封装
* 对齐 sc_wms_app/util/util.js 的 request:
* - header:source=pc,携带 oa-user-id / oa-skey
* - 参数自动附带 is_mobile=1
* @param {String} url 请求地址
* @param {String} type 请求方法
* @param {Object} param 请求参数
* @param {Boolean} loading 是否显示 loading
* @return {Promise}
*/
const scRequest = (url = '', type = 'GET', param = {}, loading = false) => {
var header = {
'Content-Type': 'application/json; charset=utf-8',
'source': 'pc',
'oa-user-id': uni.getStorageSync('oa_user_id') || '',
'oa-skey': uni.getStorageSync('oa_skey') || ''
};
var params = { ...param, is_mobile: 1 };
if (loading) {
uni.showLoading({ mask: true });
}
return new Promise((resolve, reject) => {
uni.request({
method: type,
url: url,
data: params,
header: header,
dataType: 'json'
}).then(response => {
if (loading) {
uni.hideLoading();
}
var [err, res] = response;
resolve((res && res.data) || {});
}).catch(error => {
if (loading) {
uni.hideLoading();
}
uni.showToast({
title: '网络出现问题',
icon: 'error'
});
var [err] = error || [];
reject(err);
});
});
};
/**
* 平台判断
*/
const getPlatform = () => {
......@@ -108,6 +159,7 @@ const findIndexOrZero = (arr, value) => {
module.exports = {
request,
scRequest,
getPlatform,
titleCase,
debounce,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment