common 1.7.5

sobot_common/sobot-common-publish-mavencentral.gradle

@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
     PUBLISH_ARTIFACT_ID = 'sobotcommon_x'            //项目名
-    PUBLISH_VERSION = '1.7.4'                    //版本号
+    PUBLISH_VERSION = '1.7.5'                    //版本号
 }
 
 

sobot_common/src/main/java/com/sobot/common/login/SobotLoginTools.java

@@ -224,10 +224,12 @@ public class SobotLoginTools {
             }
             return;
         }
-        final Map<String, Object> params = new HashMap<>();
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("from", "2");
+        Map<String, Object> params = new HashMap<>();
         params.put("loginUser", loginAcount);
         params.put("loginPwd", loginPwd);
-        SobotHttpUtils.doPost(cancelTag, host + "/basic-login/serviceAppLogin/4", 8000, params, null, new HttpBaseUtils.StringCallBack() {
+        SobotHttpUtils.doPost(cancelTag, host + "/basic-login/serviceAppLogin/4", 8000, params, headerMap, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String response) {
                 SobotCallBaseCode result = SobotGsonUtil.jsonToBean(response, SobotCallBaseCode.class);
@@ -362,8 +364,10 @@ public class SobotLoginTools {
         tokebMap.put("appid", appId);
         tokebMap.put("create_time", nowMills);
         tokebMap.put("sign", SobotMD5Util.encode(appId + nowMills + appkey));
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("from", "2");
         //获取 公司token
-        SobotHttpUtils.doGet(cancelTag, openApiHost.replace("/text", "") + "/api/get_token", 8000, tokebMap, null, new HttpBaseUtils.StringCallBack() {
+        SobotHttpUtils.doGet(cancelTag, openApiHost.replace("/text", "") + "/api/get_token", 8000, tokebMap, headerMap, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String response) {
                 TokenModel result = SobotGsonUtil.jsonToBean(response, TokenModel.class);
@@ -371,6 +375,7 @@ public class SobotLoginTools {
                     String ctoken = result.getItem().getToken();
                     Map<String, String> headerMap = new HashMap<>();
                     headerMap.put("token", ctoken);
+                    headerMap.put("from", "2");
                     Map<String, Object> params = new HashMap<>();
                     params.put("agent_email", loginAcount);
                     //获取 个人座席token
@@ -523,6 +528,7 @@ public class SobotLoginTools {
         }
         Map<String, String> headerMap = new HashMap<>();
         headerMap.put("token", token);
+        headerMap.put("from", "2");
         Map<String, Object> params = new HashMap<>();
         params.put("agent_email", loginAcount);
         //获取 个人座席token
@@ -644,7 +650,7 @@ public class SobotLoginTools {
         params.put("loginUser", loginAcount);
         Map<String, String> headerParams = new HashMap<>();
         headerParams.put("temp-id", getToken());
-        headerParams.put("from", 2 + "");
+        headerParams.put("from", "2");
         SobotHttpUtils.doPost(cancelTag, host + "/basic-login/serviceLogOut/4", 8000, params, headerParams, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String response) {
@@ -685,9 +691,9 @@ public class SobotLoginTools {
      * @param token
      * @param resultBlock
      */
-    public void getuserEntityInfo(final Object cancelTag, final Context mContext,
-                                  final String host, String token, String language, final SobotResultBlock resultBlock) {
-        final String url = host + "/basic-config-service/consoleAuth/queryAppAgentMenus";
+    public void getuserEntityInfo(Object cancelTag, Context mContext,
+                                  String host, String token, String language, final SobotResultBlock resultBlock) {
+        String url = host + "/basic-config-service/consoleAuth/queryAppAgentMenus";
         Map<String, String> headerMap = new HashMap<>();
         if (!SobotStringUtils.isEmpty(token)) {
             headerMap.put("temp-id", token);
@@ -695,6 +701,7 @@ public class SobotLoginTools {
         if (!SobotStringUtils.isEmpty(language)) {
             headerMap.put("language", language);
         }
+        headerMap.put("from", "2");
         SobotHttpUtils.doGet(cancelTag, url, null, headerMap, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String result) {
@@ -796,6 +803,7 @@ public class SobotLoginTools {
         if (!SobotStringUtils.isEmpty(token)) {
             headerMap.put("temp-id", token);
         }
+        headerMap.put("from", "2");
         SobotHttpUtils.doPost(cancelTag, host + "/tokens/getToken", null, headerMap, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String result) {
@@ -834,12 +842,13 @@ public class SobotLoginTools {
 
 
     // 如果是智齿客服APP 或者客服SDK 并且有对话模块，需要请求在线逻辑接口
-    public void doOnline(final Object cancelTag, final Context context, final String host, Map<String, Object> params, final SobotServiceInfoModel infoModel, final SobotResultBlock resultBlock) {
+    public void doOnline(Object cancelTag, final Context context, String host, Map<String, Object> params, final SobotServiceInfoModel infoModel, final SobotResultBlock resultBlock) {
         if (infoModel != null) {
-            Map<String, String> headers = new HashMap<>();
-            headers.put("token", SobotStringUtils.checkStringIsNull(infoModel.getToken()));
-            headers.put("language", SobotStringUtils.checkStringIsNull(infoModel.getServiceLanguage()));
-            SobotHttpUtils.doPost(cancelTag, host + "/chat-sdk/sdk/admin/v1/appLogin", 8000, params, headers, new HttpBaseUtils.StringCallBack() {
+            Map<String, String> headerMap = new HashMap<>();
+            headerMap.put("token", SobotStringUtils.checkStringIsNull(infoModel.getToken()));
+            headerMap.put("language", SobotStringUtils.checkStringIsNull(infoModel.getServiceLanguage()));
+            headerMap.put("from", "2");
+            SobotHttpUtils.doPost(cancelTag, host + "/chat-sdk/sdk/admin/v1/appLogin", 8000, params, headerMap, new HttpBaseUtils.StringCallBack() {
                 @Override
                 public void onResponse(String result) {
                     if (!SobotStringUtils.isEmpty(result)) {