Skip to content

Z
zhichan
Commit 97c4f445 by huangjing
Options

Merge branch 'igirl-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-web

parents 192b2cff 2767fedf
Showing with 124 additions and 57 deletions
Dockerfile
#!/bin/bash #!/bin/bash
FROM registry.cn-beijing.aliyuncs.com/hantang/node105:v2 FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2
MAINTAINER jy "jiangyong@gongsibao.com" MAINTAINER jy "jiangyong@gongsibao.com"
ADD igirl-web /apps/igirl-web/ ADD igirl-web /apps/igirl-web/
WORKDIR /apps/igirl-web/ WORKDIR /apps/igirl-web/
......
igirl-web/app/base/api/impl/testApi.js
...@@ -9,6 +9,7 @@ var moment = require('moment'); ...@@ -9,6 +9,7 @@ var moment = require('moment');
const md5 = require("MD5"); const md5 = require("MD5");
class TestApi { class TestApi {
constructor() { constructor() {
this.utilstlbankSve = System.getObject("service.utilstlbankSve");
this.bytmmonitSve = System.getObject("service.bytmmonitSve"); this.bytmmonitSve = System.getObject("service.bytmmonitSve");
this.utilscloudSve = System.getObject("service.utilscloudSve"); this.utilscloudSve = System.getObject("service.utilscloudSve");
this.trademarkSve = System.getObject("service.trademarkSve"); this.trademarkSve = System.getObject("service.trademarkSve");
...@@ -40,15 +41,17 @@ class TestApi { ...@@ -40,15 +41,17 @@ class TestApi {
return y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length); return y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length);
} }
async test(obj) { async test(obj) {
// try { try {
// var result = await this.businesscompanySve.recycleBusiness();
// // var result = await this.businesscompanySve.freeClaimOperation({ id: 41, company_id: 4 }, "xz", [1095, 1113]); var result= await this.utilstlbankSve.getH5Url();
// // var result = await this.businesscompanySve.protectBus({ id: 41, company_id: 4 }, "xz", ["RL20190429114493kNw4", "RL2019042911449mftfK"]); // var result = await this.businesscompanySve.recycleBusiness();
// console.log(result, "result.................."); // var result = await this.businesscompanySve.freeClaimOperation({ id: 41, company_id: 4 }, "xz", [1095, 1113]);
// return result; // var result = await this.businesscompanySve.protectBus({ id: 41, company_id: 4 }, "xz", ["RL20190429114493kNw4", "RL2019042911449mftfK"]);
// } catch (e) { console.log(result, "result..................");
// console.log(e.stack, "e......................."); return result;
// } } catch (e) {
console.log(e.stack, "e.......................");
}
} }
async callSign() { async callSign() {
var tmpSignObj = { var tmpSignObj = {
......
igirl-web/app/base/api/impl/tlapi.js
...@@ -10,6 +10,16 @@ const md5 = require("MD5"); ...@@ -10,6 +10,16 @@ const md5 = require("MD5");
class TlApi { class TlApi {
constructor() { constructor() {
this.tlorderSve = System.getObject("service.tlorderSve"); this.tlorderSve = System.getObject("service.tlorderSve");
this.utilstlbankSve = System.getObject("service.utilstlbankSve");
}
async getH5PayUrl(pobj) {
try {
var result = await this.utilstlbankSve.getH5Url(pobj.company_id,pobj.pay_title,pobj.total_sum,pobj.order_no,pobj.returl);
console.log(result, "result..................");
return result;
} catch (e) {
console.log(e.stack, "e.......................");
}
} }
async getQrCodeInfo(obj) { async getQrCodeInfo(obj) {
try { try {
......
igirl-web/app/base/controller/impl/userCtl.js
...@@ -189,12 +189,14 @@ class UserCtl extends CtlBase { ...@@ -189,12 +189,14 @@ class UserCtl extends CtlBase {
req.session.user = existedUser; req.session.user = existedUser;
return system.getResult2(existedUser); return system.getResult2(existedUser);
} else { } else {
var password = super.encryptPasswd(obj.u.password);
var params = { var params = {
mobile: obj.u.mobile, mobile: obj.u.mobile,
userName: obj.u.mobile, userName: obj.u.mobile,
nickName: obj.u.mobile, nickName: obj.u.mobile,
company_id: obj.u.cid, company_id: obj.u.cid,
themename:company.siteTheme themename:company.siteTheme,
password:password
}; };
var result = await this.service.create(params); var result = await this.service.create(params);
req.session.user = result; req.session.user = result;
......
igirl-web/app/base/service/impl/utilstlbankSve.js
...@@ -28,6 +28,52 @@ class utilsTlBankSve { ...@@ -28,6 +28,52 @@ class utilsTlBankSve {
this.tlorderDao = System.getObject("db.tlorderDao"); this.tlorderDao = System.getObject("db.tlorderDao");
} }
//-------------------------------------------h5支付-----------------开始
/**
* 唤起H5支付---只供简单应用
* @param {*} company_id 公司ID
* @param {*} pay_title 支付显示标题
* @param {*} total_sum 支付金额
* @param {*} order_no 订单号
* @param {*} returl 支付成功后返回的url
*/
async getH5Url(company_id, pay_title, total_sum, order_no, returl) {
// appid:00000003,商户号（mch_id）:990440148166000,md5key（pay_key）:a0ea3fa20dbd7bb4d5abf1d59d63bae8
var payParam = await this.companypayparamDao.getOneByCompanyId(company_id, 1);
if (!payParam) {
return { code: -210, msg: "公司没有对应的支付凭证" }
}
var timestamp = Date.now();
var jsonObj = {
appid: payParam.pay_appid,
cusid: payParam.mch_id,
version: 12,
trxamt: total_sum,//单位为分
reqsn: order_no,//order_num + "_" + company_id.toString(),
charset: "UTF-8",
returl: returl,
notify_url: payParam.notifyUrl || this.notifyUrl,
body: pay_title,
remark: "h5paypagesywdy",
randomstr: timestamp.toString()//随机字符串，不长于32位
}
var param_result = await this.getReqBeforeParam(jsonObj, "1352105537612345789");
if (param_result.code != 1) {
return param_result;
}
var paramStr = Object.keys(jsonObj).sort().map(key => {
return `${encodeURIComponent(key)}=${encodeURIComponent(jsonObj[key])}`
}).join('&');
return { code: 1, payUrl: "https://syb.allinpay.com/apiweb/h5unionpay/unionorder?" + paramStr };
}
//-------------------------------------------h5支付-----------------结束
//----------------------------------------------------------------------------------------请求银行接口开始--------------------------------------------------- //----------------------------------------------------------------------------------------请求银行接口开始---------------------------------------------------
/* /*
...@@ -44,12 +90,12 @@ class utilsTlBankSve { ...@@ -44,12 +90,12 @@ class utilsTlBankSve {
-230：请求参数信息为空 -230：请求参数信息为空
-250：请求组装签名参数信息为空 -250：请求组装签名参数信息为空
-280：请求结算接口返回失败 -280：请求结算接口返回失败
-310：返回值信息data为空 -310：返回值信息data为空
-230：返回值参数信息为空 -230：返回值参数信息为空
-250：返回值组装签名参数信息为空 -250：返回值组装签名参数信息为空
-280：返回值签名验证失败 -280：返回值签名验证失败
-400：请求接口请求返回值错误 -400：请求接口请求返回值错误
-410：请求结算接口返回空 -410：请求结算接口返回空
*/ */
...@@ -110,12 +156,12 @@ class utilsTlBankSve { ...@@ -110,12 +156,12 @@ class utilsTlBankSve {
-230：请求参数信息为空 -230：请求参数信息为空
-250：请求组装签名参数信息为空 -250：请求组装签名参数信息为空
-280：请求结算接口返回失败 -280：请求结算接口返回失败
-310：返回值信息data为空 -310：返回值信息data为空
-230：返回值参数信息为空 -230：返回值参数信息为空
-250：返回值组装签名参数信息为空 -250：返回值组装签名参数信息为空
-280：返回值签名验证失败 -280：返回值签名验证失败
-400：请求接口请求返回值错误 -400：请求接口请求返回值错误
-410：请求结算接口返回空 -410：请求结算接口返回空
*/ */
......
igirl-web/app/config/routes/api.js
...@@ -28,48 +28,51 @@ module.exports = function (app) { ...@@ -28,48 +28,51 @@ module.exports = function (app) {
app.use("/api/tl/zxNotify", async function (req, res, next) { app.use("/api/tl/zxNotify", async function (req, res, next) {
var client_ip = System.get_client_ip(req); var client_ip = System.get_client_ip(req);
var result = await utilstlbankSve.receiveCallBackNotify(req.body, client_ip); if (req.body.remark && req.body.remark== "h5paypagesywdy"){
res.end(result); res.end("");
}); }
var result = await utilstlbankSve.receiveCallBackNotify(req.body, client_ip);
res.end(result);
});
app.get('/api/:qname/:method', function (req, res) { app.get('/api/:qname/:method', function (req, res) {
var classPath = req.params["qname"]; var classPath = req.params["qname"];
var methodName = req.params["method"]; var methodName = req.params["method"];
var params = []; var params = [];
console.log(classPath); console.log(classPath);
console.log(methodName); console.log(methodName);
console.log("req.query"); console.log("req.query");
console.log(req.query); console.log(req.query);
for (let k in req.query) { for (let k in req.query) {
params.push(req.query[k]); params.push(req.query[k]);
} }
console.log(params); console.log(params);
var p = null; var p = null;
var invokeObj = System.getObject("api." + classPath); var invokeObj = System.getObject("api." + classPath);
if (invokeObj[methodName]) { if (invokeObj[methodName]) {
p = invokeObj[methodName].apply(invokeObj, params); p = invokeObj[methodName].apply(invokeObj, params);
} }
p.then(r => { p.then(r => {
res.end(JSON.stringify(r)); res.end(JSON.stringify(r));
}) })
}); });
app.post('/api/:qname/:method', function (req, res) { app.post('/api/:qname/:method', function (req, res) {
var classPath = req.params["qname"]; var classPath = req.params["qname"];
var methodName = req.params["method"]; var methodName = req.params["method"];
var params = []; var params = [];
for (let k in req.query) { for (let k in req.query) {
params.push(req.query[k]); params.push(req.query[k]);
} }
params.push(req.body); params.push(req.body);
var p = null; var p = null;
var invokeObj = System.getObject("api." + classPath); var invokeObj = System.getObject("api." + classPath);
if (invokeObj[methodName]) { if (invokeObj[methodName]) {
p = invokeObj[methodName].apply(invokeObj, params); p = invokeObj[methodName].apply(invokeObj, params);
} }
p.then(r => { p.then(r => {
res.end(JSON.stringify(r)); res.end(JSON.stringify(r));
}).then(() => { }).then(() => {
});
}); });
});
}; };
igirl-web/app/front/vues/pages/login/login.js
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
form1:{ form1:{
mobile:"", mobile:"",
code:"", code:"",
password:"",
}, },
form2:{ form2:{
username:"", username:"",
...@@ -114,6 +115,7 @@ ...@@ -114,6 +115,7 @@
resetall(){ resetall(){
this.form1.mobile=""; this.form1.mobile="";
this.form1.code=""; this.form1.code="";
this.form1.password="";
this.form2.username=""; this.form2.username="";
this.form2.password=""; this.form2.password="";
this.form3.mobile=""; this.form3.mobile="";
...@@ -240,6 +242,7 @@ ...@@ -240,6 +242,7 @@
var that=this; var that=this;
var obj={ var obj={
mobile:that.form1.mobile, mobile:that.form1.mobile,
// password:that.form1.password,
}; };
that.$refs.form1.validate(valid=>{ that.$refs.form1.validate(valid=>{
if(valid){ if(valid){
......
igirl-web/app/front/vues/pages/register/register.js
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
var that=this; var that=this;
var obj={ var obj={
mobile:that.form1.mobile, mobile:that.form1.mobile,
password:that.form1.password,
}; };
that.$refs.form1.validate(valid=>{ that.$refs.form1.validate(valid=>{
......
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