瀏覽代碼

阿里风控appid修改
设备信息mac获取一长串
user接口上传mac地址,方便增加风控白名单

kaka 4 年之前
父節點
當前提交
1d9f4290aa

+ 2 - 1
assets/script/game/data/AppData.ts

@@ -60,7 +60,8 @@ export class AppData {
         this.machineInfo.android_id = arr[0];
         this.machineInfo.idfa = arr[1];
         this.machineInfo.imei = arr[2];
-        this.machineInfo.mac = this.mac = arr[3];
+        this.machineInfo.mac = arr[3];
+        this.mac = this.machineInfo.mac.split(',')[0];
         this.machineInfo.oaid = arr[4];
         this.machineInfo.umid = arr[5];
         this.machineInfo.UA = arr[11];

+ 3 - 2
assets/script/game/data/LoginData.ts

@@ -138,7 +138,7 @@ export class LoginData {
             "versioncfg": gData.appData.version,
             "idfa": gData.appData.machineInfo.idfa,
             "imei": gData.appData.machineInfo.imei,
-            "mac": gData.appData.mac,
+            "mac": gData.appData.machineInfo.mac,
             "oaid": gData.appData.machineInfo.oaid,
             "szlm_did": mk.shuzilmM.szlm_did,
             "black_box": mk.tongdunM.tdEquipID,
@@ -286,7 +286,8 @@ export class LoginData {
             "uin": this.uin,
             "login_ticket": this.loginTicket,
             "szlm_did": mk.shuzilmM.szlm_did,
-            "black_box": mk.tongdunM.tdEquipID
+            "black_box": mk.tongdunM.tdEquipID,
+            "mac": gData.appData.machineInfo.mac
         };
 
         let data = {

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/aliRisk/AliRiskManager.java

@@ -13,7 +13,7 @@ import org.cocos2dx.javascript.AppActivity;
  * 阿里风控管理类
  */
 public class AliRiskManager {
-    private static final String userAppKey = "38ad875e38bea654272bcefc51fc5cac";
+    private static final String userAppKey = "a1d86fe4b4382bead1a372c8deefaabb";
 
     //单例模式
     private static AliRiskManager mInstance = null;

+ 12 - 8
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java

@@ -124,6 +124,7 @@ public class DeviceUtil {
     public static String getMac() {
         String macSerial = null;
         String str = "";
+        String macAll = "";
 
         try {
             Process pp = Runtime.getRuntime().exec("ip addr");
@@ -134,8 +135,15 @@ public class DeviceUtil {
                 str = input.readLine();
                 if (str != null) {
                     macSerial = str.trim();// 去空格
-                    if (macSerial.indexOf("link/ether") != -1) {
-                        break;
+                    if(macSerial.indexOf("link/ether") != -1) {
+                        if(macSerial.split(" ").length >= 2){
+                            if(macAll.equals("")){
+                                macAll = macSerial.split(" ")[1];
+                            }
+                            else{
+                                macAll = macAll.concat(",").concat(macSerial.split(" ")[1]);
+                            }
+                        }
                     }
                 }
             }
@@ -143,12 +151,8 @@ public class DeviceUtil {
             // 赋予默认值
             ex.printStackTrace();
         }
-//        Log.d("vvvvvvvvv  ", "getMac: " + macSerial);
-        String mac = "";
-        if (macSerial.split(" ").length >= 2) {
-            mac = macSerial.split(" ")[1];
-        }
-        return mac;
+
+        return macAll;
     }
 
     /**