Skip to content

H
hls-support-rlwx
Commit cb89ef30 authored by 5359's avatar 5359
Browse files
Options

正式环境参数修改

parent 9c5dec73
Pipeline #6002 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 63 additions and 63 deletions
      core/src/main/java/com/hand/app/esignHclc/service/impl/SignInfoHclcServiceImpl.java
      View file @ cb89ef30
      ......@@ -1130,8 +1130,8 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
      if ("HCLC".equalsIgnoreCase(role)) {
      json1.put("accountId", "0d83cfe0-4d86-11ea-b71a-b8599f3574b6");
      json1.put("authorizationOrganizeId", "f858b8e9-5c3a-11ea-8486-506b4bfdce3c");
      json1.put("accountId", "ab0cb1dc-8924-11ea-b71a-ec0d9ad45bf8");
      json1.put("authorizationOrganizeId", "cab73322-8924-11ea-b71a-ec0d9ad45bf8");
      } else {
      SignUserInfoHclc signInfoHclc = new SignUserInfoHclc();
      ......@@ -1169,48 +1169,48 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
      // }
      }
      //判断文字签字印章自定义模板是否存在
      if (Objects.nonNull(signInfoHclc.getSealId()) && !"-1".equalsIgnoreCase(signInfoHclc.getSealId())) {
      //获取签署文档信息
      JSONArray signDocDetails = json1.getJSONArray("signDocDetails");
      JSONArray signDocDetailsNew = new JSONArray();
      //解析签署文档信息
      for (int j = 0; j < signDocDetails.size(); j++) {
      JSONObject detail = signDocDetails.getJSONObject(j);
      //获取签署位置信息
      JSONArray signPos = detail.getJSONArray("signPos");
      JSONArray signPosNew = new JSONArray();
      for (int k = 0; k < signPos.size(); k++) {
      JSONObject pos = signPos.getJSONObject(k);
      //个人签字统一更换签字模板
      if (signInfoHclc.getCtitype().compareTo(1L) == 0) {
      pos.remove("sealId");
      pos.put("sealId", signInfoHclc.getSealId());
      } else {
      //企业签字判断是否存在PERSON签字，更换签字模板
      String signIdentity = pos.getString("signIdentity");
      if ("PERSON".equalsIgnoreCase(signIdentity)) {
      pos.remove("sealId");
      pos.put("sealId", signInfoHclc.getSealId());
      }
      }
      signPosNew.add(pos);
      }
      detail.remove("signPos");
      detail.put("signPos", signPosNew);
      signDocDetailsNew.add(detail);
      }
      json1.remove("signDocDetails");
      json1.put("signDocDetails", signDocDetailsNew);
      }
      // //判断文字签字印章自定义模板是否存在
      // if (Objects.nonNull(signInfoHclc.getSealId()) && !"-1".equalsIgnoreCase(signInfoHclc.getSealId())) {
      // //获取签署文档信息
      // JSONArray signDocDetails = json1.getJSONArray("signDocDetails");
      // JSONArray signDocDetailsNew = new JSONArray();
      // //解析签署文档信息
      // for (int j = 0; j < signDocDetails.size(); j++) {
      // JSONObject detail = signDocDetails.getJSONObject(j);
      //
      // //获取签署位置信息
      // JSONArray signPos = detail.getJSONArray("signPos");
      // JSONArray signPosNew = new JSONArray();
      //
      // for (int k = 0; k < signPos.size(); k++) {
      // JSONObject pos = signPos.getJSONObject(k);
      //
      // //个人签字统一更换签字模板
      // if (signInfoHclc.getCtitype().compareTo(1L) == 0) {
      // pos.remove("sealId");
      // pos.put("sealId", signInfoHclc.getSealId());
      // } else {
      // //企业签字判断是否存在PERSON签字，更换签字模板
      // String signIdentity = pos.getString("signIdentity");
      // if ("PERSON".equalsIgnoreCase(signIdentity)) {
      // pos.remove("sealId");
      // pos.put("sealId", signInfoHclc.getSealId());
      // }
      // }
      //
      // signPosNew.add(pos);
      // }
      //
      // detail.remove("signPos");
      // detail.put("signPos", signPosNew);
      //
      // signDocDetailsNew.add(detail);
      // }
      //
      // json1.remove("signDocDetails");
      // json1.put("signDocDetails", signDocDetailsNew);
      //
      // }
      }
      ......@@ -1236,7 +1236,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
      // //抄送人信息集合签署成功后通知抄送人
      // result.put("copyViewers", params.get("copyViewers"));
      //发起人用户id,默认hclc发起
      result.put("initiatorAccountId", "f858b8e9-5c3a-11ea-8486-506b4bfdce3c");
      result.put("initiatorAccountId", "cab73322-8924-11ea-b71a-ec0d9ad45bf8");
      //签署完成重定向地址
      result.put("redirectUrl", signRedirectUrl);
      //流程文档信息集合
      ......@@ -1298,7 +1298,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
      JSONObject signUrl = signUrls.getJSONObject(i);
      //建机自己
      if ("0d83cfe0-4d86-11ea-b71a-b8599f3574b6".equalsIgnoreCase(signUrl.getString("accountId"))) {
      if ("ab0cb1dc-8924-11ea-b71a-ec0d9ad45bf8".equalsIgnoreCase(signUrl.getString("accountId"))) {
      signUrl.put("name", "日立建机");
      } else {
      //根据uniqueId获取用户信息
      ......@@ -1365,7 +1365,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
      signUserInfoHclc.setAccountId(accountInfo.getString("authOrgId"));
      }
      JSONObject accountInfoNew = new JSONObject();
      if ("f858b8e9-5c3a-11ea-8486-506b4bfdce3c".equalsIgnoreCase(signUserInfoHclc.getAccountId())) {
      if ("cab73322-8924-11ea-b71a-ec0d9ad45bf8".equalsIgnoreCase(signUserInfoHclc.getAccountId())) {
      accountInfoNew.put("ctino", "");
      accountInfoNew.put("name", "日立建机");
      } else {
      ......
      core/src/main/resources/config.properties
      View file @ cb89ef30
      ......@@ -121,17 +121,17 @@ tsign.face.api.appId=5111596700
      #用户认证密码
      tsign.face.api.secret=f112f3acd3ed05263ba4a3fad6e901c
      #认证结果通知地址
      tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
      tsign.api.notifyUrl=http://lease.hitachics.com/core/api/public/listen/auth/result
      #签署结果通知地址
      tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
      tsign.api.listenSignUrl=http://lease.hitachics.com/core/api/public/listen/sign/flow
      #签署完成跳转地址
      tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
      tsign.api.signRedirectUrl=http://lease.hitachics.com/www/#/ElectronicContract
      #微信公众号apiKey
      wx.apiKey=handexinxi
      #微信公众号接口地址
      wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
      #微信服务器图片保存中台路径
      wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
      wx.image.path = D:\\app\\apache-tomcat-app\\app_file
      ......
      core/src/main/resources/profiles/dev/config.properties
      View file @ cb89ef30
      ......@@ -121,17 +121,17 @@ tsign.face.api.appId=5111596700
      #用户认证密码
      tsign.face.api.secret=f112f3acd3ed05263ba4a3fad6e901c
      #认证结果通知地址
      tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
      tsign.api.notifyUrl=http://lease.hitachics.com/core/api/public/listen/auth/result
      #签署结果通知地址
      tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
      tsign.api.listenSignUrl=http://lease.hitachics.com/core/api/public/listen/sign/flow
      #签署完成跳转地址
      tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
      tsign.api.signRedirectUrl=http://lease.hitachics.com/www/#/ElectronicContract
      #微信公众号apiKey
      wx.apiKey=handexinxi
      #微信公众号接口地址
      wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
      #微信服务器图片保存中台路径
      wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
      wx.image.path = D:\\app\\apache-tomcat-app\\app_file
      ......
      core/src/main/resources/profiles/sit/config.properties
      View file @ cb89ef30
      ......@@ -121,17 +121,17 @@ tsign.face.api.appId=5111596700
      #用户认证密码
      tsign.face.api.secret=f112f3acd3ed05263ba4a3fad6e901c
      #认证结果通知地址
      tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
      tsign.api.notifyUrl=http://lease.hitachics.com/core/api/public/listen/auth/result
      #签署结果通知地址
      tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
      tsign.api.listenSignUrl=http://lease.hitachics.com/core/api/public/listen/sign/flow
      #签署完成跳转地址
      tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
      tsign.api.signRedirectUrl=http://lease.hitachics.com/www/#/ElectronicContract
      #微信公众号apiKey
      wx.apiKey=handexinxi
      #微信公众号接口地址
      wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
      #微信服务器图片保存中台路径
      wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
      wx.image.path = D:\\app\\apache-tomcat-app\\app_file
      ......
      core/src/main/resources/profiles/uat/config.properties
      View file @ cb89ef30
      ......@@ -121,17 +121,17 @@ tsign.face.api.appId=5111596700
      #用户认证密码
      tsign.face.api.secret=f112f3acd3ed05263ba4a3fad6e901c
      #认证结果通知地址
      tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
      tsign.api.notifyUrl=http://lease.hitachics.com/core/api/public/listen/auth/result
      #签署结果通知地址
      tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
      tsign.api.listenSignUrl=http://lease.hitachics.com/core/api/public/listen/sign/flow
      #签署完成跳转地址
      tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
      tsign.api.signRedirectUrl=http://lease.hitachics.com/www/#/ElectronicContract
      #微信公众号apiKey
      wx.apiKey=handexinxi
      #微信公众号接口地址
      wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
      #微信服务器图片保存中台路径
      wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
      wx.image.path = D:\\app\\apache-tomcat-app\\app_file
      ......
      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