From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-utils/src/main/java/com/java110/utils/util/Assert.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/Assert.java b/java110-utils/src/main/java/com/java110/utils/util/Assert.java
index 6c0ee8d..520b55d 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/Assert.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Assert.java
@@ -249,16 +249,17 @@
/**
* 妫�楠屾槸鍚﹀湪 infos 涓瓨鍦� flowComponent 瀵瑰簲缁勪欢鐨刱ey
+ *
* @param infos
* @param flowComponent
* @param key
* @param message
*/
- public static void hasKeyByFlowData(JSONArray infos, String flowComponent, String key, String message){
+ public static void hasKeyByFlowData(JSONArray infos, String flowComponent, String key, String message) {
- for(int infoIndex = 0 ; infoIndex < infos.size() ; infoIndex ++){
+ for (int infoIndex = 0; infoIndex < infos.size(); infoIndex++) {
JSONObject _info = infos.getJSONObject(infoIndex);
- if(_info.containsKey(flowComponent) && _info.getString("flowComponent").equals(flowComponent)){
+ if (_info.containsKey(flowComponent) && _info.getString("flowComponent").equals(flowComponent)) {
hasKeyAndValue(_info, key, message);
break;
}
@@ -307,4 +308,18 @@
}
+ /**
+ * 妫�楠屾槸鍚﹀湪 infos 涓瓨鍦� flowComponent 瀵瑰簲缁勪欢鐨刱ey
+ *
+ * @param key
+ * @param message
+ */
+ public static void isEmail(JSONObject info, String key, String message) {
+ hasKeyAndValue(info, key, message);
+ if (!ValidatorUtil.isEmail(info.getString(key))) {
+ throw new IllegalArgumentException(message);
+ }
+ }
+
+
}
--
Gitblit v1.8.0