Merge branch 'esign-sve-merchant' of…

Merge branch 'esign-sve-merchant' of http://gitlab.gongsibao.com/jiangyong/zhichan into esign-sve-merchant

esign-sve-merchant/app/base/api/impl/op/action.js

@@ -6,6 +6,7 @@ class ActionAPI extends APIBase {
     constructor() {
     constructor() {
         super();
         super();
         this.merchantSve = system.getObject("service.merchant.merchantSve");
         this.merchantSve = system.getObject("service.merchant.merchantSve");
+        this.merchantapiSve = system.getObject("service.merchant.merchantapiSve");
         this.merchanttradeSve = system.getObject("service.merchant.merchanttradeSve");
         this.merchanttradeSve = system.getObject("service.merchant.merchanttradeSve");
         this.merchantaccountSve = system.getObject("service.merchant.merchantaccountSve");
         this.merchantaccountSve = system.getObject("service.merchant.merchantaccountSve");
     }
     }
@@ -97,6 +98,11 @@ class ActionAPI extends APIBase {
                 opResult = await this.merchantaccountSve.addordelavailable(action_body);
                 opResult = await this.merchantaccountSve.addordelavailable(action_body);
                 break;
                 break;
 
 
+            // api信息查询
+            case "apiInfoById" :
+                opResult = await this.merchantapiSve.infoById(action_body);
+                break;
+
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

esign-sve-merchant/app/base/db/models/merchant/merchantapi.js

 module.exports = (db, DataTypes) => {
 module.exports = (db, DataTypes) => {
     return db.define("merchantapi", {
     return db.define("merchantapi", {
-        secret: DataTypes.STRING,
+        merchant_id: DataTypes.BIGINT,
         name : DataTypes.STRING,
         name : DataTypes.STRING,
-        ip: DataTypes.TINYINT,
+        secret: DataTypes.STRING,
+        ip: DataTypes.STRING,
+        is_enabled:{
+            type:DataTypes.BOOLEAN,
+            defaultValue: true
+        },
     },{
     },{
         paranoid: true, //假的删除
         paranoid: true, //假的删除
         underscored: true,
         underscored: true,

esign-sve-merchant/app/base/service/impl/merchant/merchantSve.js

@@ -68,8 +68,8 @@ class MerchantService extends ServiceBase {
             } else {
             } else {
                 params.id = id;
                 params.id = id;
                 rtn = await this.dao.create(params);
                 rtn = await this.dao.create(params);
-                var secret = await this.getUidInfo(32);
-                this.merchantapiSve.create({id: id, secret: secret});
+                var secret = (await this.getUidInfo(32)).toLowerCase();
+                this.merchantapiSve.create({merchant_id: id, name: rtn.name, secret: secret, is_enabled: true});
             }
             }
             return system.getResultSuccess(rtn);
             return system.getResultSuccess(rtn);
         } catch (e) {
         } catch (e) {

esign-sve-merchant/app/base/service/impl/merchant/merchantapiSve.js

 const ServiceBase = require("../../sve.base");
 const ServiceBase = require("../../sve.base");
+const system = require("../../../system");
 
 
 class merchantapiService extends ServiceBase {
 class merchantapiService extends ServiceBase {
     constructor() {
     constructor() {
         super("merchant", ServiceBase.getDaoName(merchantapiService));
         super("merchant", ServiceBase.getDaoName(merchantapiService));
     }
     }
 
 
-
+    async infoById(params) {
+        let info = await this.dao.getById(params.id);
+        return system.getResultSuccess(info);
+    }
 }
 }
 
 
 module.exports = merchantapiService;
 module.exports = merchantapiService;