From b284ec4a84d5053d356cb889f67cf06bb9a3c576 Mon Sep 17 00:00:00 2001
From: yexuejc <1107047387@qq.com>
Date: Thu, 31 May 2018 23:24:09 +0800
Subject: [PATCH] =?UTF-8?q?1.1.3=20=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=88=99Reg?=
 =?UTF-8?q?exUtils.java=20=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=88=99StrUtil.java?=
 =?UTF-8?q?->=E6=89=A9=E5=B1=95genUUID()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UPDATE.md                                     |  8 +++
 pom.xml                                       |  2 +-
 .../java/com/yexuejc/base/pojo/ApiVO.java     |  3 ++
 .../yexuejc/base/util/ExcelImportUtils.java   |  1 +
 .../com/yexuejc/base/util/RegexUtils.java     | 50 +++++++++++++++++++
 .../java/com/yexuejc/base/util/StrUtil.java   | 25 +++++++++-
 6 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index f3e9149..b771b65 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,14 @@
 yexuejc-base 更新记录
 ------------------
 
+#### version ：1.1.3
+**time：** <br/>
+**branch：** master    <br/>
+**update：**     <br/>
+>1.修改正则RegexUtils.java
+>1.修改正则StrUtil.java->扩展genUUID()
+
+#
 #### version ：1.1.2
 **time：** 2018-5-16 15:03:28<br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index 9204f47..980d2f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.yexuejc.base</groupId>
     <artifactId>yexuejc-base</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
 
     <name>${project.artifactId}</name>
 
diff --git a/src/main/java/com/yexuejc/base/pojo/ApiVO.java b/src/main/java/com/yexuejc/base/pojo/ApiVO.java
index 4b5db30..0ac5051 100644
--- a/src/main/java/com/yexuejc/base/pojo/ApiVO.java
+++ b/src/main/java/com/yexuejc/base/pojo/ApiVO.java
@@ -18,6 +18,9 @@ public class ApiVO implements Serializable {
     public ApiVO() {
     }
 
+    public ApiVO(STATUS status) {
+        this.status = status;
+    }
     public ApiVO(STATUS status, String code, String msg) {
         this.status = status;
         this.code = code;
diff --git a/src/main/java/com/yexuejc/base/util/ExcelImportUtils.java b/src/main/java/com/yexuejc/base/util/ExcelImportUtils.java
index 739c103..ecd599a 100644
--- a/src/main/java/com/yexuejc/base/util/ExcelImportUtils.java
+++ b/src/main/java/com/yexuejc/base/util/ExcelImportUtils.java
@@ -2,6 +2,7 @@ package com.yexuejc.base.util;
 
 /**
  * excel 格式验证工具
+ *
  * @ClassName: ExcelImportUtils
  * @Description:
  * @author: maxf
diff --git a/src/main/java/com/yexuejc/base/util/RegexUtils.java b/src/main/java/com/yexuejc/base/util/RegexUtils.java
index 81d2cca..137e1b8 100644
--- a/src/main/java/com/yexuejc/base/util/RegexUtils.java
+++ b/src/main/java/com/yexuejc/base/util/RegexUtils.java
@@ -32,6 +32,56 @@ public class RegexUtils {
      * cvn2：3位数字
      */
     public static final String REGEX_NUM3 = "^$|^\\d{3}$";
+    /**
+     * ID用 正则表达式(32位 16进制小写编码)
+     */
+    public static final String REGEX_ID = "^$|^[a-f0-9]{32}$";
+    /**
+     * 手机用 正则表达式(首位为1,共11位数字)
+     */
+    public static final String REGEX_MOBILE = "^$|^1\\d{10}$";
+    /**
+     * 验证是否是Json数据 正则表达式(首尾是{})
+     */
+    public static final String REGEX_JSON = "^$|^\\{.*\\}$";
+    /**
+     * 验证预约日期时间 正则表达式(精确到半小时)
+     */
+    public static final String REGEX_DATE_APPOINTMENT = "^$|^\\d{4}-[01]\\d-[0-3]\\d [0-2]\\d:(0|3)0$";
+    /**
+     * 日期 正则表达式
+     */
+    public static final String REGEX_DATE = "^$|^\\d{4}-[01]\\d-[0-3]\\d$";
+
+    /**
+     * 6位数字
+     */
+    public static final String REGEX_NUM6 = "^$|^\\d{6}$";
+    /**
+     * 两位以内正整数
+     */
+    public static final String REGEX_PINT2 = "^$|^[1-9]\\d{0,1}$";
+    /**
+     * 五位以内正整数
+     */
+    public static final String REGEX_PINT5 = "^$|^[1-9]\\d{0,4}$";
+    /**
+     * 十位以内正整数
+     */
+    public static final String REGEX_PINT10 = "^$|^[1-9]\\d{0,9}$";
+    /**
+     * 十位以内正整或0
+     */
+    public static final String REGEX_INT10 = "^$|^[1-9]\\d{0,9}$|^0$";
+    /**
+     * 可有8位整数,2位小数
+     */
+    public static final String REGEX_PFLOAT10_2 = "^$|^(\\d\\.\\d{1})|([1-9]\\d{0,7}(\\.\\d{1,2})?)$";
+
+    /**
+     * STS RoleSessionName
+     */
+    public static final String REGEX_STS_ROLE_SESSION_NAME = "^[a-zA-Z0-9\\.@\\-_]+$";
 
     /**
      * 正则：入参验证
diff --git a/src/main/java/com/yexuejc/base/util/StrUtil.java b/src/main/java/com/yexuejc/base/util/StrUtil.java
index 84caefc..ab22cfe 100644
--- a/src/main/java/com/yexuejc/base/util/StrUtil.java
+++ b/src/main/java/com/yexuejc/base/util/StrUtil.java
@@ -57,7 +57,7 @@ public final class StrUtil {
     }
 
     /**
-     * 生成UUID
+     * 生成32位UUID
      *
      * @return
      */
@@ -65,6 +65,29 @@ public final class StrUtil {
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
 
+    /**
+     * 生成指定位数UUID
+     *
+     * @param length
+     * @return
+     */
+    public static String genUUID(int length) {
+        if (length <= 32) {
+            return genUUID().substring(0, length);
+        } else if (length < 1) {
+            return "";
+        } else {
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i < length / 32; i++) {
+                sb.append(genUUID());
+            }
+            if (length % 32 > 0) {
+                sb.append(genUUID().substring(0, length % 32));
+            }
+            return sb.toString();
+        }
+    }
+
     /**
      * 生成11位编号，可以用作订单号，有很小几率出现重复，需要做异常处理<br/>
      * 左边第一位为正负标识：正数1 负数0<br/>