From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index e2aabab..a5c52aa 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -83,11 +83,11 @@
}
public void initParams(){
- long ts=System.currentTimeMillis();
+ long ts=System.currentTimeMillis()/1000;
String nonce=DigestUtils.md5Hex(System.currentTimeMillis()+"");
String sign=DigestUtils.sha256Hex("nonce"+nonce+"ts"+ts+"app_key"+APP_KEY+"app_secret"+APP_SECRET);
bodyParams=new IdentityHashMap<>();
- bodyParams.put("ts",ts);
+ bodyParams.put("ts",System.currentTimeMillis()/1000);
bodyParams.put("app_key",APP_KEY);
bodyParams.put("sign",sign);
bodyParams.put("nonce",nonce);//杩欏彧鍙槸涓轰簡鐢熸垚涓�涓殢鏈哄��
@@ -125,6 +125,7 @@
*/
public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,String businessimgPath, String notifyUrl){
try {
+ initParams();
File businessimg =netFileToLoclFile(businessimgPath);
if(businessimg == null || !businessimg.isFile() || !businessimg.exists()){
return false;
@@ -166,10 +167,12 @@
*/
public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,String businessimgPath,String notifyUrl){
try {
+
File businessimg = new File(new URI(businessimgPath));
if(businessimg == null|| !businessimg.isFile() || !businessimg.exists()){
return false ;
}
+ initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationReapply";
params.put("name",fullname);
@@ -230,6 +233,7 @@
*/
public int organizationAuditStatus (String email){
try {
+ initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationAuditStatus";
params.put("emailOrMobile",email);
@@ -257,6 +261,7 @@
*/
public String applySign(String name,String fileUrl,String fullname,String creditCoe,String email,String postionJson,String singId,String notifyUrl){
try {
+ initParams();
String url=SERVICE_URL+"/v2/sign/applySign";
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
@@ -264,7 +269,7 @@
// params.put("file",file);
params.put("url",fileUrl);
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",1); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",2); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
params.put("fileType",1);
params.put("needQifengSign",1);
params.put("notifyUrl",notifyUrl);
@@ -281,7 +286,7 @@
sReq.setNoNeedVerify(1);
signatories.add(sReq);
params.put("signatories",signatories.toJSONString());
- System.out.println(signatories.toJSONString());
+ System.out.println("================"+JSONObject.toJSONString(params));
String str= HttpClientUtils.init().getPost(url,null,params,true);
System.out.println(str);
saveInterfaceLog(url,"銆愮數瀛愮銆戝彂璧风绾�",JSONObject.toJSONString(params),str);
@@ -305,7 +310,7 @@
* @param postionJson
*/
public String applySignLocalFile(String name,String fullname,String file,String creditCoe,String email,String postionJson,String singId,String notifyUrl){
- try {
+ try { initParams();
String url=SERVICE_URL+"/v2/sign/applySign";
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
@@ -326,6 +331,7 @@
// sReq.setChapteJson(postionJson);
sReq.setSearchKey(postionJson);
sReq.setSignId(singId);
+ sReq.setSearchConvertExtend("{\"fixX\":10,\"fixY\":-50}");
sReq.setNoNeedVerify(1);
signatories.add(sReq);
params.put("signatories",signatories.toJSONString());
@@ -352,7 +358,7 @@
* @param creditCode
*/
public String signLink(String applyNo,String name,String creditCode) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/link";
params.put("applyNo",applyNo); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
@@ -377,7 +383,7 @@
*/
public String linkFile(String applyNo) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/linkFile";
//鏋勫缓璇锋眰鍙傛暟
@@ -401,8 +407,8 @@
*/
public String uploadEntSign(String signName,String path,String email ) {
- try {
- File signImgFile = new File(new URI(path));
+ try { initParams();
+ File signImgFile =netFileToLoclFile(path);
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/user/uploadEntSign";
//鏋勫缓璇锋眰鍙傛暟
@@ -427,7 +433,7 @@
*/
public boolean deleteEntSign(String signId ) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/user/deleteEntSign";
//鏋勫缓璇锋眰鍙傛暟
--
Gitblit v1.9.3