Merge remote-tracking branch 'origin/dev' into test

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/StringUtil.java

@@ -447,10 +447,6 @@ public abstract class StringUtil {
 		sb.append(right(bankId, 4));
 		return sb.toString();
 	}
-	public static void main(String[] args) {
-		System.out.println(isEmail("123@qq.com"));
-	}
-
 
 
     public static boolean isBlank(CharSequence cs) {
@@ -598,4 +594,31 @@ public abstract class StringUtil {
 		}
 		return false;
 	}
+
+	public static void main(String[] args) {
+		System.out.println(isEmail("123@qq.com#$%^&*()"));
+
+		String regEx="[\n`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。， 、？]";
+
+		//可以在中括号内加上任何想要替换的字符，实际上是一个正则表达式
+
+		String aa = "";//这里是将特殊字符换为aa字符串," "代表直接去掉
+
+		Pattern p = Pattern.compile(regEx);
+
+		Matcher m = p.matcher("原字符串");//这里把想要替换的字符串传进来
+
+		String newString = m.replaceAll(aa).trim();
+		System.out.println("newString====="+newString);
+
+		//将替换后的字符串存在变量newString中
+
+		//方法二 如果第一种太麻烦可以直接用下面的
+
+		String str = "#$%^&*()我的正确#$%^&*()原字符串#$%^&*()";
+
+		String newString2 = str.replaceAll(regEx,aa).trim();//不想保留原来的字符串可以直接写成 “str = str.replaceAll(regEX,aa);”
+		System.out.println("newString2====="+newString2);
+
+	}
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -89,14 +89,14 @@ public class PayController {
         dragonPayBaseReqDto.setOpenId(openId);
         dragonPayBaseReqDto.setType(type);
         dragonPayBaseReqDto.setPrice(price);
-        if(StringUtil.isNotNull(name)&&name.length()>=32){
-            name = name.substring(0,32);
-        }
-        dragonPayBaseReqDto.setName(name);
-        if(StringUtil.isNotNull(detail)&&detail.length()>=64){
-            detail = detail.substring(0,64);
-        }
-        dragonPayBaseReqDto.setDetail(detail);
+//        if(StringUtil.isNotNull(name)&&name.length()>=32){
+//            name = name.substring(0,32);
+//        }
+        dragonPayBaseReqDto.setName("正在现场");
+//        if(StringUtil.isNotNull(detail)&&detail.length()>=64){
+//            detail = detail.substring(0,64);
+//        }
+        dragonPayBaseReqDto.setDetail("正在现场");
         dragonPayBaseReqDto.setOrderCode(orderCode);
         dragonPayBaseReqDto.setClientIp(clientIp);
         dragonPayBaseReqDto.setNotifyUrl(notifyUrl);