Skip to content

Z
zhichan
Commit 3ccca8c1 by 王昆
Options

Merge branch 'laowubao' of gitlab.gongsibao.com:jiangyong/zhichan into laowubao

parents 2aa3c6f9 d26ea419
Showing with 328 additions and 14 deletions
laowubao/app/base/api/impl/operator/laoActionApi.js
...@@ -24,6 +24,8 @@ class LaoActionApi extends APIBase { ...@@ -24,6 +24,8 @@ class LaoActionApi extends APIBase {
this.taxinfoSve = system.getObject("service.operator.taxinfoSve"); this.taxinfoSve = system.getObject("service.operator.taxinfoSve");
this.transactioninfoSve = system.getObject("service.operator.transactioninfoSve"); this.transactioninfoSve = system.getObject("service.operator.transactioninfoSve");
this.msSve = system.getObject("service.common.msSve");
this.applyStatusMap = { this.applyStatusMap = {
10: "已申请", 10: "已申请",
20: "待面试", 20: "待面试",
...@@ -140,22 +142,37 @@ class LaoActionApi extends APIBase { ...@@ -140,22 +142,37 @@ class LaoActionApi extends APIBase {
if (!/^1[23456789]\d{9}$/.test(phone_no)) { if (!/^1[23456789]\d{9}$/.test(phone_no)) {
return system.getResult(null, "手机号码格式不正确"); return system.getResult(null, "手机号码格式不正确");
} }
let data=null,_result={data:"发送成功"};
var isTest = this.testPhones.indexOf(phone_no) != -1; //如果是短信模板则直接发送短信
// 生成验证码 if(obj.templateName=="smsTemplate"){
var key = this.vcodePrev + phone_no; data= {
var vcode = await this.redisClient.get(key + "t"); "templateName": "smsTemplate", // 模板类型 loginTemplate（登陆） authenticationTemplate（验证） smsTemplate(短信通知)
if (!vcode) { "phoneNumbers": phone_no, // 手机号
vcode = isTest ? "123123" : await this.getVCode(); "name":this.trim(obj.name), // 模板参数 默认字段 如果是短信通知模板，则请勿传值
await this.redisClient.setWithEx(key, vcode, 5 * 60); }
await this.redisClient.setWithEx(key + "t", vcode, 60); _result = await this.msSve.SendSms(data);
var msg = "您的验证码为" + vcode + ", (切勿将验证码告知别人, 请在5分钟内输入完成验证, 如有问题请联系客服。)"; }else{
if (!isTest) { var isTest = this.testPhones.indexOf(phone_no) != -1;
var rs = await this.smsClient.sendMsg(phone_no, msg); // 生成验证码
console.log(rs); var key = this.vcodePrev + phone_no;
var vcode = await this.redisClient.get(key + "t");
if (!vcode) {
vcode = isTest ? "123123" : await this.getVCode();
await this.redisClient.setWithEx(key, vcode, 5 * 60);
await this.redisClient.setWithEx(key + "t", vcode, 60);
var msg = "您的验证码为" + vcode + ", (切勿将验证码告知别人, 请在5分钟内输入完成验证, 如有问题请联系客服。)";
if (!isTest) {
// var rs = await this.smsClient.sendMsg(phone_no, msg);
data = {
"templateName": obj.templateName, // 模板类型 loginTemplate（登陆） authenticationTemplate（验证） smsTemplate(短信通知)
"phoneNumbers": phone_no, // 手机号
"code":vcode, // 模板参数 默认字段 如果是短信通知模板，则请勿传值
}
_result = await this.msSve.SendSms(data);
}
} }
} }
return system.getResultSuccess("发送成功"); return _result;
} catch (error) { } catch (error) {
return system.getResultFail(500, "接口异常：" + error.message); return system.getResultFail(500, "接口异常：" + error.message);
} }
......
laowubao/app/base/service/impl/common/msSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../svems.base")
const settings = require("../../../../config/settings")
class MsService extends ServiceBase{
async SendSms(params) { //用户登录,返回用户信息
try {
let res = await this.callms("common", "sendSms", params);
return system.getResult(res);
} catch (error) {
console.log(error);
return system.getResult(null,`系统错误 错误信息 ${error}`);
}
}
}
module.exports = MsService;
\ No newline at end of file
laowubao/app/base/service/svems.base.js 0 → 100644
const system = require("../system");
const moment = require('moment')
const settings = require("../../config/settings");
const md5 = require("MD5");
class ServiceBase {
constructor() {
this.restClient = system.getObject("util.restClient");
this.micro = system.microsetting();
}
async getEncryptStr(str) {
if (!str) {
throw new Error("字符串不能为空");
}
var md5 = this.md5(str + "_" + settings.salt);
return md5.toString().toLowerCase();
}
/**
* 验证签名
* @param {*} params 要验证的参数
* @param {*} app_key 应用的校验key
*/
async verifySign(params, app_key) {
if (!params) {
return system.getResult(null, "请求参数为空");
}
if (!params.sign) {
return system.getResult(null, "请求参数sign为空");
}
var signArr = [];
var keys = Object.keys(params).sort();
if (keys.length == 0) {
return system.getResult(null, "请求参数信息为空");
}
for (let k = 0; k < keys.length; k++) {
const tKey = keys[k];
if (tKey != "sign" && params[tKey] && !(params[tKey] instanceof Array)) {
signArr.push(tKey + "=" + params[tKey]);
}
}
if (signArr.length == 0) {
return system.getResult(null, "请求参数组装签名参数信息为空");
}
var resultSignStr = signArr.join("&") + "&key=" + app_key;
var resultTmpSign = md5(resultSignStr).toUpperCase();
if (params.sign != resultTmpSign) {
return system.getResult(null, "返回值签名验证失败");
}
return system.getResultSuccess();
}
/**
* 创建签名
* @param {*} params 要验证的参数
* @param {*} app_key 应用的校验key
*/
async createSign(params, app_key) {
if (!params) {
return system.getResultFail(-310, "请求参数为空");
}
var signArr = [];
var keys = Object.keys(params).sort();
if (keys.length == 0) {
return system.getResultFail(-330, "请求参数信息为空");
}
for (let k = 0; k < keys.length; k++) {
const tKey = keys[k];
if (tKey != "sign" && params[tKey] && !(params[tKey] instanceof Array)) {
signArr.push(tKey + "=" + params[tKey]);
}
}
if (signArr.length == 0) {
return system.getResultFail(-350, "请求参数组装签名参数信息为空");
}
var resultSignStr = signArr.join("&") + "&key=" + app_key;
var resultTmpSign = md5(resultSignStr).toUpperCase();
return system.getResultSuccess(resultTmpSign);
}
/**
* 验证参数信息不能为空
* @param {*} params 验证的参数
* @param {*} verifyParamsCount 需要验证参数的数量，如至少验证3个，则传入3
* @param {*} columnList 需要过滤掉的验证参数列表，格式:[]
*/
async verifyParams(params, verifyParamsCount, columnList) {
if (!params) {
return system.getResult(null, "请求参数为空");
}
if (!columnList) {
columnList = [];
}
var keys = Object.keys(params);
if (keys.length == 0) {
return system.getResult(null, "请求参数信息为空");
}
if (keys.length < verifyParamsCount) {
return system.getResult(null, "请求参数不完整");
}
var tResult = system.getResultSuccess();
for (let k = 0; k < keys.length; k++) {
const tKeyValue = keys[k];
if (columnList.length == 0 || columnList.indexOf(tKeyValue) < 0) {
if (!tKeyValue) {
tResult = system.getResult(null, k + "参数不能为空");
break;
}
} //白名单为空或不在白名单中，则需要验证不能为空
}
return tResult;
}
async apiCallWithAk(url, params) {
var acckapp = await this.cacheManager["ApiAccessKeyCache"].cache(settings.appKey);
var acck = acckapp.accessKey;
//按照访问token
var restResult = await this.restClient.execPostWithAK(params, url, acck);
if (restResult) {
if (restResult.status == 0) {
var resultRtn = restResult.data;
return resultRtn;
} else {
await this.cacheManager["ApiAccessKeyCache"].invalidate(settings.appKey);
return null;
}
}
return null;
}
/*
返回20位业务订单号
prefix：业务前缀
*/
async getBusUid(prefix) {
prefix = (prefix || "");
if (prefix) {
prefix = prefix.toUpperCase();
}
var prefixlength = prefix.length;
var subLen = 8 - prefixlength;
var uidStr = "";
if (subLen > 0) {
uidStr = await this.getUidInfo(subLen, 60);
}
var timStr = moment().format("YYYYMMDDHHmm");
return prefix + timStr + uidStr;
}
/*
len：返回长度
radix：参与计算的长度，最大为62
*/
async getUidInfo(len, radix) {
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); //长度62，到yz长度为长36
var uuid = [],
i;
radix = radix || chars.length;
if (len) {
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
} else {
var r;
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random() * 16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
}
handleDate(row, fields, pattern, addHours) {
pattern = pattern || "YYYY-MM-DD HH:mm";
if (!row) {
return;
}
for (var field of fields) {
if (row[field]) {
if (addHours) {
row[field] = moment(row[field]).add(addHours, "hours").format(pattern);
} else {
row[field] = moment(row[field]).format(pattern);
}
}
}
}
addWhereTime(where, field, begin, end) {
if (!begin && !end) {
return;
}
if (begin && end) {
where[field] = {
[this.db.Op.between]: [begin, end]
};
} else if (begin && !end) {
where[field] = {
[this.db.Op.gte]: begin
};
} else if (!begin && end) {
where[field] = {
[this.db.Op.lte]: end
};
}
}
async callms(sveName, apiName, params) {
var reqUrl = this.micro[sveName];
console.log(reqUrl, "-----------------------------");
if (!reqUrl) {
return system.getResult(null, "未找到【" + sveName + "】服务，请检查settings文件是否存在");
}
if (!apiName) {
return system.getResult(null, "apiName不能为空");
}
try {
var params = {
"action_process": "xgg-admin",
"action_type": apiName,
"action_body": params || {},
}
var rs = await this.restClient.execPost(params, reqUrl);
if (rs && rs.stdout) {
return JSON.parse(rs.stdout);
}
return system.getResult(null, rs);
} catch (error) {
console.log(error);
this.logCtl.error({
optitle: "微服务请求失败",
op: "sveName = " + sveName + "; apiName = " + apiName,
content: "params = " + JSON.stringify(params),
clientIp: ""
});
return system.getResult(null, error.message);
}
}
trim(o) {
if (!o) {
return "";
}
return o.toString().trim();
}
}
module.exports = ServiceBase;
\ No newline at end of file
laowubao/app/base/system.js
...@@ -165,6 +165,25 @@ class System { ...@@ -165,6 +165,25 @@ class System {
} }
} }
} }
static microsetting() {
console.log(settings.env, "-------------- microsetting env ------------------");
var path = "/api/op/action/springboard";
if (settings.env == "dev") {
// var domain = "http://192.168.18.237";
var domain = "http://127.0.0.1";
return {
// 公共服务
common: domain + ":3102" + path,
// common: "http://127.0.0.1:3102" + path,
}
} else {
var odomain = "http://123.57.217.203"
return {
common: "xggsvecommon-service" + path,
}
}
}
} }
Date.prototype.Format = function (fmt) { //author: meizz Date.prototype.Format = function (fmt) { //author: meizz
var o = { var o = {
......
laowubao/package-lock.json
...@@ -14,6 +14,15 @@ ...@@ -14,6 +14,15 @@
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz",
"integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==" "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA=="
}, },
"MD5": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/MD5/-/MD5-1.3.0.tgz",
"integrity": "sha1-PMJm8Oiau2tDpQ85pFnfW/3gskA=",
"requires": {
"charenc": ">= 0.0.1",
"crypt": ">= 0.0.1"
}
},
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
......
laowubao/package.json
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"author": "jy", "author": "jy",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"MD5": "^1.3.0",
"after": "^0.8.2", "after": "^0.8.2",
"ali-oss": "^4.12.2", "ali-oss": "^4.12.2",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
......
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