Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

center-manage/app/base/service/impl/auth/userSve.js

@@ -305,7 +305,7 @@ class UserService extends ServiceBase {
   //身份中的secret验证签名
   //身份中的secret验证签名
   async jwtsign(plkey, secretstr, opts) {
   async jwtsign(plkey, secretstr, opts) {
     let promise = new Promise(function (resv, rej) {
     let promise = new Promise(function (resv, rej) {
-      jwt.sign({ iss: plkey }, secretstr, opts, function (err, rtn) {
+      jwt.sign({exp: Math.floor(Date.now() / 1000) + (60 * 60),iss: plkey}, secretstr, opts, function (err, rtn) {
         if (err) {
         if (err) {
           rej(err);
           rej(err);
         } else {
         } else {
@@ -365,6 +365,7 @@ class UserService extends ServiceBase {
   async update(qobj, tm = null) {
   async update(qobj, tm = null) {
     var self = this;
     var self = this;
     return this.db.transaction(async function (t) {
     return this.db.transaction(async function (t) {
+      delete qobj['company_id']
       let up = await self.dao.update(qobj, t);
       let up = await self.dao.update(qobj, t);
       //令缓存失效
       //令缓存失效
       await self.cacheManager["UserCache"].invalidate(qobj.userName);
       await self.cacheManager["UserCache"].invalidate(qobj.userName);

center-manage/app/base/service/impl/product/b.txt

+[
+    {"id":41,"price_code":"sv_business_registration_category_indi7","product_name":"/ic/cpreg/","price_name":"个体工商","created_at":null,"updated_at":null,"deleted_at":null,"version":null},
+    {"id":42,"price_code":"sv_business_registration_category_lp7","product_name":"/ic/cpreg/","price_name":"有限公司","created_at":null,"updated_at":null,"deleted_at":null,"version":null},
+    {"id":43,"price_code":"sv_business_registration_category_sole7","product_name":"/ic/cpreg/","price_name":"个人独资","created_at":null,"updated_at":null,"deleted_at":null,"version":null}
+]
\ No newline at end of file

center-manage/app/base/service/impl/product/xproductSve.js

@@ -49,6 +49,9 @@ function findTitlePath(items, findstr, results) {
     product.company_id=1
     product.company_id=1
     //构造策略ids
     //构造策略ids
     let stsinfos = await ps.db.models.xproductprice.findAll({ where:{product_name:xp.path_code},raw: true })
     let stsinfos = await ps.db.models.xproductprice.findAll({ where:{product_name:xp.path_code},raw: true })
+    if(xp.region_name=="重庆" && xp.path_code=="/ic/cpreg/"){
+       fs.writeFileSync("./b.txt",JSON.stringify(stsinfos))
+    }
     let straid=[]
     let straid=[]
     let skucodemap={}
     let skucodemap={}
     for(let stinfo of stsinfos){
     for(let stinfo of stsinfos){

center-manage/app/base/system.js

@@ -282,7 +282,7 @@ class System {
                 requestId: resultInfo.requestId || ""
                 requestId: resultInfo.requestId || ""
             }
             }
 		};
 		};
-		console.log(param)
+		console.log(JSON.stringify(param))
 		let P=new Promise((resv,rej)=>{
 		let P=new Promise((resv,rej)=>{
 			this.postJsonTypeReq(reqUrl,param).then(res=>{
 			this.postJsonTypeReq(reqUrl,param).then(res=>{
 				if(res.statusCode==200){
 				if(res.statusCode==200){