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

igirl-zcapi/app/base/api/impl/action/enterpriseQuery.js

+var APIBase = require("../../api.base");
+var system = require("../../../system");
+class EnterpriseQueryAPI extends APIBase {
+    constructor() {
+        super();
+        this.enterSve = system.getObject("service.enterprise.enterpriseSve");
+    }
+
+    /**
+      * 接口跳转-POST请求
+      * action_type     执行的类型
+      * action_body     执行的参数
+      */
+    async springBoard(pobj, qobj, req) {
+        if (!pobj.actionType) {
+            return system.getResult(null, "actionType参数不能为空");
+        }
+        var result = await this.opActionProcess(pobj.actionType, pobj.actionBody);
+        return result;
+    }
+
+    async opActionProcess(action_type, action_body) {
+        var opResult = null;
+        switch (action_type) {
+            case "test"://测试
+                opResult = system.getResultSuccess(null, "测试成功");
+                break;
+            case "gxCountByAuthor"://获取企业高薪信息数量
+                opResult = await this.enterSve.gxCountByAuthor(action_body);
+                break;
+            case "gxListByAuthor"://获取企业高薪信息列表
+                opResult = await this.enterSve.gxListByAuthor(action_body);
+                break;
+            case "gameCountByAuthor"://获取企业游戏出版及运营数量
+                opResult = await this.enterSve.gameCountByAuthor(action_body);
+                break;
+            case "gameListByAuthor"://获取企业游戏出版及运营信息列表
+                opResult = await this.enterSve.gameListByAuthor(action_body);
+                break;
+            case "licenseCountByAuthor"://获取企业证照信息数量
+                opResult = await this.enterSve.licenseCountByAuthor(action_body);
+                break;
+            case "licenseListByAuthor"://获取企业证照信息列表
+                opResult = await this.enterSve.licenseListByAuthor(action_body);
+                break;
+            case "ipCountByAuthor"://获取企业域名信息数量
+                opResult = await this.enterSve.ipCountByAuthor(action_body);
+                break;
+            case "ipListByAuthor"://获取企业域名信息列表
+                opResult = await this.enterSve.ipListByAuthor(action_body);
+                break;
+            case "getQccBranches"://获取企业的分支机构（从企查查获取）
+                opResult = await this.enterSve.getQccBranches(action_body);
+                break;
+            case "getcountAll"://获取企业所有证照数量
+                opResult = await this.enterSve.getcountAll(action_body);
+                break;
+            default:
+                opResult = system.getResult(null, "action_type参数错误");
+                break;
+        }
+        return opResult;
+    }
+}
+module.exports = EnterpriseQueryAPI;
+
+// var tesk = new EnterpriseQueryAPI();
+// var parm = {
+//     actionType:"getLicenses",
+//     actionBody:{name:"上海盛霄云计算技术有限公司"}
+//  };
+// tesk.springBoard(parm).then(function(result){
+//   console.log(result);
+//  //console.log(result.data.data[0]);
+// }).catch(function(e){
+//   console.log(e);
+// });
\ No newline at end of file

igirl-zcapi/app/base/api/impl/action/licenseQuery.js

+var APIBase = require("../../api.base");
+var system = require("../../../system");
+class LicenseQueryAPI extends APIBase {
+    constructor() {
+        super();
+        this.liecseSve = system.getObject("service.licenses.licenseSve");
+    }
+
+    /**
+      * 接口跳转-POST请求
+      * action_type     执行的类型
+      * action_body     执行的参数
+      */
+    async springBoard(pobj, qobj, req) {
+        if (!pobj.actionType) {
+            return system.getResult(null, "actionType参数不能为空");
+        }
+        var result = await this.opActionProcess(pobj.actionType, pobj.actionBody);
+        return result;
+    }
+
+    async opActionProcess(action_type, action_body) {
+        var opResult = null;
+        switch (action_type) {
+            case "test"://测试
+                opResult = system.getResultSuccess(null, "测试成功");
+                break;
+            case "getLicenses"://根据公司得到推荐要办的证书
+                opResult = await this.liecseSve.getLicenses(action_body);
+                break;
+            // case "getLicenfgfg"://根据公司得到推荐要办的证书
+            //     opResult = await this.liecseSve.getLicenfgfg(action_body);
+            //     break;
+            default:
+                opResult = system.getResult(null, "action_type参数错误");
+                break;
+        }
+        return opResult;
+    }
+}
+module.exports = LicenseQueryAPI;
+
+// var tesk = new LicenseQueryAPI();
+// var parm = {
+//     actionType:"getLicenses",
+//     actionBody:{name:"上海盛霄云计算技术有限公司"}
+//  };
+// tesk.springBoard(parm).then(function(result){
+//   console.log(result);
+//  //console.log(result.data.data[0]);
+// }).catch(function(e){
+//   console.log(e);
+// });
\ No newline at end of file

igirl-zcapi/app/base/api/impl/action/patentQuery.js

+var APIBase = require("../../api.base");
+var system = require("../../../system");
+class PatentQueryAPI extends APIBase {
+    constructor() {
+        super();
+        this.cpatentsearchApi = system.getObject("api.patent.chinapatentsearch");
+        this.cpatentaggApi = system.getObject("api.patent.cpatentaggregations");
+        this.caffairsearchApi = system.getObject("api.patent.chinaaffairsearch");
+        this.wpatentsearchApi = system.getObject("api.patent.wordpatentsearch");
+        this.wpatentaggApi = system.getObject("api.patent.wpatentaggregations");
+        this.copyrightApi = system.getObject("api.patent.copyrightsearch");
+    }
+
+    /**
+      * 接口跳转-POST请求
+      * action_type     执行的类型
+      * action_body     执行的参数
+      */
+    async springBoard(pobj, qobj, req) {
+        if (!pobj.actionType) {
+            return system.getResult(null, "actionType参数不能为空");
+        }
+        var result = await this.opActionProcess(pobj.actionType, pobj.actionBody);
+        return result;
+    }
+
+    async opActionProcess(action_type, action_body) {
+        var opResult = null;
+        switch (action_type) {
+            case "test"://测试
+                opResult = system.getResultSuccess(null, "测试成功");
+                break;
+            case "CommomSearchbyApplicant"://根据申请人查询聚合
+                opResult = await this.cpatentsearchApi.CommomSearchbyApplicant(action_body);
+                break;
+            case "paCountByApplicantName"://根据申请人获取专利量
+                opResult = await this.cpatentsearchApi.paCountByApplicantName(action_body);
+                break;
+            case "paShortListByApplicantName"://根据申请人获取专利详情列表
+                opResult = await this.cpatentsearchApi.paShortListByApplicantName(action_body);
+                break;
+            case "paDetailsBypubNo"://根据公开或授权号获取专利详情列表
+                opResult = await this.cpatentsearchApi.paDetailsBypubNo(action_body);
+                break;
+            case "paDetailsByfilingNo"://根据申请号获取专利详情列表
+                opResult = await this.cpatentsearchApi.paDetailsByfilingNo(action_body);
+                break;
+            case "softwareCountByAuthor"://根据公司名称得到软著量
+                opResult = await this.copyrightApi.softwareCountByAuthor(action_body);
+                break;
+            case "softwareListByAuthor"://根据公司名称得到软著详情
+                opResult = await this.copyrightApi.softwareListByAuthor(action_body);
+                break;
+            case "softwareDetailsByregNum"://根据登记号获取软著详情
+                opResult = await this.copyrightApi.softwareDetailsByregNum(action_body);
+                break;
+            case "worksCountByAuthor"://根据公司名称得到著作权量
+                opResult = await this.copyrightApi.worksCountByAuthor(action_body);
+                break;
+            case "worksListByAuthor"://根据公司名称得到著作权详情
+                opResult = await this.copyrightApi.worksListByAuthor(action_body);
+                break;
+            case "worksDetailsByregNum"://根据登记号获取著作权详情
+                opResult = await this.copyrightApi.worksDetailsByregNum(action_body);
+                break;
+            default:
+                opResult = system.getResult(null, "action_type参数错误");
+                break;
+        }
+        return opResult;
+    }
+}
+module.exports = PatentQueryAPI;
+
+// var tesk = new PatentQueryAPI();
+// var parm = {
+//     actionType:"paShortListByApplicantName",
+//     actionBody:{applicant_name:"中国专利信息中心"}
+//  };
+// tesk.springBoard(parm).then(function(result){
+//   console.log(result);
+//  console.log(result.data.data[0]);
+// }).catch(function(e){
+//   console.log(e);
+// });
\ No newline at end of file

igirl-zcapi/app/base/api/impl/action/tmQuery.js

@@ -10,29 +10,17 @@ class TmQueryAPI extends APIBase {
     }
     /**
       * 接口跳转-POST请求
-      * action_process  执行的流程
       * action_type     执行的类型
       * action_body     执行的参数
       */
     async springBoard(pobj, qobj, req) {
-        if (!pobj.actionProcess) {
-            return system.getResult(null, "actionProcess参数不能为空");
-        }
         if (!pobj.actionType) {
             return system.getResult(null, "actionType参数不能为空");
         }
-        var result = null;
-        switch (pobj.actionProcess) {
-            case "jd"://京东
-                result = await this.jdOpActionProcess(pobj.actionProcess, pobj.actionType, pobj.actionBody);
-                break;
-            default:
-                result = system.getResult(null, "actionProcess参数错误");
-                break;
-        }
+        var result = await this.opActionProcess(pobj.actionType, pobj.actionBody);
         return result;
     }
-    async jdOpActionProcess(action_process, action_type, action_body) {
+    async opActionProcess(action_type, action_body) {
         var opResult = null;
         switch (action_type) {
             case "test"://测试

igirl-zcapi/app/base/api/impl/action/tmTools.js

@@ -8,29 +8,17 @@ class TmToolsAPI extends APIBase {
     }
     /**
       * 接口跳转-POST请求
-      * action_process  执行的流程
       * action_type     执行的类型
       * action_body     执行的参数
       */
     async springBoard(pobj, qobj, req) {
-        if (!pobj.actionProcess) {
-            return system.getResult(null, "actionProcess参数不能为空");
-        }
         if (!pobj.actionType) {
             return system.getResult(null, "actionType参数不能为空");
         }
-        var result = null;
-        switch (pobj.actionProcess) {
-            case "jd"://京东
-                result = await this.jdOpActionProcess(pobj.actionProcess, pobj.actionType, pobj.actionBody);
-                break;
-            default:
-                result = system.getResult(null, "actionProcess参数错误");
-                break;
-        }
+        var result = await this.opActionProcess(pobj.actionType, pobj.actionBody);
         return result;
     }
-    async jdOpActionProcess(action_process, action_type, action_body) {
+    async opActionProcess(action_type, action_body) {
         var opResult = null;
         switch (action_type) {
             // sy

igirl-zcapi/app/base/api/impl/auth/zcosssignApi.js

 var APIBase = require("../../api.base");
 var system = require("../../../system");
-class zcosssignAPI extends APIBase {
+class zcosssignAPI extends APIBase {//--TODO:将要修改掉
     constructor() {
         super();
         this.uploadSve = system.getObject("service.common.uploadSve");

igirl-zcapi/app/base/api/impl/tool/toolApi.js

@@ -2,8 +2,8 @@ var System = require("../../../system")
 const crypto = require('crypto');
 var xlsx = require('node-xlsx');
 var fs = require("fs");
-var accesskey = 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla';
-var accessKeyId = 'LTAIyAUK8AD04P5S';
+var accesskey = '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
+var accessKeyId = 'LTAI4GC5tSKvqsH2hMqj6pvd';
 var settings = require("../../../../config/settings");
 const logCtl = System.getObject("web.common.oplogCtl");
 const ApiBase = require("../../api.base");
@@ -349,6 +349,92 @@ class ToolApi extends ApiBase {
     }
 
   }
+  //数据中心工商模糊查询接口
+  async getCompanyListByVague(pobj,o, req) {
+    var appkey = this.appKeyStr;
+    var pageSize = pobj.pageSize ? pobj.pageSize : 20;
+    var currentPage = pobj.currentPage ? pobj.currentPage : 1;
+    var data = {
+      appKey: appkey,
+      pageSize: pageSize,
+      currentPage: currentPage,
+      companyName: pobj.companyName,
+    };
+    var company = await this.gsbIcSearchApi.companyvaguesearch(data);
+    if (company.status == 0 && company.data.totalSize > 0) {
+      return company;
+    } else {
+      return {};
+    }
+
+  }
+  //公司详情信息
+  async getDetailByCompanyName(pobj,o, req) {
+    var appkey = this.appKeyStr;
+    var data = {
+      appKey: appkey,
+      companyName: pobj.companyName,
+    };
+    var company = await this.gsbIcSearchApi.companydetailsearch(data);
+    if (company.status == 0 && company.data.totalSize > 0) {
+      return company.data.list[0];
+    } else {
+      return {};
+    }
+
+  }
+  //企业变更记录查询
+  async getCompanyChangeByName(pobj,o, req) {
+    var appkey = this.appKeyStr;
+    var pageSize = pobj.pageSize ? o.pageSize : 20;
+    var currentPage = pobj.currentPage ? pobj.currentPage : 1;
+    var data = {
+      appKey: appkey,
+      pageSize: pageSize,
+      currentPage: currentPage,
+      companyName: pobj.companyName,
+    };
+    var company = await this.gsbIcSearchApi.companychangesearch(data);
+    if (company.status == 0 && company.data.totalSize > 0) {
+      return company;
+    } else {
+      return {};
+    }
+  }
+  //企业ICP证照数据
+  async getCompanyIcpByName(pobj,o, req) {
+    var appkey = this.appKeyStr;
+    var pageSize = pobj.pageSize ? pobj.pageSize : 20;
+    var currentPage = pobj.currentPage ? pobj.currentPage : 1;
+    var data = {
+      appKey: appkey,
+      pageSize: pageSize,
+      currentPage: currentPage,
+      companyName: pobj.companyName,
+    };
+    var company = await this.gsbIcSearchApi.companyicpsearch(data);
+    if (company.status == 0 && company.data.totalSize > 0) {
+      return company;
+    } else {
+      return {};
+    }
+  }
+  //商标尼斯小项查询过滤
+  async getTmNclFilterSearch(pobj,o, req) {
+    var appkey = this.appKeyStr;
+    var data = {
+      appKey: appkey,
+      nclOneCodes: pobj.nclOneCodes,
+      nclSmallCodes: pobj.nclSmallCodes,
+    };
+    var ncllist = await this.gsbSearchApi.tmnclfiltersearch(data);
+    if (ncllist.status == 0) {
+      return ncllist;
+    } else {
+      return {};
+    }
+  }
+
   async getCropperPic(qobj, obj, req) {
     var that = this;
     var base64 = obj.base64;

igirl-zcapi/app/base/api/impl/tool/upload.js

 var System=require("../../../system")
 const crypto = require('crypto');
 var fs=require("fs");
-var accesskey='DHmRtFlw2Zr3KaRwUFeiu7FWATnmla';
-var accessKeyId='LTAIyAUK8AD04P5S';
+var accesskey='3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
+var accessKeyId='LTAI4GC5tSKvqsH2hMqj6pvd';
 var url="https://gsb-zc.oss-cn-beijing.aliyuncs.com";
 class UploadApi{
   constructor(){

igirl-zcapi/app/base/api/impl/trademark/gsbtmsearch.js

@@ -1806,6 +1806,76 @@ class GsbTmSearchApi extends ApiBase {
       return rtn = System.getResult2(null, null);
     }
   }
+  //商标尼斯小项查询过滤
+  async tmnclfiltersearch(obj) {
+    var nclOneCodes = obj.nclOneCodes == null ? "" : obj.nclOneCodes;
+    var nclSmallCodes = obj.nclSmallCodes == [] ? "" : obj.nclSmallCodes;
+
+    var reqUrl = this.nclUrl;
+    var params = {
+      "query": {
+        "bool": {
+          "must": [
+            {
+              "term": {
+                "belong_to_onecode": nclOneCodes
+              }
+            },
+            {
+              "term": {
+                "level": 3
+              }
+            }
+          ]
+        }
+      },
+      "size": 300,
+      "_source": [
+        "code",
+        "level",
+        "description",
+        "name",
+        "pid",
+        "belong_to_onecode"
+      ]
+    };
+    if (nclSmallCodes.length > 0) {
+      var namelist = []
+      for (var k = 0; k < nclSmallCodes.length; k++) {
+        var c = nclSmallCodes[k];
+        namelist.push(c.name);
+      }
+      var dsl = {
+        "terms": {
+          "name.raw": namelist
+        }
+      }
+      params.query.bool.must.push(dsl);
+    }
+    var rc = System.getObject("util.execClient");
+    var rtn = null;
+    try {
+      rtn = await rc.execPost(params, reqUrl);
+      var j = JSON.parse(rtn.stdout);
+      var sources = [];
+      var data = {
+        "nclOneCodes": nclOneCodes,
+        "nclSmallCodes": sources
+      };
+      j.hits.hits.forEach(function (c) {
+        var source = {
+          code: c._source.code,
+          name: c._source.name,
+          pcode: c._source.pcode
+        };
+        sources.push(source);
+      });
+      var a = { status: 0, msg: "操作成功", data: data };
+      return a;
+    } catch (e) {
+      return { status: -1, msg: "操作失败", data: null };
+    }
+  }
 
   async getConvertSemiangleStr(str) {
     var result = "";

igirl-zcapi/app/base/api/impl/trademark/tmqueryApi.js

@@ -627,7 +627,7 @@ class tmqueryApi extends ApiBase{
     return System.getResult2(result,null);
   }
 
-  async findTrademarkzchAccurate(query,obj){//通过商标号来进行精准查询
+  async findTrademarkzchAccurate(obj){//通过商标号来进行精准查询
     var result={rows:[],code_counts:[],status_counts:[],year_counts:[],count:0};
     var sources=[];
     var codes=[];
@@ -1270,10 +1270,10 @@ class tmqueryApi extends ApiBase{
   }
 
   async tradeMarkDetail(query,obj){//商标详情
-    console.log(obj);
+    // console.log(obj);
     var result={detaildata:[],nclexist:[],nclnotexist:[]};
-    var sbzch=obj.sbzch;
-    var gjfl=obj.gjfl;
+    var sbzch=query.sbzch;
+    var gjfl=query.gjfl;
     var sources=[];
     var data={
       sbzch:sbzch,
@@ -1283,15 +1283,15 @@ class tmqueryApi extends ApiBase{
       regNum:sbzch
     };
     var detailtms= await this.GsbByTmSearchApi.tradeMarkDetailapi(data);
-    console.log("00000000000000000000000000000000000000000000000000000000");
-    console.log(detailtms);
+    // console.log("00000000000000000000000000000000000000000000000000000000");
+    // console.log(detailtms);
     var data2={
       reg_num:sbzch,
       nclone_code:gjfl
     }
     var qunzutms=await this.utilstmSve.getGroupNclInfo(data2);
-    console.log("11111111111111111111111111111111111111111111111111111");
-    console.log(qunzutms.data);
+    // console.log("11111111111111111111111111111111111111111111111111111");
+    // console.log(qunzutms.data);
     if(qunzutms.status==0){
       var qunzuexist=[];
       var qunzuexistnorepeat=[]
@@ -1326,8 +1326,8 @@ class tmqueryApi extends ApiBase{
         lcxx.push(lcjson);
       });
     }
-    console.log("lcxx====================================");
-    console.log(lcxx);
+    // console.log("lcxx====================================");
+    // console.log(lcxx);
     if(detailtms.status == 0 && detailtms.data.length>0){
       var tm=detailtms.data[0];
       var source={
@@ -1390,7 +1390,7 @@ class tmqueryApi extends ApiBase{
     //   sources.push(source);
     // }
     result.detaildata=sources;
-    console.log(result);
+    // console.log(result);
     return System.getResult2(result,null);
   }
 
@@ -1755,7 +1755,7 @@ class tmqueryApi extends ApiBase{
       data: null
     };
     try {
-      var tCompanyName = qobj.company_name || "";
+      var tCompanyName = queryobj.company_name || "";
       if (!tCompanyName || tCompanyName == "undefined") {
         // result.code = -102;
         // result.message = "company_name参数有误";

igirl-zcapi/app/base/controller/impl/common/uploadCtl.js

@@ -2,9 +2,10 @@ var system = require("../../../system")
 const CtlBase = require("../../ctl.base");
 const crypto = require('crypto'); 
 var fs = require("fs");
-var accesskey = 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla';
-var accessKeyId = 'LTAIyAUK8AD04P5S';
+var accesskey = '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
+var accessKeyId = 'LTAI4GC5tSKvqsH2hMqj6pvd';
 var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
+//----－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－暂时没有用到此类的方法
 class UploadCtl extends CtlBase {
   constructor() {
     super("common", CtlBase.getServiceName(UploadCtl));

igirl-zcapi/app/base/service/app.base.js

+const system = require("../system");
+const moment = require('moment')
+const settings = require("../../config/settings");
+const md5 = require("MD5");
+class AppServiceBase {
+  constructor() {
+    this.execClient = system.getObject("util.execClient");
+    this.restClient = system.getObject("util.restClient");
+    this.cacheManager = system.getObject("db.common.cacheManager");
+  }
+  /**
+   * 验证签名
+   * @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();
+  }
+  async restPostUrl(pobj, url) {
+    var rtn = await this.restClient.execPost(pobj, url);
+    if (!rtn || !rtn.stdout) {
+      return system.getResult(null, "restPost is empty");
+    }
+    var result = JSON.parse(rtn.stdout);
+    return result;
+  }
+  async execPostUrl(pobj, url) {
+    var rtn = await this.execClient.execPost(pobj, url);
+    if (!rtn || !rtn.stdout) {
+      return system.getResult(null, "execPost is empty");
+    }
+    var result = JSON.parse(rtn.stdout);
+    return result;
+  }
+}
+module.exports = AppServiceBase;

igirl-zcapi/app/base/service/impl/common/uploadSve.js

 const system=require("../../../system");
 const ServiceBase=require("../../sve.base");
 const crypto = require('crypto'); 
-var accesskey = 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla';
-var accessKeyId = 'LTAIyAUK8AD04P5S';
+var accesskey = '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
+var accessKeyId = 'LTAI4GC5tSKvqsH2hMqj6pvd';
 var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
 class UploadService extends ServiceBase{
   constructor(){
@@ -11,7 +11,7 @@ class UploadService extends ServiceBase{
   }
 
   async getOssConfig() {
-    var end = new Date().getTime() + 36000000;
+    var end = new Date().getTime() + 36000000;//10小时－毫秒
     var expiration = new Date(end).toISOString()
     var policyText = {
       "expiration": expiration,

igirl-zcapi/app/base/service/impl/licenses/licenseSve.js

+const System = require("../../../system");
+// const ServiceBase = require("../../sve.base");
+const querystring = require('querystring');
+class LicenseService {
+    constructor() {
+        this.licenseUrl = "http://43.247.184.92:8111/gsb/api/Licenses";
+    };
+
+    async getLicenses(obj) {//根据公司得到推荐要办的证书
+        var name = obj.name == null ? "" : obj.name;
+        if (name == "") {
+            return System.getResult2(null, "参数不能为空");
+        }
+
+        var params = {"name": name};
+        var rc = System.getObject("util.execClient");
+        //var data = querystring.stringify(params);
+        var rtn = null;
+        try {
+            rtn = await rc.execPost(params, this.licenseUrl);
+            var result = JSON.parse(rtn.stdout);
+            return System.getResult2(result, null);
+            
+        } catch (e) {
+            return System.getResult2(null, "获取数据出错");
+        }
+
+    };
+
+
+    
+
+}
+module.exports = LicenseService;
+

igirl-zcapi/app/base/utils/ossClient.js

@@ -4,8 +4,8 @@ class OSSClient{
   constructor(){
     this.client=new OSS({
       endpoint: 'https://oss-cn-beijing.aliyuncs.com',
-      accessKeyId: 'LTAIyAUK8AD04P5S',
-      accessKeySecret: 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla'
+      accessKeyId: 'LTAI4GC5tSKvqsH2hMqj6pvd',
+      accessKeySecret: '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5'
     });
     this.client.useBucket('gsb-zc');
   }

igirl-zcapi/app/base/utils/restClient.js

@@ -6,6 +6,7 @@ var settings = require("../../config/settings");
 class RestClient {
   constructor() {
     this.cmdGetPattern = "curl {-G} -k  -d '{data}' {url}";
+    this.cmdZZGet = "curl -G -k  -H  'Token:{ak}' -H  'Timespan:{ts}'  -d '{data}' {url}";
     this.cmdPostPattern = "curl -k -H 'Content-type: application/json' -d '{data}' '{url}'";
 
     this.cmdPostPatternWithAK = "curl -k -H 'Content-type: application/json'  -H  'AccessKey:{ak}'   -d '{data}' {url}";
@@ -16,6 +17,18 @@ class RestClient {
     this.cmdPostPattern5 = "curl -k --data '{data}' {url}";
 
   }
+  async execGetZZ(subData, url, acck, Timespan) {
+    let cmd = this.FetchGetZZCmd(subData, url, acck, Timespan);
+    var result = await this.exec(cmd);
+    return result;
+  }
+  FetchGetZZCmd(subData, url, acck, Timespan) {
+    var data = querystring.stringify(subData);
+    var cmd = this.cmdZZGet.replace(/\{data\}/g,
+      data).replace(/\{url\}/g, url).replace(/\{ak\}/g, acck).replace(/\{ts\}/g, Timespan);
+    return cmd;
+  }
+
   FetchGetCmd(subData, url) {
     var cmd = this.cmdGetPattern.replace(/\{\-G\}/g, "-G").replace(
       /\{data\}/g, subData).replace(/\{url\}/g, url);

igirl-zcapi/app/config/localsettings.js

@@ -10,8 +10,8 @@ var settings={
     user: "write",
     password: "write",
     config: {
-      host: '192.168.18.237',
-      port: 3306,
+      host: '43.247.184.35',
+      port: 8899,
       dialect: 'mysql',
         operatorsAliases: false,
         pool: {

igirl-zcapi/app/config/routes/api.js

@@ -48,8 +48,8 @@ module.exports = function (app) {
 
 		params.push(gname);
 		params.push(methodName);
-		params.push(req.query);
 		params.push(req.body);
+		params.push(req.query);
 		params.push(req);
 		var p = null;
 		var invokeObj = system.getObject("api." + classPath);

igirl-zcapi/app/config/settings.js

@@ -167,8 +167,11 @@ var settings = {
     icinvestSearchUrl: function () {
       return settings.reqEsAddrIc() + "bigdata_ic_gsb_invest_op/_search";
     },
+    iccompanyicpSearchUrl: function () {
+      return settings.reqEsAddrIc() + "bigdata_company_icp_record_all_final/_search";
+    },
     icchangeSearchUrl: function () {
-      return settings.reqEsAddrIc() + "bigdata_ic_gsb_change_op/_search";
+      return settings.reqEsAddrIc() + "bigdata_ic_gsb_change_1/_search";
     },
     iccompanynameSearchUrl: function () {
       return settings.reqEsAddrIc() + "bigdata_ic_gsb_company_op/_search";