From 53e0cba6de254a1d6f19d0287da0b212f4a5ae90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index 2837a38..07eaea0 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -91,7 +91,7 @@
* @return
*/
@Override
- public ZTUserGetTokenResponse userUpdateInfo(ZTUserInfoUpdateRequest param){
+ public ZTBaseResponse userUpdateInfo(ZTUserInfoUpdateRequest param){
ZTBaseResponse<ZTUserGetTokenResponse> result = sendHttpRequest(
ZTConstants.IntegerUrl.USER_UPDATE_URL,
ZTConstants.IntegerName.USER_UPDATE_NAME,
@@ -99,10 +99,10 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<ZTUserGetTokenResponse>>(){});
- if(result!=null){
- return result.getData();
- }
- return null;
+// if(result!=null){
+// return result.getData();
+// }
+ return result;
}
/**
* 娉ㄩ攢鐢ㄦ埛
@@ -208,7 +208,7 @@
* @return
*/
@Override
- public boolean collectDo(ZTActionDoRequest param){
+ public ZTBaseResponse collectDo(ZTActionDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.COLLECT_DO_URL,
ZTConstants.IntegerName.COLLECT_DO_NAME,
@@ -216,10 +216,8 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+
+ return result;
}
/**
* 鍐呭鍠滄
@@ -227,7 +225,7 @@
* @return
*/
@Override
- public boolean likeDo(ZTActionBatchDoRequest param){
+ public ZTBaseResponse likeDo(ZTActionBatchDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.LIKE_DO_URL,
ZTConstants.IntegerName.LIKE_DO_NAME,
@@ -235,10 +233,8 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+
+ return result;
}
/**
* 鍐呭鍒嗕韩
@@ -246,7 +242,7 @@
* @return
*/
@Override
- public boolean shareDo(ZTActionDoRequest param){
+ public ZTBaseResponse shareDo(ZTActionDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.SHARE_DO_URL,
ZTConstants.IntegerName.SHARE_DO_NAME,
@@ -254,10 +250,7 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+ return result;
}
/**
* 鍐呭娴忚
@@ -265,7 +258,7 @@
* @return
*/
@Override
- public boolean viewDo(ZTActionDoRequest param){
+ public ZTBaseResponse viewDo(ZTActionDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.VIEW_DO_URL,
ZTConstants.IntegerName.VIEW_DO_NAME,
@@ -273,10 +266,7 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+ return result;
}
/**
* 鐢ㄦ埛缁戝畾瀹㈡埛鍠滄娓呭崟锛屽彲缁戝畾澶氫釜鍐呭
@@ -404,7 +394,6 @@
String res = null;
int success = 0;
try {
-
Map<String,String> headers = new HashMap<>();
headers.put(ZTConstants.HEADER_TOKEN,token);
headers.put(ZTConstants.HEADER_USERTYPE,userType);
--
Gitblit v1.9.3