From 1c55ae090c6076bcfd93cbc2c001ad8713d53b69 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 18 Aug 2021 15:13:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=82=E5=95=86=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF(appid,appkey?=
 =?UTF-8?q?=E7=AD=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/agconnect-services.json                   | 58 ++++++++++++++++---
 .../XChatConstants.java                       | 12 ++--
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/app/agconnect-services.json b/app/agconnect-services.json
index 4325c5108..0f1fc44ca 100644
--- a/app/agconnect-services.json
+++ b/app/agconnect-services.json
@@ -1,16 +1,37 @@
 {
 	"agcgw":{
 		"backurl":"connect-drcn.dbankcloud.cn",
-		"url":"connect-drcn.hispace.hicloud.com"
+		"url":"connect-drcn.hispace.hicloud.com",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.com"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.hispace.hicloud.com",
+		"CN_back":"connect-drcn.dbankcloud.cn",
+		"DE":"connect-dre.hispace.hicloud.com",
+		"DE_back":"connect-dre.dbankcloud.cn",
+		"RU":"connect-drru.hispace.hicloud.com",
+		"RU_back":"connect-drru.dbankcloud.cn",
+		"SG":"connect-dra.hispace.hicloud.com",
+		"SG_back":"connect-dra.dbankcloud.cn"
 	},
 	"client":{
-		"cp_id":"2850086000357865464",
-		"product_id":"736430079244430800",
-		"client_id":"355467170064368832",
-		"client_secret":"0EAB591E523474B7A0441DD4ED400FBE76F1730E499D028948BDA1AEA24A2232",
-		"app_id":"102156739",
-		"package_name":"com.mango.yinyou",
-		"api_key":"CgB6e3x91yYBKcn4fsMK/oZTCZNKo5QCRqE/1K6ZvpxI6drwrIBELZbub05G5yH6UFBmlJfHDyPbZvL3gpAGAxuw"
+		"cp_id":"890086000300337421",
+		"product_id":"736430079245711652",
+		"client_id":"625842227532282816",
+		"client_secret":"B23D0CD85C92ADC6676AF6CC8671628F0F155D29A527E7BDF2A53E26F0B5A720",
+		"project_id":"736430079245711652",
+		"app_id":"104321113",
+		"api_key":"CwEAAAAAZgS4/Nw1+/PybMG5CZXzJmlHHHnj0Tp2FOXQG3RtKUdpAsiQiXttqCXlHWA8GdUzGjtnq6oQh2Ogfe8JOs8ihePgJLg=",
+		"package_name":"com.mango.yinyou"
+	},
+	"oauth_client":{
+		"client_id":"104321113",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"104321113",
+		"package_name":"com.mango.yinyou"
 	},
 	"service":{
 		"analytics":{
@@ -18,6 +39,9 @@
 			"resource_id":"p1",
 			"channel_id":""
 		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
 		"cloudstorage":{
 			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn"
 		},
@@ -26,5 +50,21 @@
 		}
 	},
 	"region":"CN",
-	"configuration_version":"1.0"
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.mango.yinyou",
+			"client":{
+				"app_id":"104321113"
+			},
+			"app_info":{
+				"package_name":"com.mango.yinyou",
+				"app_id":"104321113"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"104321113"
+			}
+		}
+	]
 }
\ No newline at end of file
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
index d9fefc32b..1f592e4cc 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
@@ -247,9 +247,9 @@ public class XChatConstants {
     /**
      * 小米推送
      */
-    public static final String XM_APP_ID = "2882303761518389079";
-    public static final String XM_APP_KEY = "5551838995079";
-    public static final String XM_CERTIFICATE_NAME = "accompanyXiaomiAndroid";
+    public static final String XM_APP_ID = "2882303761519916917";
+    public static final String XM_APP_KEY = "5181991688917";
+    public static final String XM_CERTIFICATE_NAME = "yinyouxiaomi";
     /**
      * 魅族推送
      */
@@ -259,12 +259,12 @@ public class XChatConstants {
     /**
      * 华为推送
      */
-    public static final String HW_APP_ID = "102156739";
-    public static final String HW_CERTIFICATE_NAME = "accompanyHuawei";
+    public static final String HW_APP_ID = "104321113";
+    public static final String HW_CERTIFICATE_NAME = "yinyouhuawei";
     /**
      * vivo推送
      */
-    public static final String VIVO_CERTIFICATE_NAME = "accompanyVivo";
+    public static final String VIVO_CERTIFICATE_NAME = "yinyouvivo";
     /**
      * oppo推送
      */