Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -143,7 +143,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
 			SysUser sysUser = new SysUser();
 			sysUser.setPhone(phone);
-			sysUser.setRealName(phone);
+			sysUser.setRealName("老师" + phone.substring(phone.length() - 6));
 			sysUser.setUserType("TEACHER");
 			sysUserDao.insert(sysUser);
 			//添加用户现金账户
@@ -157,7 +157,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		}else if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
 			SysUser sysUser = new SysUser();
 			sysUser.setPhone(phone);
-			sysUser.setUsername(phone);
+			sysUser.setUsername("学生" + phone.substring(phone.length() - 6));
 			sysUser.setUserType("STUDENT");
 			sysUser.setOrganId(lesseeOrganId);
 			sysUserDao.insert(sysUser);

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

@@ -4,49 +4,55 @@ import java.io.IOException;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
 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 org.apache.commons.lang3.StringUtils;
 
 import com.vdurmont.emoji.EmojiParser;
 
-@Order(1)
-//执行的顺序，值越小，越先执行
-@WebFilter(urlPatterns = "/*")
-public class EmojiEncodingFilter  implements Filter {
+public class EmojiEncodingFilter implements Filter {
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		Filter.super.init(filterConfig);
+	}
 
 	@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);
+			@Override
+			public String getParameter(String name) {
+				// 参数名
+				String value = super.getParameter(name);
+				if (StringUtils.isNotBlank(value)) {
+					// 返回值之前 先进行 Emoji 转化
+					return EmojiParser.parseToAliases(value);
+				}
+				return value;
+			}
+
+			@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-student/src/main/java/com/ym/mec/student/StudentApplication.java

@@ -1,8 +1,11 @@
 package com.ym.mec.student;
 
+import javax.servlet.Filter;
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -13,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.client.RestTemplate;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.ym.mec.common.filters.EmojiEncodingFilter;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -34,4 +38,22 @@ public class StudentApplication {
 		return new RestTemplate();
 	}
 
+	/**
+	 * 注册filter
+	 * @return
+	 */
+	@Bean
+	public FilterRegistrationBean<Filter> filterRegistrationBean() {
+		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
+		// 注入过滤器
+		registration.setFilter(new EmojiEncodingFilter());
+		// 过滤器名称
+		registration.setName("emojiEncodingFilter");
+		// 拦截规则
+		registration.addUrlPatterns("/*");
+		// 过滤器顺序(值越小，优先级越高)
+		registration.setOrder(1);
+		return registration;
+	}
+
 }

mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

@@ -1,8 +1,11 @@
 package com.ym.mec.teacher;
 
+import javax.servlet.Filter;
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -13,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.client.RestTemplate;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.ym.mec.common.filters.EmojiEncodingFilter;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -23,7 +27,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @EnableSwagger2Doc
 @EnableAsync
 public class TeacherApplication {
-	
+
 	public static void main(String[] args) {
 		SpringApplication.run(TeacherApplication.class, args);
 	}
@@ -34,4 +38,21 @@ public class TeacherApplication {
 		return new RestTemplate();
 	}
 
+	/**
+	 * 注册filter
+	 * @return
+	 */
+	@Bean
+	public FilterRegistrationBean<Filter> filterRegistrationBean() {
+		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
+		// 注入过滤器
+		registration.setFilter(new EmojiEncodingFilter());
+		// 过滤器名称
+		registration.setName("emojiEncodingFilter");
+		// 拦截规则
+		registration.addUrlPatterns("/*");
+		// 过滤器顺序(值越小，优先级越高)
+		registration.setOrder(1);
+		return registration;
+	}
 }

mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -1,8 +1,11 @@
 package com.ym.mec.web;
 
+import javax.servlet.Filter;
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -13,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.client.RestTemplate;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.ym.mec.common.filters.EmojiEncodingFilter;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -33,4 +37,22 @@ public class WebApplication {
 	public RestTemplate restTemplate() {
 		return new RestTemplate();
 	}
+
+	/**
+	 * 注册filter
+	 * @return
+	 */
+	@Bean
+	public FilterRegistrationBean<Filter> filterRegistrationBean() {
+		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
+		// 注入过滤器
+		registration.setFilter(new EmojiEncodingFilter());
+		// 过滤器名称
+		registration.setName("emojiEncodingFilter");
+		// 拦截规则
+		registration.addUrlPatterns("/*");
+		// 过滤器顺序(值越小，优先级越高)
+		registration.setOrder(1);
+		return registration;
+	}
 }