diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/ThirdPartySecretInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/ThirdPartySecretInfoVO.java
index 09c68f02a..0e4dc576b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/ThirdPartySecretInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/ThirdPartySecretInfoVO.java
@@ -34,6 +34,16 @@ public class ThirdPartySecretInfoVO {
*/
private String ourSigSecret;
+ /**
+ * 我方生成的公钥
+ */
+ private String ourPublicSecret;
+
+ /**
+ * 我方生成的私钥
+ */
+ private String ourPrivateSecret;
+
/**
* 对接平台名称
*/
@@ -73,4 +83,14 @@ public class ThirdPartySecretInfoVO {
* 对接平台接口前缀
*/
private String theirUrlPrefix;
+
+ /**
+ * 对接平台生成的公钥
+ */
+ private String theirPublicSecret;
+
+ /**
+ * 对接平台生成的私钥
+ */
+ private String theirPrivateSecret;
}
diff --git a/jsowell-pile/src/main/java/com/jsowell/thirdparty/domain/ThirdpartySecretInfo.java b/jsowell-pile/src/main/java/com/jsowell/thirdparty/domain/ThirdpartySecretInfo.java
index 5c1678095..da50bb64e 100644
--- a/jsowell-pile/src/main/java/com/jsowell/thirdparty/domain/ThirdpartySecretInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/thirdparty/domain/ThirdpartySecretInfo.java
@@ -67,6 +67,16 @@ public class ThirdpartySecretInfo extends BaseEntity {
@Excel(name = "对接平台生成的签名密钥")
private String theirSigSecret;
+ /**
+ * 对接平台生成的公钥
+ */
+ private String theirPublicSecret;
+
+ /**
+ * 对接平台生成的私钥
+ */
+ private String theirPrivateSecret;
+
/**
* 我方生成的唯一识别密钥
*/
@@ -91,6 +101,16 @@ public class ThirdpartySecretInfo extends BaseEntity {
@Excel(name = "我方生成的签名密钥")
private String ourSigSecret;
+ /**
+ * 我方生成的公钥
+ */
+ private String ourPublicSecret;
+
+ /**
+ * 我方生成的私钥
+ */
+ private String ourPrivateSecret;
+
/**
* 删除标识（0-正常；1-删除）
*/
@@ -200,6 +220,38 @@ public class ThirdpartySecretInfo extends BaseEntity {
return ourSigSecret;
}
+ public String getTheirPublicSecret() {
+ return theirPublicSecret;
+ }
+
+ public void setTheirPublicSecret(String theirPublicSecret) {
+ this.theirPublicSecret = theirPublicSecret;
+ }
+
+ public String getTheirPrivateSecret() {
+ return theirPrivateSecret;
+ }
+
+ public void setTheirPrivateSecret(String theirPrivateSecret) {
+ this.theirPrivateSecret = theirPrivateSecret;
+ }
+
+ public String getOurPublicSecret() {
+ return ourPublicSecret;
+ }
+
+ public void setOurPublicSecret(String ourPublicSecret) {
+ this.ourPublicSecret = ourPublicSecret;
+ }
+
+ public String getOurPrivateSecret() {
+ return ourPrivateSecret;
+ }
+
+ public void setOurPrivateSecret(String ourPrivateSecret) {
+ this.ourPrivateSecret = ourPrivateSecret;
+ }
+
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
diff --git a/jsowell-pile/src/main/resources/mapper/thirdparty/ThirdpartySecretInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/thirdparty/ThirdpartySecretInfoMapper.xml
index b6e6ddf31..f35c6eeda 100644
--- a/jsowell-pile/src/main/resources/mapper/thirdparty/ThirdpartySecretInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/thirdparty/ThirdpartySecretInfoMapper.xml
@@ -14,10 +14,14 @@
+
+
+
+
@@ -27,8 +31,8 @@
id, platform_name, platform_type, url_prefix, their_operator_id, their_operator_secret, their_data_secret,
- their_data_secret_iv, their_sig_secret, our_operator_secret, our_data_secret, our_data_secret_iv,
- our_sig_secret, create_by, create_time, update_by, update_time, del_flag
+ their_data_secret_iv, their_sig_secret, their_public_secret, their_private_secret, our_operator_secret, our_data_secret, our_data_secret_iv,
+ our_sig_secret, our_public_secret, our_private_secret, create_by, create_time, update_by, update_time, del_flag
@@ -47,10 +51,14 @@
and their_data_secret = #{theirDataSecret}
and their_data_secret_iv = #{theirDataSecretIv}
and their_sig_secret = #{theirSigSecret}
+ and their_public_secret = #{theirPublicSecret}
+ and their_private_secret = #{theirPrivateSecret}
and our_operator_secret = #{ourOperatorSecret}
and our_data_secret = #{ourDataSecret}
and our_data_secret_iv = #{ourDataSecretIv}
and our_sig_secret = #{ourSigSecret}
+ and our_public_secret = #{ourPublicSecret}
+ and our_private_secret = #{ourPrivateSecret}
@@ -70,10 +78,14 @@
their_data_secret,
their_data_secret_iv,
their_sig_secret,
+ their_public_secret,
+ their_private_secret,
our_operator_secret,
our_data_secret,
our_data_secret_iv,
our_sig_secret,
+ our_public_secret,
+ our_private_secret,
create_by,
create_time,
update_by,
@@ -89,10 +101,14 @@
#{theirDataSecret},
#{theirDataSecretIv},
#{theirSigSecret},
+ #{theirPublicSecret},
+ #{theirPrivateSecret},
#{ourOperatorSecret},
#{ourDataSecret},
#{ourDataSecretIv},
#{ourSigSecret},
+ #{ourPublicSecret},
+ #{ourPrivateSecret},
#{createBy},
#{createTime},
#{updateBy},
@@ -112,10 +128,14 @@
their_data_secret = #{theirDataSecret},
their_data_secret_iv = #{theirDataSecretIv},
their_sig_secret = #{theirSigSecret},
+ their_public_secret = #{theirPublicSecret},
+ their_private_secret = #{theirPrivateSecret},
our_operator_secret = #{ourOperatorSecret},
our_data_secret = #{ourDataSecret},
our_data_secret_iv = #{ourDataSecretIv},
our_sig_secret = #{ourSigSecret},
+ our_public_secret = #{ourPublicSecret},
+ our_private_secret = #{ourPrivateSecret},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
@@ -146,9 +166,13 @@
t1.their_data_secret_iv as theirDataSecretIv,
t1.their_sig_secret as theirSigSecret,
t1.url_prefix as theirUrlPrefix,
+ t1.their_public_secret as theirPublicSecret,
+ t1.their_private_secret as theirPrivateSecret,
t1.our_operator_secret as ourOperatorSecret,
t1.our_data_secret as ourDataSecret,
t1.our_data_secret_iv as ourDataSecretIv,
+ t1.our_public_secret as ourPublicSecret,
+ t1.our_private_secret as ourPrivateSecret,
t1.our_sig_secret as ourSigSecret
from thirdparty_secret_info t1
where t1.del_flag = '0'
@@ -165,9 +189,13 @@
t1.their_data_secret_iv as theirDataSecretIv,
t1.their_sig_secret as theirSigSecret,
t1.url_prefix as theirUrlPrefix,
+ t1.their_public_secret as theirPublicSecret,
+ t1.their_private_secret as theirPrivateSecret,
t1.our_operator_secret as ourOperatorSecret,
t1.our_data_secret as ourDataSecret,
t1.our_data_secret_iv as ourDataSecretIv,
+ t1.our_public_secret as ourPublicSecret,
+ t1.our_private_secret as ourPrivateSecret,
t1.our_sig_secret as ourSigSecret
from thirdparty_secret_info t1
where t1.del_flag = '0'
@@ -184,9 +212,13 @@
t1.their_data_secret_iv as theirDataSecretIv,
t1.their_sig_secret as theirSigSecret,
t1.url_prefix as theirUrlPrefix,
+ t1.their_public_secret as theirPublicSecret,
+ t1.their_private_secret as theirPrivateSecret,
t1.our_operator_secret as ourOperatorSecret,
t1.our_data_secret as ourDataSecret,
t1.our_data_secret_iv as ourDataSecretIv,
+ t1.our_public_secret as ourPublicSecret,
+ t1.our_private_secret as ourPrivateSecret,
t1.our_sig_secret as ourSigSecret
from thirdparty_secret_info t1
left join thirdparty_station_relation t2 on t2.third_party_type = t1.platform_type and t2.del_flag = '0'