From e407dd1f335aa9c716b89b3152bf363b898d28fa Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Sun, 29 May 2022 11:29:56 +0000
Subject: [PATCH] 接口请求框架 注册接口

---
 app/src/main/java/com/auto/lyric/retrofit/converter/DecryptGsonResponseBodyConverter.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/auto/lyric/retrofit/converter/DecryptGsonResponseBodyConverter.java b/app/src/main/java/com/auto/lyric/retrofit/converter/DecryptGsonResponseBodyConverter.java
index a86ecf0..8acd35a 100644
--- a/app/src/main/java/com/auto/lyric/retrofit/converter/DecryptGsonResponseBodyConverter.java
+++ b/app/src/main/java/com/auto/lyric/retrofit/converter/DecryptGsonResponseBodyConverter.java
@@ -1,5 +1,6 @@
 package com.auto.lyric.retrofit.converter;
 
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.auto.lyric.data.BaseApiResult;
@@ -51,15 +52,15 @@
             response = decryptJsonStr(val);//解密
         } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
             e.printStackTrace();
-            BaseApiResult apiResult = new BaseApiResult<>();
-            apiResult.code = 412;
-            apiResult.msg = "解密数据出错"+e.getMessage();
+            BaseApiResult apiResult = new BaseApiResult();
+            apiResult.result = "412";
+            apiResult.reason = "解密数据出错"+e.getMessage();
             response = new Gson().toJson(apiResult);
         } catch (JSONException e) {
             e.printStackTrace();
-            BaseApiResult apiResult = new BaseApiResult<>();
-            apiResult.code = 414;
-            apiResult.msg = "非标准json";
+            BaseApiResult apiResult = new BaseApiResult();
+            apiResult.result = "414";
+            apiResult.reason = "非标准json";
             response = new Gson().toJson(apiResult);
         }catch (Exception e){
             JsonReader jsonReader = gson.newJsonReader(value.charStream());
@@ -88,6 +89,8 @@
             JSONObject json = new JSONObject(body);
             body = json.toString();
             //body = RSAUtils.decrypt(json.getString(ENCRYPT), RSAUtils.getPublicKey(RSAUtils.PUBLIC_KEY));//
+        }else if(TextUtils.isEmpty(body)){
+            return body;
         }
         return transHump? GsonUtils.toHumpJson(body):body;
     }

--
Gitblit v1.9.1