处理合并冲突

ruoyi-system/src/main/java/com/ruoyi/bestsign/utils/BestsignOpenApiClient.java

@@ -25,8 +25,8 @@ public class BestsignOpenApiClient {
     /**
      * 开发者私钥
      */
-//    @Value("${ssq.privateKey}")
+    @Value("${ssq.privateKey}")
-    private String privateKey="MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCiDRuz+dxqkWqHdov0hK+KEWLw/e8MQSqkZZ4c01Yr6cSmQiWyV8Xin0u5S/EA02FWxpjLi1nLriVtOBhZGsoryFmcJrwzSnQ5PORP/HhfcAWFE/Y+3qSQS1OiU7e5wbReCgEUvx4GHZuhdu8cOvq5DG9l33YFZrIEMBTmnf8eKT54STx0tjcKl7U6B6nsiThy3zVtpWXVv6H1HGmxC0KT4EQ388s/PFjrwmk+GFb3EpKCns/GQHf7QrtNz1ZOgCXfgQiQ+91/tcngzUH+zMCIxn5lS+ENAxVI6Ev3W9Y0QHtKwmO4ORVuAskJYzBB2xKI/gw8+PUXNziMAKXuoUAjAgMBAAECggEAd7yHw6vTGUrpE76cGsgPjEzcdoSqpLth7qbG9TWSblAEZXRqtiP0q0ZYhUl/gcSuH5gOPhdw+fZq4RCZrP0GdONMkvxsAtn4lnJPoGpD5wC2k2X0hO+tWJDP8xk4n6BozTNHKTUt0gb+f4eJlapep2xwwy0h30vKLR3504zafEV9j/2D8l5TFSv6rd3UVxUvrDKQ9mhfATEUlrTpjs0SfWupMkr4j7TuJJ8qSUSiEADe4hyUB6+LouDZCt8jV4aLojQBJKrQ6VPVdDFkHGsePu4tHtvcKsaOZJ0pjpJ7MT6D5ElD/sJjo0g/3qK5/FToVFVbrxtykVreK6mE5oSTQQKBgQDpEFSgH1d4N7NsZhviaCIUkB97hO0jpRbD7UZirzZ9ok96Fk+SmfhdmypDMoiaRHCNhQuu5dI9mg5RbUhz9mCZnAhzJRL+DmE4bhNvQmbtJA7KT6n/AdH2zy0mYulrcG17dQspvTr/5421PTEE2+FRoCbG6hBsSSUit9HLvAU13QKBgQCx/7ql+hbx+t0Yb02XckBHiA+MWrFLO4dMX9cKf3LldC0nhn0K9HOSoZmM0KcmXRnMo+/4t89xOJRl7JRXwcLoy/64OaUBVv+8FFV1yY4THka3nEnQE40vVWy+vuNJtt+eKlEhJ35N1GIHXo7/4j0POtEuNU7KSqMnLUD+Oy/t/wKBgEiajcJUASuyLnLWXFlrlzJQs34HKtiv1Se0Avk7G/6HUbr2uFMzI+wFKmVEmMl2CJoNmFYjwhruowc6xBdb6TvxH7C/G+uJD0BFCkjeprG5SeI8bvjB2GbKo4YRyiVuIK0VCSU3jemqeLq9FUguN0L2YR4WTIdvQeJO4UxWhkkBAoGBAJk7TxDHZK1XirIYTzGK928c4FWxVWMwkd7buqGc6epBwwV9r3OY0U1vtGIW1W4fQ7B5iIISqpALZyT/Lw0FDqedxWAOr8+hd3IQBynpI1et/q7d6mUoD6ip332tkrjIp2TfhQwHlaGmreUuL+h0eJ/9wEoJNhTLf/yf5o11omM9AoGBAOLVlXR9FbU2Ubpp3HwTumSzKDWzq3T5eQcqC1zE3BPOo29uAf9BQTumPxe51U64egttW/nif5FH4v4Gentmxb2B2ckdOs/u9zIWz3JPfHU7RqMyMokuWrQ6lMoiSYpH3MSHoavLyAEhAnpceX3oktXgpYHO9d8MfON3XKJl23ip";
+    private String privateKey;
     /**
      * Host地址
      */
@@ -66,7 +66,7 @@ public class BestsignOpenApiClient {
     public JSONObject userPersonalReg(String account, String name, String mail,
                                       String mobile, String identity, String identityType,
                                       String contactMail, String contactMobile, String province,
-                                  String city, String address,@NotNull String method) throws Exception {
+                                      String city, String address, @NotNull String method) throws Exception {
         //body参数
         JSONObject requestBody = new JSONObject();
 
@@ -77,7 +77,7 @@ public class BestsignOpenApiClient {
         //用户类型
         requestBody.put("userType", "1");
         //用户邮箱
-        requestBody.put("mail",mail);
+        requestBody.put("mail", mail);
         //用户手机号
         requestBody.put("mobile", mobile);
         //用户证件信息对象
@@ -127,8 +127,6 @@ public class BestsignOpenApiClient {
     }
 
 
-
-
     /**
      * GET方法示例
      * 下载合同PDF文件
@@ -173,7 +171,7 @@ public class BestsignOpenApiClient {
                 this.privateKey, this.serverHost, methodInvoke, timestamsParam, null,
                 requestParam.toJSONString());
         // 签名参数追加为url参数
-        String fullUrlParams = String.format(this.urlSignParams, this.developerId,
+        String fullUrlParams = String.format(urlSignParams, this.developerId,
                 timestamsParam, paramsSign);
 
         String responseResult = HttpClientSender.sendHttpPost(this.serverHost, methodInvoke,
@@ -191,7 +189,7 @@ public class BestsignOpenApiClient {
             }
         } else {
 
-            log.error("查询申请状态异常："+responseObj.toJSONString());
+            log.error("查询申请状态异常：" + responseObj.toJSONString());
         }
         return responseObj.toJSONString();
     }