Commit e62bf5b2 authored by yinjiacheng's avatar yinjiacheng

update 网络请求参数加解密直接使用XDiamond API

parent 7826f50c
...@@ -11,6 +11,7 @@ import com.yidian.bcommon.sdk.JudgeClientUtils ...@@ -11,6 +11,7 @@ import com.yidian.bcommon.sdk.JudgeClientUtils
import com.yidian.bcommon.services.ZapServiceActionConstants import com.yidian.bcommon.services.ZapServiceActionConstants
import com.yidian.bcommon.services.ZapServiceNameConstants import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.bcommon.utils.NetWorkUtils import com.yidian.bcommon.utils.NetWorkUtils
import com.yidian.framework.mobile.xdiamond.SecretUtil
import com.yidian.yac.core.zap.ZapTicket import com.yidian.yac.core.zap.ZapTicket
import com.yidian.yac.ftdevicefinger.core.FtDeviceFingerManager import com.yidian.yac.ftdevicefinger.core.FtDeviceFingerManager
import org.json.JSONObject import org.json.JSONObject
...@@ -70,7 +71,7 @@ class HttpParamsUtils { ...@@ -70,7 +71,7 @@ class HttpParamsUtils {
// C端身份请求加uid // C端身份请求加uid
BCommonManager.getUid()?.let { paramsMap["user_id"] = it } BCommonManager.getUid()?.let { paramsMap["user_id"] = it }
Timber.tag(BCommonManager.TAG_HTTP).d("request private params: ${gson.toJson(paramsMap)}") Timber.tag(BCommonManager.TAG_HTTP).d("request private params: ${gson.toJson(paramsMap)}")
hashMapOf("tok" to BCommonManager.getEncryptIml().rsaEncrypt(gson.toJson(paramsMap))) hashMapOf("tok" to SecretUtil.rsaEncrypt(gson.toJson(paramsMap)))
} else { } else {
// C端身份请求加uid // C端身份请求加uid
BCommonManager.getUid()?.let { paramsMap["user_id"] = it } BCommonManager.getUid()?.let { paramsMap["user_id"] = it }
...@@ -91,10 +92,10 @@ class HttpParamsUtils { ...@@ -91,10 +92,10 @@ class HttpParamsUtils {
if (rsaResult != null) { if (rsaResult != null) {
try {// 捕获数据解析异常, 防止T内部的字端解析失败 try {// 捕获数据解析异常, 防止T内部的字端解析失败
if (RunConfig.IS_ENCRYPT) { if (RunConfig.IS_ENCRYPT) {
val result = BCommonManager.getEncryptIml().rsaDecrypt(rsaResult as String) val result = SecretUtil.rsaDecrypt(rsaResult as String)
Timber.tag(BCommonManager.TAG_HTTP).d("response result: $result") Timber.tag(BCommonManager.TAG_HTTP).d("response result: $result")
val decryptResult = gson.fromJson<HttpDecryptResult<T>>(result, object : TypeToken<HttpDecryptResult<T>>() {}.type) val decryptResult = gson.fromJson<HttpDecryptResult<T>>(result, object : TypeToken<HttpDecryptResult<T>>() {}.type)
val verify = BCommonManager.getEncryptIml().verifySign(decryptResult.reqid + decryptResult.ts, decryptResult.secret) val verify = SecretUtil.verifySign(decryptResult.reqid + decryptResult.ts, decryptResult.secret)
return if (verify) { return if (verify) {
Timber.tag(BCommonManager.TAG_HTTP).d("verify success") Timber.tag(BCommonManager.TAG_HTTP).d("verify success")
val resultJson = gson.toJson(decryptResult.data) val resultJson = gson.toJson(decryptResult.data)
...@@ -138,7 +139,7 @@ class HttpParamsUtils { ...@@ -138,7 +139,7 @@ class HttpParamsUtils {
* 规则: reqId + timeStamp * 规则: reqId + timeStamp
*/ */
private fun getSignString(reqId: String, timeStamp: Long): String { private fun getSignString(reqId: String, timeStamp: Long): String {
return BCommonManager.getEncryptIml().sign(StringBuilder().append(reqId).append(timeStamp).toString()) return SecretUtil.sign(StringBuilder().append(reqId).append(timeStamp).toString()).toString()
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment