From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播

---
 src/main/java/com/yeshi/buwan/util/StringUtil.java |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/util/StringUtil.java b/src/main/java/com/yeshi/buwan/util/StringUtil.java
index 0e954ad..cb8e1e7 100644
--- a/src/main/java/com/yeshi/buwan/util/StringUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/StringUtil.java
@@ -5,9 +5,13 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -15,14 +19,9 @@
 import javax.persistence.Entity;
 import javax.servlet.http.HttpServletRequest;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.google.gson.*;
 
+import com.yeshi.buwan.domain.vip.VIPPriceType;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
 
@@ -40,9 +39,7 @@
         Matcher m = p.matcher(mobile);
 
         if (mobile == null || mobile.equals("") || mobile.length() != 11) {
-
             return false;
-
         } else {
             return m.find();
         }
@@ -60,6 +57,18 @@
         String st = "";
         for (int i = 0; i < srcList.size(); i++) {
             st += srcList.get(i) + seperate;
+        }
+        if (st.endsWith(seperate)) {
+            st = st.substring(0, st.length() - seperate.length());
+        }
+        return st;
+    }
+
+
+    public static String join(Collection srcList, String seperate) {
+        String st = "";
+        for (Iterator<String> its = srcList.iterator(); its.hasNext(); ) {
+            st += its.next() + seperate;
         }
         if (st.endsWith(seperate)) {
             st = st.substring(0, st.length() - seperate.length());
@@ -88,9 +97,13 @@
      * @return
      */
     public static String getVerifyCode() {
+        return getNumberVerifyCode(6);
+    }
+
+    public static String getNumberVerifyCode(int number) {
         String sts = "0123456789";
         String code = "";
-        for (int i = 0; i < 6; i++) {
+        for (int i = 0; i < number; i++) {
             int p = (int) (Math.random() * 10);
             code += sts.charAt(p);
         }
@@ -174,7 +187,16 @@
             return o.toString();
         } else {
             Gson gson = new GsonBuilder().enableComplexMapKeySerialization().excludeFieldsWithoutExposeAnnotation()
-                    .setDateFormat(DateFormat.LONG).setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)// 浼氭妸瀛楁棣栧瓧姣嶅ぇ鍐�
+                    .setDateFormat(DateFormat.LONG).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+                        @Override
+                        public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+                            if (value == null) {
+                                return new JsonPrimitive("0");
+                            } else {
+                                return new JsonPrimitive(value.getTime());
+                            }
+                        }
+                    }).setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)// 浼氭妸瀛楁棣栧瓧姣嶅ぇ鍐�
                     .setPrettyPrinting().setVersion(1.0).create();
             String st = gson.toJson(o);
             return Utils.JsonFilter(st);

--
Gitblit v1.8.0