fix GET请求无业务参数情况下不执行加密

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt

@@ -58,8 +58,9 @@ class ApiService {
     fun userLogout(apiCallback: IUserLogoutCallBack) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .userLogout(publicParamsMap)
+        .userLogout(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<Any?>() {
           override fun onSuccess(result: HttpResult<Any?>?) {
@@ -75,8 +76,9 @@ class ApiService {
     fun getLifeAccountList(apiCallback: IGetLifeAccountListCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getAccountList(publicParamsMap)
+        .getAccountList(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<ArrayList<LifeAccountItemBean.Response>?>() {
           override fun onSuccess(result: HttpResult<ArrayList<LifeAccountItemBean.Response>?>?) {
@@ -188,8 +190,9 @@ class ApiService {
     fun getKSYunBucket(apiCallback: IGetKSYunBucketCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getKSYunBucket(publicParamsMap)
+        .getKSYunBucket(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<GetKSYunBucketBean.Response>() {
           override fun onSuccess(result: HttpResult<GetKSYunBucketBean.Response>?) {
@@ -282,8 +285,9 @@ class ApiService {
     fun authLiveIdentity(apiCallback: IAuthLiveIdentityCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authLiveIdentity(publicParamsMap)
+        .authLiveIdentity(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<Any?>() {
           override fun onSuccess(result: HttpResult<Any?>?) {
@@ -319,8 +323,9 @@ class ApiService {
     fun authAuthentication(apiCallback: IAuthAuthenticationCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .authAuthentication(publicParamsMap)
+        .authAuthentication(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<AuthAuthenticationBean.Response?>() {
           override fun onSuccess(result: HttpResult<AuthAuthenticationBean.Response?>?) {
@@ -495,8 +500,9 @@ class ApiService {
     fun getConfigList(apiCallback: IGetConfigListCallback) {
       val timeStamp = System.currentTimeMillis()
       val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
       ServiceFactory.getInstance().createService(CommonService::class.java)
-        .getConfigList(publicParamsMap)
+        .getConfigList(publicParamsMap, privateParamsMap)
         .compose(TransformUtil.defaultSchedulers())
         .subscribe(object : HttpResultSubscriber<GetConfigListBean.Response>() {
           override fun onSuccess(result: HttpResult<GetConfigListBean.Response>?) {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/CommonService.kt

@@ -45,7 +45,10 @@ interface CommonService {
   ): Observable<HttpResult<Any?>>
 
   @GET(URLs.getKSYunBucket)
-  fun getKSYunBucket(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>>
+  fun getKSYunBucket(
+    @QueryMap commonParams: Map<String, String>,
+    @QueryMap requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
 
   @Headers("Content-Type: application/json")
   @POST(URLs.businessLicenseOCR)
@@ -61,10 +64,13 @@ interface CommonService {
   fun mobileLogin(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>): Observable<HttpResult<Any?>>
 
   @GET(URLs.userLogout)
-  fun userLogout(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>>
+  fun userLogout(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>): Observable<HttpResult<Any?>>
 
   @GET(URLs.accountList)
-  fun getAccountList(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>>
+  fun getAccountList(
+    @QueryMap commonParams: Map<String, String>,
+    @QueryMap requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
 
   @Headers("Content-Type: application/json")
   @POST(URLs.createLifeAccount)
@@ -81,13 +87,19 @@ interface CommonService {
   ): Observable<HttpResult<Any?>>
 
   @GET(URLs.authLiveIdentity)
-  fun authLiveIdentity(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>>
+  fun authLiveIdentity(
+    @QueryMap commonParams: Map<String, String>,
+    @QueryMap requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
 
   @GET(URLs.authComplete)
   fun authComplete(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>): Observable<HttpResult<Any?>>
 
   @GET(URLs.authAuthentication)
-  fun authAuthentication(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>>
+  fun authAuthentication(
+    @QueryMap commonParams: Map<String, String>,
+    @QueryMap requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
 
   @GET(URLs.authMerchantCheck)
   fun authMerchantCheck(
@@ -129,7 +141,10 @@ interface CommonService {
   ): Observable<HttpResult<Any?>>
 
   @GET(URLs.getConfigList)
-  fun getConfigList(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>>
+  fun getConfigList(
+    @QueryMap commonParams: Map<String, String>,
+    @QueryMap requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
 
   @Headers("Content-Type: application/json")
   @POST(URLs.getLifeAccountInfoById)