update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysTenantAccountServiceImpl.java

@@ -45,6 +45,9 @@ public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTen
 			tenantAccount.setUserId(userId);
 			tenantAccount.setCreateTime(date);
 			tenantAccount.setUpdateTime(date);
+			tenantAccount.setStatus(AccountStatus.NORMAL);
+			tenantAccount.setAvailableMinutes(0);
+			tenantAccount.setFrozenMinutes(0);
 			sysTenantAccountDao.insert(tenantAccount);
 		}
 

mec-common/common-core/pom.xml

@@ -61,5 +61,10 @@
 			<version>2.2.1.RELEASE</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.vdurmont</groupId>
+			<artifactId>emoji-java</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>

mec-common/common-core/src/main/java/com/ym/mec/common/config/LocalFastJsonHttpMessageConverter.java

@@ -2,6 +2,7 @@ package com.ym.mec.common.config;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -11,9 +12,12 @@ import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
 
+import com.alibaba.fastjson.serializer.JSONSerializer;
+import com.alibaba.fastjson.serializer.ObjectSerializer;
 import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer;
 import com.alibaba.fastjson.serializer.ValueFilter;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.vdurmont.emoji.EmojiParser;
 import com.ym.mec.common.enums.BaseEnum;
 import com.ym.mec.util.json.JsonUtil;
 
@@ -31,12 +35,22 @@ public class LocalFastJsonHttpMessageConverter extends FastJsonHttpMessageConver
 
 		OutputStream out = outputMessage.getBody();
 		JsonUtil.getConfig().put(Date.class, new SimpleDateFormatSerializer(FORMAT));
+		JsonUtil.getConfig().put(String.class, new EmojiSerializer());
 		String text = JsonUtil.toJSONString(obj, EnumFilter.instance, getFeatures());
 		byte[] bytes = text.getBytes(getCharset());
 		out.write(bytes);
 	}
 }
 
+class EmojiSerializer implements ObjectSerializer{
+
+	@Override
+	public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
+		serializer.write(EmojiParser.parseToUnicode(object.toString()));
+	}
+	
+}
+
 class EnumFilter implements ValueFilter {
 
 	public static EnumFilter instance = new EnumFilter();

mec-common/common-core/src/main/java/com/ym/mec/common/filters/EmojiEncodingFilter.java

@@ -0,0 +1,52 @@
+package com.ym.mec.common.filters;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.springframework.core.annotation.Order;
+
+import com.vdurmont.emoji.EmojiParser;
+
+@Order(1)
+//执行的顺序，值越小，越先执行
+@WebFilter(urlPatterns = "/*")
+public class EmojiEncodingFilter  implements Filter {
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		request = new HttpServletRequestWrapper((HttpServletRequest) request) {
+
+            @Override
+            public String getParameter(String name) {
+                // 参数名
+                // 返回值之前 先进行 Emoji 转化
+                return EmojiParser.parseToAliases(super.getParameter(name));
+            }
+
+            @Override
+            public String[] getParameterValues(String name) {
+                // 参数值
+                // 返回值之前 先进行 Emoji 转化
+                String[] values = super.getParameterValues(name);
+                if (values != null) {
+                    for (int i = 0; i < values.length; i++) {
+                        values[i] = EmojiParser.parseToAliases(values[i]);
+                    }
+                }
+                return values;
+            }
+
+        };
+
+        chain.doFilter(request, response);
+	}
+
+}

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -1,7 +1,6 @@
 package com.ym.mec.common.service.impl;
 
 import com.google.common.base.Strings;
-import com.timevale.tgtext.text.au;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.IdGeneratorService;
 

mec-task/pom.xml

@@ -26,11 +26,6 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>com.ym</groupId>
-			<artifactId>common-core</artifactId>
-		</dependency>
-
-		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
 		</dependency>

pom.xml

@@ -183,6 +183,12 @@
 				<version>${google.zxing.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>com.vdurmont</groupId>
+				<artifactId>emoji-java</artifactId>
+				<version>5.1.1</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>