gsb

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

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

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

@@ -69,7 +69,7 @@ class MerchantService extends ServiceBase {
                 params.id = id;
                 rtn = await this.dao.create(params);
                 var secret = await this.getUidInfo(32);
-                this.merchantapiSve.create({id: id, secret: secret});
+                this.merchantapiSve.create({merchant_id: id, name: merchant.name, secret: secret});
             }
             return system.getResultSuccess(rtn);
         } catch (e) {