change test token & modify dns save and read logic

Author: YangSen-qn

Qiniu_Android.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Qiniu_Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="QiNiu_Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

library/src/androidTest/java/com/qiniu/android/TestConfig.java

@@ -10,16 +10,16 @@ public final class TestConfig {
     // TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
     //华东上传凭证
     public static final String bucket_z0 = "sdk-z0";
-    public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:fO65e-s-sRrcNiWkZ3qcrCLM3pM=:eyJzY29wZSI6InNkay16MCIsImRlYWRsaW5lIjoxNTk3MjAyMDYwfQ==";
+    public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:EhEVhvMUxV41FUXANl2YU4UES2I=:eyJzY29wZSI6InNkay16MCIsImRlYWRsaW5lIjoxNjA2NDU5OTg3fQ==";
     //华北上传凭证
     public static final String bucket_z1 = "sdk-z1";
-    public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:KHpcWxGAAut9zJjGaHEqEbjlf-c=:eyJzY29wZSI6InNkay16MSIsImRlYWRsaW5lIjoxNTk3MjAyMDgzfQ==";
+    public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:yOKL2sqzRSNiOb1bb5OeRonHQfI=:eyJzY29wZSI6InNkay16MSIsImRlYWRsaW5lIjoxNjA2NDYwMDA2fQ==";
     //华南上传凭证
     public static final String bucket_z2 = "sdk-z2";
-    public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:yt7nub2-FOkK2zwodXSgxinpboE=:eyJzY29wZSI6InNkay16MiIsImRlYWRsaW5lIjoxNTk3MjAyMTAwfQ==";
+    public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:VVB2X8hQYwGQnkNFUzn26kom1Qc=:eyJzY29wZSI6InNkay16MiIsImRlYWRsaW5lIjoxNjA2NDYwMDIyfQ==";
     //北美上传凭证
     public static final String bucket_na0 = "sdk-na0";
-    public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:J9AbA4jVl4BtsAFg9XooZaa2Iyk=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTU5NzIwMjExNX0=";
+    public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:b46IRIripBu1p2dV1VVBvqM9au4=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTYwNjQ2MDAzOH0=";
     public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
 
 

library/src/main/java/com/qiniu/android/http/DnsPrefetcher.java

@@ -357,7 +357,14 @@ public static boolean recoverCache(Configuration config) {
         if (data == null)
             return true;
 
-        DnsCacheInfo cacheInfo = (DnsCacheInfo) StringUtils.toObject(data);
+        DnsCacheInfo cacheInfo = null;
+        Object cacheInfoObject = StringUtils.toObject(data);
+        if (cacheInfoObject instanceof DnsCacheInfo){
+            cacheInfo = (DnsCacheInfo) StringUtils.toObject(data);
+        } else {
+            recorder.del(localIP);
+        }
+
         if (cacheInfo == null)
             return true;
 
@@ -411,7 +418,8 @@ public static void startPrefetchDns(String token, Configuration config) {
         }
         if (dnsPrefetcher != null) {
             ConcurrentHashMap<String, List<InetAddress>> concurrentHashMap = dnsPrefetcher.getConcurrentHashMap();
-            byte[] dnscache = StringUtils.toByteArray(concurrentHashMap);
+            dnsCacheInfo.info = concurrentHashMap;
+            byte[] dnscache = StringUtils.toByteArray(dnsCacheInfo);
             if (dnscache == null)
                 return;
             recorder.set(cacheKey, dnscache);