lixing преди 4 години
родител
ревизия
d62e6b0878

+ 31 - 0
fm-common/src/main/java/com/persagy/fm/common/config/JacksonConfig.java

@@ -0,0 +1,31 @@
+package com.persagy.fm.common.config;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+import java.io.IOException;
+
+//@Configuration
+public class JacksonConfig {
+
+//    @Bean
+//    @Primary
+//    @ConditionalOnMissingBean(ObjectMapper.class)
+//    public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
+//        ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+//        objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
+//            @Override
+//            public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+//                jsonGenerator.writeString("");
+//            }
+//        });
+//        return objectMapper;
+//    }
+}

+ 17 - 4
fm-common/src/main/java/com/persagy/fm/common/constant/RegexConstants.java

@@ -28,20 +28,27 @@ public class RegexConstants {
      */
     private static final String NUM_REGEX = "[0-9]";
     /**
-     * 允许的特殊字符正则表达式
+     * 经常允许的特殊字符正则表达式
      */
     private static final String CHAR_REGEX = "['._#~]";
 
+    /**
+     * 所有允许的特殊字符正则表达式
+     */
+    private static final String ALL_CHAR_REGEX = "[!\"#\\$%&'\\(\\)\\*\\+,-\\.\\/:;<=>\\?@\\[\\\\\\]\\^\\\\`\\{\\|\\}~\\s]";
+
     private static final String EN_REGEX_EXPRESSION = LOWERCASE_REGEX + "|" + UPPERCASE_REGEX;
     private static final String EN_NUM_REGEX_EXPRESSION = EN_REGEX_EXPRESSION + "|" + NUM_REGEX;
     private static final String EN_NUM_CHAR_REGEX_EXPRESSION = EN_NUM_REGEX_EXPRESSION + "|" + CHAR_REGEX;
     private static final String NAME_REGEX_EXPRESSION = EN_NUM_CHAR_REGEX_EXPRESSION + "|" + CH_REGEX;
+    private static final String ALL_REGEX_EXPRESSION = EN_NUM_REGEX_EXPRESSION + "|" + CH_REGEX + "|" + ALL_CHAR_REGEX;
     private static final String TEXT_REGEX_EXPRESSION = CH_REGEX + "|" + EN_REGEX_EXPRESSION;
 
     /**
      * 允许的字符正则表达式报警信息
      */
     private static final String CHAR_REGEX_WARNING = " ' . _  #  ~  ";
+    private static final String ALL_CHAR_REGEX_WARNING = "空格和! \" # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \\ ] ^ _` { | } ~";
 
     /**
      * 名称正则表达式
@@ -56,15 +63,21 @@ public class RegexConstants {
     public static final String NAME_REGEX_WARNING = "仅可输入中文,字母,数字以及" + CHAR_REGEX_WARNING;
 
     /**
-     * 文本正则表达式
+     * 常用文本正则表达式
      * 支持中英文字符
      */
     public static final String TEXT_REGEX = "(" + TEXT_REGEX_EXPRESSION + ")+";
+    /**
+     * 所有允许的文本正则表达式
+     * 支持中英文字符
+     */
+    public static final String ALL_REGEX = "(" + ALL_REGEX_EXPRESSION + ")+";
 
     /**
      * 文本正则表达式报警信息
      */
     public static final String TEXT_REGEX_WARNING = "仅可输入中文,字母";
+    public static final String ALL_REGEX_WARNING = "仅可输入中文,字母,数字以及" + ALL_CHAR_REGEX_WARNING;
 
     /**
      * 英文正则表达式
@@ -106,7 +119,7 @@ public class RegexConstants {
     /**
      * 身份证非法提示
      */
-    public static final String ID_CARD_REGEX_WARNING = "身份证格式错误";
+    public static final String ID_CARD_REGEX_WARNING = "请输入正确身份证号";
 
     /**
      * 手机号正则表达式
@@ -117,5 +130,5 @@ public class RegexConstants {
     /**
      * 手机号非法提示
      */
-    public static final String PHONE_REGEX_WARNING = "手机号格式错误";
+    public static final String PHONE_REGEX_WARNING = "请输入正确手机号码";
 }