企业 gk 带下划线导致 host 不合法的问题

Author: aaron

app/build.gradle

@@ -71,7 +71,7 @@ android {
             dimension "mode"
             applicationId "net.coding.program.enterprise"
             versionCode 298
-            versionName "2.9.8.20190221.1"
+            versionName "2.9.9.20190225.1"
             targetSdkVersion 21
 
             // 信鸽依赖

app/src/enterprise/java/net/coding/program/EnterpriseApp.java

@@ -47,9 +47,9 @@ public static void setHost(@NonNull String enterpriseName) {
         AccountInfo.CustomHost customHost = AccountInfo.getCustomHost(GlobalData.getInstance());
         if (customHost.getHost().equalsIgnoreCase("s")) {
             if (TextUtils.isEmpty(enterpriseName)) {
-                host = "http://e.coding.e.codingprod.net";
+                host = "http://e.coding.codingprod.net";
             } else {
-                host = String.format("http://%s.coding.e.codingprod.net", enterpriseName);
+                host = String.format("http://%s.coding.codingprod.net", enterpriseName);
             }
         } else {
             if (enterpriseName.isEmpty()) {
@@ -64,6 +64,13 @@ public static void setHost(@NonNull String enterpriseName) {
 //        host = "http://codingcorp.coding.com";
         Global.HOST = host;
         Global.HOST_API = Global.HOST + "/api";
+
+        if (enterpriseName.contains("_")) {
+            int start = host.indexOf("://") + "://".length();
+            int end = host.indexOf(".");
+            Global.HOST = Global.HOST.substring(0, start) + "e" + Global.HOST.substring(end, Global.HOST.length());
+            Global.HOST_API = Global.HOST + "/api";
+        }
     }
 
     private static void initPrivateHost(Context context) {

common-coding/src/main/java/net/coding/program/common/GlobalData.java

@@ -31,11 +31,24 @@ public static String transformEnterpriseUri(String uri) {
         if (uri.startsWith("/p/")) {
             uri = String.format("/u/%s%s", getEnterpriseGK(), uri);
         } else {
-            final String projectUrl = (Global.HOST + "/p/").toLowerCase();
-            if (uri.toLowerCase().startsWith(projectUrl)) {
-                int pathStart = Global.HOST.length();
-                String uriPath = uri.substring(pathStart, uri.length());
-                uri = String.format("/u/%s%s", getEnterpriseGK(), uriPath);
+            String enterpriseGK = GlobalData.getEnterpriseGK();
+            if (enterpriseGK.contains("_")) {
+                int start = Global.HOST.indexOf("://") + "://".length();
+                int end = Global.HOST.indexOf(".");
+                final String underlineHost = Global.HOST.substring(0, start)
+                        + GlobalData.getEnterpriseGK()
+                        + Global.HOST.substring(end, Global.HOST.length());
+                final String projectUrl = (underlineHost + "/p/").toLowerCase();
+                if (uri.toLowerCase().startsWith(projectUrl)) {
+                    String uriPath = uri.substring(underlineHost.length(), uri.length());
+                    uri = String.format("/u/%s%s", getEnterpriseGK(), uriPath);
+                }
+            } else {
+                final String projectUrl = (Global.HOST + "/p/").toLowerCase();
+                if (uri.toLowerCase().startsWith(projectUrl)) {
+                    String uriPath = uri.substring(Global.HOST.length(), uri.length());
+                    uri = String.format("/u/%s%s", getEnterpriseGK(), uriPath);
+                }
             }
         }
 

common-coding/src/main/java/net/coding/program/common/network/MyAsyncHttpClient.java

@@ -11,6 +11,7 @@
 import com.loopj.android.http.ResponseHandlerInterface;
 
 import net.coding.program.common.Global;
+import net.coding.program.common.GlobalData;
 import net.coding.program.common.model.AccountInfo;
 import net.coding.program.common.model.RequestData;
 import net.coding.program.common.util.LogUtils;
@@ -118,6 +119,11 @@ public static AsyncHttpClient createClient(Context context) {
             client.addHeader(item, mapHeaders.get(item));
         }
 
+        String enterpriseGK = GlobalData.getEnterpriseGK();
+        if (enterpriseGK.contains("_")) {
+            client.addHeader("Wxapp-Enterprise", enterpriseGK);
+        }
+
         // 防止 CSRF
         for (int i = 0; i < cookies.size(); i++) {
             Cookie eachCookie = cookies.get(i);

common-coding/src/main/java/net/coding/program/network/Network.java

@@ -5,6 +5,7 @@
 import com.loopj.android.http.PersistentCookieStore;
 
 import net.coding.program.common.Global;
+import net.coding.program.common.GlobalData;
 import net.coding.program.common.network.MyAsyncHttpClient;
 import net.coding.program.common.widget.CommonListView;
 
@@ -123,6 +124,11 @@ public static CodingRequest getRetrofit(Context context, CacheType cacheType, Co
                     builder.addHeader("Referer", Global.HOST);
                 }
 
+                String enterpriseGK = GlobalData.getEnterpriseGK();
+                if (enterpriseGK.contains("_")) {
+                    builder.addHeader("Wxapp-Enterprise", enterpriseGK);
+                }
+
                 request = builder.build();
             }