Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-10-29 6d784d07cb846fff146c05be086137d923702c67

 server/service/src/main/java/com/doumee/service/business/third/SignService.java

@@ -15,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
@@ -53,6 +54,8 @@
    private static String SERVICE_URL="https://api.sandbox.junziqian.com";
    private static  String APP_KEY="dcb4bd535a09df3c";
    private static  String APP_SECRET="b87c346edcb4bd535a09df3ca8c45d9a";
    @Value("${debug_model}")
    private Boolean debugModel;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
@@ -296,7 +299,7 @@
              return  json.getString("data");
          }
      }catch (Exception e){

          e.printStackTrace();
      }
      return null;

@@ -304,7 +307,6 @@
    /**
     * 发起签约
     * @param name
     * @param fileUrl
     * @param file
     * @param creditCoe
     * @param email
@@ -318,7 +320,7 @@
          params.put("serverCa",1); //使用云证书
          params.put("file",new File(file));
          params.put("dealType",5); //指定合同文件签署方式 5 为部分自动签
          params.put("positionType",2); //指定通过表单域方式设置签字位置
          params.put("positionType",0); //指定通过表单域方式设置签字位置
          params.put("fileType",0);
          params.put("needQifengSign",1);
          params.put("notifyUrl",notifyUrl);
@@ -330,7 +332,7 @@
          sReq.setEmail(email); //在君子签注册认证的邮箱
//        sReq.setChapteJson("[{\"page\":0,\"chaptes\":[{\"offsetX\":0.12,\"offsetY\":0.23}]},{\"page\":1,\"chaptes\":[{\"offsetX\":0.45,\"offsetY\":0.67}]}]");
//          sReq.setChapteJson(postionJson);
          sReq.setSearchKey(postionJson);
//          sReq.setSearchKey(postionJson);
          sReq.setSignId(singId);
          sReq.setSearchConvertExtend("{\"fixX\":-80,\"fixY\":-80}");
          sReq.setNoNeedVerify(1);
@@ -345,6 +347,7 @@
              return  json.getString("data");
          }
      }catch (Exception e){
          e.printStackTrace();

      }
      return null;
@@ -359,7 +362,10 @@
     * @param creditCode
     */
    public String signLink(String applyNo,String name,String creditCode) {
        try {    initParams();
        try {
            //延迟2秒
//            Thread.sleep(2*1000);
            initParams();
            Map<String, Object> params = bodyParams;
            String url = SERVICE_URL + "/v2/sign/link";
            params.put("applyNo",applyNo); //发起合同签署接口返回的APL编号
@@ -371,7 +377,11 @@
            saveInterfaceLog(url,"【电子签】获取签署链接地址",JSONObject.toJSONString(params),str);
            JSONObject json = JSONObject.parseObject(str);
            if(json!=null && json.getBoolean("success")){
                return  json.getString("data");
                String link =json.getString("data");
                if(!debugModel){
                    link = link.replace("https://h5","https://h7");
                }
                return link;
            }
        }catch (Exception e){
            e.printStackTrace();