Skip to content

Z
zhichan
Commit 0ed9890a by largezhou
Options

Merge branch 'test' into 'master' (merge request !1) 

test
 加解密 相关修改
parents cbb973d4 83cf946f
Showing with 26 additions and 24 deletions
ic-deliver/app/base/system.js
...@@ -5,7 +5,7 @@ const request = require('request'); ...@@ -5,7 +5,7 @@ const request = require('request');
const cryptoJS = require('crypto-js'); const cryptoJS = require('crypto-js');
class System { class System {
static declare(ns) { static declare (ns) {
var ar = ns.split('.'); var ar = ns.split('.');
var root = System; var root = System;
for (var i = 0, len = ar.length; i < len; ++i) { for (var i = 0, len = ar.length; i < len; ++i) {
...@@ -18,7 +18,7 @@ class System { ...@@ -18,7 +18,7 @@ class System {
} }
} }
} }
static async delReq(url, qdata) { static async delReq (url, qdata) {
let rtn = {} let rtn = {}
let promise = new Promise(function (resv, rej) { let promise = new Promise(function (resv, rej) {
request.del({ request.del({
...@@ -41,7 +41,7 @@ class System { ...@@ -41,7 +41,7 @@ class System {
}) })
return promise; return promise;
} }
static async getReq(url, qdata) { static async getReq (url, qdata) {
let rtn = {} let rtn = {}
let promise = new Promise(function (resv, rej) { let promise = new Promise(function (resv, rej) {
request.get({ request.get({
...@@ -64,7 +64,7 @@ class System { ...@@ -64,7 +64,7 @@ class System {
}) })
return promise; return promise;
} }
static async postJsonTypeReq(url, data, md = "POST") { static async postJsonTypeReq (url, data, md = "POST") {
let rtn = {} let rtn = {}
let promise = new Promise(function (resv, rej) { let promise = new Promise(function (resv, rej) {
request({ request({
...@@ -92,7 +92,7 @@ class System { ...@@ -92,7 +92,7 @@ class System {
}) })
return promise; return promise;
} }
static async post3wFormTypeReq(url, data) { static async post3wFormTypeReq (url, data) {
let rtn = {} let rtn = {}
let promise = new Promise(function (resv, rej) { let promise = new Promise(function (resv, rej) {
request.post({ request.post({
...@@ -111,7 +111,7 @@ class System { ...@@ -111,7 +111,7 @@ class System {
}) })
return promise; return promise;
} }
static async postMpFormTypeReq(url, formdata) { static async postMpFormTypeReq (url, formdata) {
let promise = new Promise(function (resv, rej) { let promise = new Promise(function (resv, rej) {
request.post({ request.post({
url: url, url: url,
...@@ -133,7 +133,7 @@ class System { ...@@ -133,7 +133,7 @@ class System {
* @param {*} okmsg 操作成功的描述 * @param {*} okmsg 操作成功的描述
* @param {*} req 请求头信息 * @param {*} req 请求头信息
*/ */
static getResult(data, opmsg = "操作成功", req) { static getResult (data, opmsg = "操作成功", req) {
return { return {
status: !data ? -1 : 0, status: !data ? -1 : 0,
msg: opmsg, msg: opmsg,
...@@ -146,7 +146,7 @@ class System { ...@@ -146,7 +146,7 @@ class System {
* @param {*} data 操作成功返回的数据 * @param {*} data 操作成功返回的数据
* @param {*} okmsg 操作成功的描述 * @param {*} okmsg 操作成功的描述
*/ */
static getResultSuccess(data, okmsg = "success") { static getResultSuccess (data, okmsg = "success") {
return { return {
status: 0, status: 0,
msg: okmsg, msg: okmsg,
...@@ -159,7 +159,7 @@ class System { ...@@ -159,7 +159,7 @@ class System {
* @param {*} errmsg 操作失败的描述，默认为fail * @param {*} errmsg 操作失败的描述，默认为fail
* @param {*} data 操作失败返回的数据 * @param {*} data 操作失败返回的数据
*/ */
static getResultFail(status = -1, errmsg = "fail", data = null) { static getResultFail (status = -1, errmsg = "fail", data = null) {
return { return {
status: status, status: status,
msg: errmsg, msg: errmsg,
...@@ -171,14 +171,14 @@ class System { ...@@ -171,14 +171,14 @@ class System {
* @param {*} errmsg 操作失败的描述，默认为fail * @param {*} errmsg 操作失败的描述，默认为fail
* @param {*} data 操作失败返回的数据 * @param {*} data 操作失败返回的数据
*/ */
static getResultError(errmsg = "fail", data = null) { static getResultError (errmsg = "fail", data = null) {
return { return {
status: -200, status: -200,
msg: errmsg, msg: errmsg,
data: data, data: data,
}; };
} }
static register(key, ClassObj, groupName, filename) { static register (key, ClassObj, groupName, filename) {
if (System.objTable[key] != null) { if (System.objTable[key] != null) {
throw new Error("相同key的对象已经存在"); throw new Error("相同key的对象已经存在");
} else { } else {
...@@ -193,7 +193,7 @@ class System { ...@@ -193,7 +193,7 @@ class System {
return System.objTable[key]; return System.objTable[key];
} }
static getObject(objpath) { static getObject (objpath) {
var pathArray = objpath.split("."); var pathArray = objpath.split(".");
var packageName = pathArray[0]; var packageName = pathArray[0];
var groupName = pathArray[1]; var groupName = pathArray[1];
...@@ -234,7 +234,7 @@ class System { ...@@ -234,7 +234,7 @@ class System {
} }
} }
static getSysConfig() { static getSysConfig () {
var configPath = settings.basepath + "/app/base/db/metadata/index.js"; var configPath = settings.basepath + "/app/base/db/metadata/index.js";
// if(settings.env=="dev"){ // if(settings.env=="dev"){
// console.log("delete "+configPath+"cache config"); // console.log("delete "+configPath+"cache config");
...@@ -244,7 +244,7 @@ class System { ...@@ -244,7 +244,7 @@ class System {
var configValue = require(configPath); var configValue = require(configPath);
return configValue.config; return configValue.config;
} }
static get_client_ip(req) { static get_client_ip (req) {
var ip = req.headers['x-forwarded-for'] || var ip = req.headers['x-forwarded-for'] ||
req.ip || req.ip ||
req.connection.remoteAddress || req.connection.remoteAddress ||
...@@ -267,7 +267,7 @@ class System { ...@@ -267,7 +267,7 @@ class System {
* @param {*} resultInfo 返回结果 * @param {*} resultInfo 返回结果
* @param {*} errorInfo 错误信息 * @param {*} errorInfo 错误信息
*/ */
static execLogs(opTitle, params, identifyCode, resultInfo, errorInfo) { static execLogs (opTitle, params, identifyCode, resultInfo, errorInfo) {
var reqUrl = settings.logUrl(); var reqUrl = settings.logUrl();
let isLogData = true let isLogData = true
if (params.method && (params.method.indexOf("find") >= 0 || params.method.indexOf("get") >= 0)) { if (params.method && (params.method.indexOf("find") >= 0 || params.method.indexOf("get") >= 0)) {
...@@ -304,9 +304,9 @@ class System { ...@@ -304,9 +304,9 @@ class System {
* 加密信息 * 加密信息
* @param {*} opStr * @param {*} opStr
*/ */
static encryptStr(opStr) { static encryptStr (opStr) {
if (!opStr) { if (!opStr) {
return "opStr is empty"; return opStr;
} }
let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key); let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key);
let ivHex = cryptoJS.enc.Utf8.parse(settings.encrypt_secret.substring(0, 8)); let ivHex = cryptoJS.enc.Utf8.parse(settings.encrypt_secret.substring(0, 8));
...@@ -317,9 +317,9 @@ class System { ...@@ -317,9 +317,9 @@ class System {
* 解密信息 * 解密信息
* @param {*} opStr * @param {*} opStr
*/ */
static decryptStr(opStr) { static decryptStr (opStr) {
if (!opStr) { if (!opStr) {
return "opStr is empty"; return opStr;
} }
try { try {
let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key); let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key);
...@@ -328,7 +328,7 @@ class System { ...@@ -328,7 +328,7 @@ class System {
iv: ivHex iv: ivHex
}); });
var plaintext = bytes.toString(cryptoJS.enc.Utf8); var plaintext = bytes.toString(cryptoJS.enc.Utf8);
return plaintext; return plaintext || opStr;
} catch (error) { } catch (error) {
return opStr; return opStr;
} }
...@@ -394,4 +394,6 @@ module.exports = System; ...@@ -394,4 +394,6 @@ module.exports = System;
// }catch(e){ // }catch(e){
// console.log(e); // console.log(e);
// } // }
// })() // })()
\ No newline at end of file
console.log(System.decryptStr("13381139519"))
\ No newline at end of file
ic-deliver/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-109bb390.09462324.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-174f647a.1e75f0e2.css rel=prefetch><link href=/css/chunk-22544bea.a1ef4ffa.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3877d378.e8a7e262.css rel=prefetch><link href=/css/chunk-38e4cf49.f7e9e5eb.css rel=prefetch><link href=/css/chunk-52b07705.35fbe31b.css rel=prefetch><link href=/css/chunk-52f91926.5ca8040e.css rel=prefetch><link href=/css/chunk-754ddc1e.03f445a2.css rel=prefetch><link href=/css/chunk-8545fa76.3623703d.css rel=prefetch><link href=/css/chunk-c44af256.86cde795.css rel=prefetch><link href=/css/chunk-de4dfeca.c216ed15.css rel=prefetch><link href=/js/chunk-109bb390.9c440aed.js rel=prefetch><link href=/js/chunk-14b9857b.e2979388.js rel=prefetch><link href=/js/chunk-174f647a.75473caa.js rel=prefetch><link href=/js/chunk-22544bea.526cd89f.js rel=prefetch><link href=/js/chunk-2c359864.84067640.js rel=prefetch><link href=/js/chunk-2d0be336.bd756cd1.js rel=prefetch><link href=/js/chunk-3385141a.b008b502.js rel=prefetch><link href=/js/chunk-3877d378.52baa778.js rel=prefetch><link href=/js/chunk-38e4cf49.615027b1.js rel=prefetch><link href=/js/chunk-50aad02e.6b08b552.js rel=prefetch><link href=/js/chunk-52b07705.a2488178.js rel=prefetch><link href=/js/chunk-52f91926.1e6f0de3.js rel=prefetch><link href=/js/chunk-581dc3fa.53a41cf1.js rel=prefetch><link href=/js/chunk-754ddc1e.de1c3802.js rel=prefetch><link href=/js/chunk-8545fa76.82bbcdb7.js rel=prefetch><link href=/js/chunk-9ebfd05c.7daef9bb.js rel=prefetch><link href=/js/chunk-c44af256.0da727c7.js rel=prefetch><link href=/js/chunk-de4dfeca.d5ad2b95.js rel=prefetch><link href=/js/chunk-f1198720.542eaa1a.js rel=prefetch><link href=/js/chunk-f288b8d2.99259ee6.js rel=prefetch><link href=/css/app.04d31a64.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.cc16b244.js rel=preload as=script><link href=/js/chunk-vendors.cf74337b.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.04d31a64.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.cf74337b.js></script><script src=/js/app.cc16b244.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-109bb390.09462324.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-174f647a.1e75f0e2.css rel=prefetch><link href=/css/chunk-22544bea.a1ef4ffa.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3877d378.e8a7e262.css rel=prefetch><link href=/css/chunk-38e4cf49.f7e9e5eb.css rel=prefetch><link href=/css/chunk-52b07705.35fbe31b.css rel=prefetch><link href=/css/chunk-52f91926.5ca8040e.css rel=prefetch><link href=/css/chunk-754ddc1e.03f445a2.css rel=prefetch><link href=/css/chunk-8545fa76.3623703d.css rel=prefetch><link href=/css/chunk-c44af256.86cde795.css rel=prefetch><link href=/css/chunk-de4dfeca.c216ed15.css rel=prefetch><link href=/js/chunk-109bb390.9c440aed.js rel=prefetch><link href=/js/chunk-14b9857b.e2979388.js rel=prefetch><link href=/js/chunk-174f647a.75473caa.js rel=prefetch><link href=/js/chunk-22544bea.526cd89f.js rel=prefetch><link href=/js/chunk-2c359864.84067640.js rel=prefetch><link href=/js/chunk-2d0be336.bd756cd1.js rel=prefetch><link href=/js/chunk-3385141a.b008b502.js rel=prefetch><link href=/js/chunk-3877d378.52baa778.js rel=prefetch><link href=/js/chunk-38e4cf49.615027b1.js rel=prefetch><link href=/js/chunk-50aad02e.6b08b552.js rel=prefetch><link href=/js/chunk-52b07705.a2488178.js rel=prefetch><link href=/js/chunk-52f91926.1e6f0de3.js rel=prefetch><link href=/js/chunk-581dc3fa.53a41cf1.js rel=prefetch><link href=/js/chunk-754ddc1e.de1c3802.js rel=prefetch><link href=/js/chunk-8545fa76.82bbcdb7.js rel=prefetch><link href=/js/chunk-9ebfd05c.7daef9bb.js rel=prefetch><link href=/js/chunk-c44af256.0da727c7.js rel=prefetch><link href=/js/chunk-de4dfeca.d5ad2b95.js rel=prefetch><link href=/js/chunk-f1198720.542eaa1a.js rel=prefetch><link href=/js/chunk-f288b8d2.99259ee6.js rel=prefetch><link href=/css/app.04d31a64.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.1778ad30.js rel=preload as=script><link href=/js/chunk-vendors.cf74337b.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.04d31a64.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.cf74337b.js></script><script src=/js/app.1778ad30.js></script></body></html>
\ No newline at end of file \ No newline at end of file
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 to comment