Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -1112,17 +1112,21 @@ public class RetailAppServiceImp implements RetailAppService {
         Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
         String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
         int update_type = 0;// 0:不更新 1：更新 2：强制更新
-        String versionInt = version.replace(".", "");
-        String newAppVersionInt = newAppVersion.replace(".", "");
-        if (Integer.valueOf(versionInt) < Integer.valueOf(newAppVersionInt)) {
-            update_type = 1;
-            if (isUpdate) {
-                update_type = 2;
+        String [] oldVersion = version.split("\\.");
+        String [] newVersion = newAppVersion.split("\\.");
+        JSONObject res = new JSONObject();
+        res.put("update_content", updateContent);
+        for (int i = 0; i < newVersion.length; i++) {
+            if(Integer.valueOf(newVersion[i])>Integer.valueOf(oldVersion[i])){
+                update_type = 1;
+                if (isUpdate) {
+                    update_type = 2;
+                }
+                res.put("update_type", update_type);
+                return res;
             }
         }
-        JSONObject res = new JSONObject();
         res.put("update_type", update_type);
-        res.put("update_content", updateContent);
         return res;
     }
 
@@ -1428,4 +1432,5 @@ public class RetailAppServiceImp implements RetailAppService {
         }
         return sourceStr;
     }
+
 }

src/main/resources/application.properties

@@ -18,8 +18,8 @@ spring.datasource.max-idle=150
 spring.datasource.max-wait=3000
 spring.datasource.filters=stat,wall,log4j
 
-spring.redis.host=192.168.99.100
-spring.redis.port=32768
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
 spring.redis.database=1
 
 mybatis.autosql.default-dialect=mysql