update

python/tools/garble/activity_garble.py

@@ -27,8 +27,7 @@ class ActivityGarble:
         "RecordFilesResponse.java",
         "TotalAmount.java",
         "UserBankInfo.java",
-        "YWUser.java",
-        "TDChannel.java"
+        "YWUser.java"
         ]
 
     used_names = []

python/tools/garble/package_garble.py

@@ -64,8 +64,10 @@ class PackageGarble:
                     while size > 0:
                         if mp_path not in self.pkg_mapping.keys():
                             self.pkg_mapping[mp_path] = random_str
+                        #添加一个结尾标识，避免有路径中间有重复的包名被替换
+                        mp_path += "**"
                         mp_path = mp_path.replace(
-                            ".%s" % mp_path.split(".")[size-1], "")
+                            ".%s**" % mp_path.split(".")[size-1], "")
                         random_str = random_str.replace(
                             ".%s" % random_str.split(".")[size-1], "")
                         size -= 1

src/main/java/tech/starwin/network/ServiceGenerator.java

@@ -32,8 +32,8 @@ public class ServiceGenerator {
                 .readTimeout(TIME_OUT, TimeUnit.SECONDS)
                 .addInterceptor(new DefaultHeaderAddInterceptor())
                 .addInterceptor(new FirebaseHeaderInterceptor())
-                .sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getTrustManager())
-                .hostnameVerifier(SSLSocketClient.getHostnameVerifier())
+//                .sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getTrustManager())
+//                .hostnameVerifier(SSLSocketClient.getHostnameVerifier())
                 .build();
 
     }