Bläddra i källkod

提交人员服务代码

lixing 4 år sedan
förälder
incheckning
efe56fa25c

+ 8 - 1
fm-common/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-common</artifactId>
-
+    <version>3.0.2</version>
     <dependencies>
         <!-- 集成框架工具类 -->
         <dependency>
@@ -67,5 +67,12 @@
             <groupId>com.persagy</groupId>
             <artifactId>integrated-redis-spring-boot-starter</artifactId>
         </dependency>
+
+        <!-- 拼音库 -->
+        <dependency>
+            <groupId>io.github.biezhi</groupId>
+            <artifactId>TinyPinyin</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
     </dependencies>
 </project>

+ 97 - 3
fm-common/src/main/java/com/persagy/fm/common/constant/RegexConstants.java

@@ -8,12 +8,106 @@ package com.persagy.fm.common.constant;
  **/
 public class RegexConstants {
     /**
+     * 中文正则表达式
+     */
+    public static final String CH_REGEX = "[\u4e00-\u9fa5]";
+    /**
+     * 小写字母正则表达式
+     */
+    public static final String LOWERCASE_REGEX = "[a-z]";
+    /**
+     * 大写字母正则表达式
+     */
+    public static final String UPPERCASE_REGEX = "[A-Z]";
+
+    /**
+     * 数字正则表达式
+     */
+    public static final String NUM_REGEX = "[0-9]";
+    /**
+     * 允许的字符正则表达式
+     */
+    public static final String CHAR_REGEX = "['._#~]";
+
+    public static final String EN_REGEX_EXPRESSION = LOWERCASE_REGEX + "|" + UPPERCASE_REGEX;
+    public static final String EN_NUM_REGEX_EXPRESSION = EN_REGEX_EXPRESSION + "|" + NUM_REGEX;
+    public static final String EN_NUM_CHAR_REGEX_EXPRESSION = EN_NUM_REGEX_EXPRESSION + "|" + CHAR_REGEX;
+    public static final String NAME_REGEX_EXPRESSION = EN_NUM_CHAR_REGEX_EXPRESSION + "|" + CH_REGEX;
+    public static final String TEXT_REGEX_EXPRESSION = CH_REGEX + "|" + EN_REGEX_EXPRESSION;
+
+    /**
+     * 允许的字符正则表达式报警信息
+     */
+    private static final String CHAR_REGEX_WARNING = " ' . _  #  ~  ";
+
+    /**
      * 名称正则表达式
      * 支持中英文字符,数字,"._#~"
      */
-    public static final String NAME_REGEX = "([\u4e00-\u9fa5]|[a-z]|[A-Z]|[0-9]|['._#~])+";
+    public static final String NAME_REGEX = "(" + NAME_REGEX_EXPRESSION + ")+";
+
+
+    /**
+     * 名称正则表达式报警信息
+     */
+    public static final String NAME_REGEX_WARNING = "仅可输入中文,字母,数字以及" + CHAR_REGEX_WARNING;
+
+    /**
+     * 文本正则表达式
+     * 支持中英文字符
+     */
+    public static final String TEXT_REGEX = "(" + TEXT_REGEX_EXPRESSION + ")+";
+
+    /**
+     * 文本正则表达式报警信息
+     */
+    public static final String TEXT_REGEX_WARNING = "仅可输入中文,字母";
+
+    /**
+     * 英文正则表达式
+     * 支持数字和字母
+     */
+    public static final String EN_NUM_REGEX = "(" + EN_NUM_REGEX_EXPRESSION + ")+";
+    ;
+    /**
+     * 英文正则表达式报警信息
+     */
+    public static final String EN_NUM_REGEX_WARNING = "仅可输入字母,数字";
+
+    /**
+     * 英文、数字、字符正则表达式
+     * 支持数字,字母,"._#~"
+     */
+    public static final String EN_NUM_CHAR_REGEX = "(" + EN_NUM_CHAR_REGEX_EXPRESSION + ")+";
+    /**
+     * 英文、数字、字符正则表达式报警信息
+     */
+    public static final String EN_NUM_CHAR_REGEX_WARNING = "仅可输入字母,数字以及" + CHAR_REGEX_WARNING;
+
+    /**
+     * 邮箱格式非法提示
+     */
+    public static final String EMAIL_REGEX_WARNING = "邮箱格式错误";
+
+    /**
+     * 身份证正则表达式
+     */
+    public static final String ID_CARD_REGEX = "( ^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|" +
+            "(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$)|" +
+            "(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{2}$)";
+
+    /**
+     * 身份证非法提示
+     */
+    public static final String ID_CARD_REGEX_WARNING = "身份证格式错误";
+
+    /**
+     * 手机号正则表达式
+     */
+    public static final String PHONE_REGEX = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\\d{8}$";
+
     /**
-     * 名称不符合正则表达式时的报警信息
+     * 手机号非法提示
      */
-    public static final String NAME_REGEX_WARNING = "仅可输入中文,字母,数字以及 ' . - _  #  ~";
+    public static final String PHONE_REGEX_WARNING = "手机号格式错误";
 }

+ 3 - 3
fm-common/src/main/java/com/persagy/fm/common/response/FmResponseUtil.java

@@ -19,16 +19,16 @@ public class FmResponseUtil {
         return successContent(content, content.size());
     }
 
-    public static <T> FmResponseContent successContent(IPage page) {
+    public static <T> FmResponseContent<List<T>> successContent(IPage<T> page) {
         return successContent(page.getRecords(),Long.valueOf(page.getTotal()).intValue());
     }
 
     public static <T extends List> FmResponseContent<T> successContent(T content, Integer count) {
-        return new FmResponseContent(ResponseCode.A00000.getCode(), content, count);
+        return new FmResponseContent<T>(ResponseCode.A00000.getCode(), content, count);
     }
 
     public static <T> FmResponseItem<T> successItem(T object) {
-        return new FmResponseItem(ResponseCode.A00000.getCode(), object);
+        return new FmResponseItem<T>(ResponseCode.A00000.getCode(), object);
     }
 
     public static FmResponseMsg successMsg(String resultMsg) {

+ 1 - 1
fm-server/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-server</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <dependencies>
         <!-- 集成框架工具类 -->
         <dependency>

+ 3 - 1
fm-server/src/main/java/com/persagy/ServerApplication.java

@@ -1,5 +1,6 @@
 package com.persagy;
 
+import cn.hutool.extra.spring.EnableSpringUtil;
 import com.persagy.log.annotation.EnableControllerLog;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.Banner;
@@ -19,13 +20,14 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @version 1.0 2021-03-02
  */
 @EnableCaching(proxyTargetClass = true)
-@EnableFeignClients(basePackages="com.persagy.fm.*.client")
+@EnableFeignClients(basePackages="com.persagy.fm.**.client")
 @EnableControllerLog
 @EnableDiscoveryClient
 @Configuration
 @EnableScheduling
 @SpringBootApplication(exclude = AopAutoConfiguration.class)
 @MapperScan(value = "com.persagy.fm.*.dao")
+@EnableSpringUtil
 public class ServerApplication {
 
     public static void main(String[] args) {