From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java
index e44614e..67c3a1b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java
@@ -38,6 +38,9 @@
String appVersion = null;
if (listVersion != null && listVersion.size() > 0) {
appVersion = getCanPushVersions(minVersionCode, listVersion);
+ if (appVersion == null || appVersion.trim().length() ==0) {
+ throw new PushException(1, "灏忕背鎺ㄩ�佸け璐ワ紝鎺ㄩ�佺殑鐗堟湰杩囦綆锛�");
+ }
} else if (minVersionCode > 0) {
appVersion = getVersionByMinVersionCode(minVersionCode);
}
@@ -84,6 +87,9 @@
String appVersion = null;
if (listVersion != null && listVersion.size() > 0) {
appVersion = getCanPushVersions(minVersionCode, listVersion);
+ if (appVersion == null || appVersion.trim().length() ==0) {
+ throw new PushException(1, "灏忕背鎺ㄩ�佸け璐ワ紝鎺ㄩ�佺殑鐗堟湰杩囦綆锛�");
+ }
} else if (minVersionCode > 0) {
appVersion = getVersionByMinVersionCode(minVersionCode);
}
@@ -133,6 +139,9 @@
String appVersion = null;
if (listVersion != null && listVersion.size() > 0) {
appVersion = getCanPushVersions(minVersionCode, listVersion);
+ if (appVersion == null || appVersion.trim().length() == 0) {
+ throw new PushException(1, "灏忕背鎺ㄩ�佸け璐ワ紝鎺ㄩ�佺殑鐗堟湰杩囦綆锛�");
+ }
} else if (minVersionCode > 0) {
appVersion = getVersionByMinVersionCode(minVersionCode);
}
@@ -216,6 +225,9 @@
String appVersion = null;
if (listVersion != null && listVersion.size() > 0) {
appVersion = getCanPushVersions(minVersionCode, listVersion);
+ if (appVersion == null || appVersion.trim().length() == 0) {
+ throw new PushException(1, "灏忕背鎺ㄩ�佸け璐ワ紝鎺ㄩ�佺殑鐗堟湰涓嶈兘浣庝簬1.4.8");
+ }
} else if (minVersionCode > 0) {
appVersion = getVersionByMinVersionCode(minVersionCode);
}
@@ -273,7 +285,7 @@
* @param listVersion
* @return
*/
- private String getCanPushVersions(int versionCode, List<String> listVersion) {
+ private String getCanPushVersions(int versionCode, List<String> listVersion) throws PushException{
List<AppVersionInfo> list = appVersionService.listByVersions(AppVersionInfo.PLATFORM_ANDROID, listVersion);
String versions = "";
@@ -284,6 +296,8 @@
versions += appVersion.getVersion() + ",";
}
}
+ } else {
+ throw new PushException(1, "鎺ㄩ�佺殑鐗堟湰涓嶅瓨鍦紝璇锋牳瀹炵増鏈俊鎭�");
}
if (versions.endsWith(",")) {
@@ -301,6 +315,10 @@
String appVersion = null;
if (listVersion != null && listVersion.size() > 0) {
appVersion = getCanPushVersions(minVersionCode, listVersion);
+ if (appVersion == null || appVersion.trim().length() ==0) {
+ throw new PushException(1, "灏忕背鎺ㄩ�佸け璐ワ紝鎺ㄩ�佺殑鐗堟湰涓嶈兘浣庝簬1.4.8");
+ }
+
} else if (minVersionCode > 0){
appVersion = getVersionByMinVersionCode(minVersionCode);
}
@@ -344,6 +362,9 @@
String appVersion = null;
if (listVersion != null && listVersion.size() > 0) {
appVersion = getCanPushVersions(minVersionCode, listVersion);
+ if (appVersion == null || appVersion.trim().length() ==0) {
+ throw new PushException(1, "灏忕背鎺ㄩ�佸け璐ワ紝鎺ㄩ�佺殑鐗堟湰涓嶈兘浣庝簬1.5.1");
+ }
} else if (minVersionCode > 0){
appVersion = getVersionByMinVersionCode(minVersionCode);
}
--
Gitblit v1.8.0