From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 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..7d6f425 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);
@@ -224,12 +227,13 @@
return null;
}
/**
- * 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ * 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
* @param email
* @return
*/
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,8 @@
// params.put("file",file);
params.put("url",fileUrl);
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",1); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+// params.put("positionType",2); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",0); //鎸囧畾鍏珷浣嶇疆绫诲瀷:0鎴杗ull浣跨敤绛惧瓧搴ф爣浣嶇疆鎴栦笉鎸囧畾绛惧瓧浣嶇疆;1琛ㄥ崟鍩熷畾浣�(琛ㄥ崟鍩熷鏋滀笂浼犱负pdf鏃�,闇�pdf鑷瀹氫箟濂借〃鍗曞煙,html鍙妘rl鍙妕mpl绛夐渶瀹氫箟濂絠nput鏍囩);2鍏抽敭瀛楀畾涔�
params.put("fileType",1);
params.put("needQifengSign",1);
params.put("notifyUrl",notifyUrl);
@@ -275,13 +281,13 @@
sReq.setIdentityCard(creditCoe);//钀ヤ笟鎵х収鍙�
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.setChapteJson(postionJson);//琛ㄥ崟鍩熷畾浣� 瀵瑰簲positionType=1
+// sReq.setSearchKey(postionJson);//鍏抽敭瀛� 瀵瑰簲positionType=2
sReq.setSignId(singId);
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);
@@ -298,21 +304,20 @@
/**
* 鍙戣捣绛剧害
* @param name
- * @param fileUrl
* @param file
* @param creditCoe
* @param email
* @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); //鍚堝悓鍚嶇О
params.put("serverCa",1); //浣跨敤浜戣瘉涔�
params.put("file",new File(file));
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",1); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",0); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
params.put("fileType",0);
params.put("needQifengSign",1);
params.put("notifyUrl",notifyUrl);
@@ -324,8 +329,9 @@
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);
signatories.add(sReq);
params.put("signatories",signatories.toJSONString());
@@ -353,6 +359,9 @@
*/
public String signLink(String applyNo,String name,String creditCode) {
try {
+ //寤惰繜2绉�
+// Thread.sleep(2*1000);
+ initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/link";
params.put("applyNo",applyNo); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
@@ -375,9 +384,36 @@
* 鑾峰彇绛剧讲閾炬帴鍦板潃(杩斿洖鏂囦欢鍦板潃锛岀缃插悗鎵嶆槸鏂囦欢鍦板潃锛屽惁鍒欒烦杞埌绛剧讲椤甸潰)
* @param applyNo
*/
+ public String linkFileStatus(String applyNo) {
+
+ try { initParams();
+ Map<String, Object> params = bodyParams;
+ String url = SERVICE_URL + "/v2/sign/status";
+ //鏋勫缓璇锋眰鍙傛暟
+ params.put("applyNo",applyNo); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
+// params.put("fullName",fullName); //绛剧害浜哄悕绉�
+// params.put("identityCard",identityCard); //绛剧害浜鸿瘉浠跺彿
+// params.put("identityType",12); //璇佷欢绫诲瀷 1韬唤璇�, 2鎶ょ収, 3鍙拌優璇�, 4娓境灞呮皯鏉ュ線鍐呭湴閫氳璇�, 11钀ヤ笟鎵х収, 12缁熶竴绀句細淇＄敤浠ｇ爜, 20瀛愯处鍙�, 99鍏朵粬
+ String str= HttpClientUtils.init().getPost(url,null,params,true);
+ System.out.println(str);
+ saveInterfaceLog(url,"銆愮數瀛愮銆戠绾︾姸鎬佹煡璇�",JSONObject.toJSONString(params),str);
+ JSONObject json = JSONObject.parseObject(str);
+ if(json!=null && json.getBoolean("success")){
+ //0 锛氭湭绛� 1 锛氬凡绛� 2锛氭嫆绛� 3锛氬凡淇濆叏
+ return json.getString("data");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇绛剧讲閾炬帴鍦板潃(杩斿洖鏂囦欢鍦板潃锛岀缃插悗鎵嶆槸鏂囦欢鍦板潃锛屽惁鍒欒烦杞埌绛剧讲椤甸潰)
+ * @param applyNo
+ */
public String linkFile(String applyNo) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/linkFile";
//鏋勫缓璇锋眰鍙傛暟
@@ -401,8 +437,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 +463,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