Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow into zouxuan

cooleshow-api/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cooleshow</artifactId>
+        <groupId>com.yonge.cooleshow</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cooleshow-api</artifactId>
+    <version>1.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+    </dependencies>
+</project>

cooleshow-auth/auth-api/pom.xml

@@ -12,10 +12,11 @@
 	<artifactId>auth-api</artifactId>
 	<version>1.0</version>
 	<name>auth-api</name>
-	<url>http://maven.apache.org</url>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.spring4all</groupId>
@@ -23,8 +24,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
+			<groupId>com.yonge.toolset</groupId>
+			<artifactId>toolset-feign</artifactId>
+			<version>1.0</version>
 		</dependency>
 
 		<dependency>

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/AuthTaskFeignService.java

@@ -1,10 +1,10 @@
 package com.yonge.cooleshow.auth.api.client;
 
+import com.yonge.toolset.feign.config.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import com.yonge.cooleshow.auth.api.client.fallback.AuthTaskFeignServiceFallback;
-import com.yonge.cooleshow.common.config.FeignConfiguration;
 
 @FeignClient(contextId = "authTaskFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = AuthTaskFeignServiceFallback.class)
 public interface AuthTaskFeignService {

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -4,16 +4,14 @@ import com.yonge.cooleshow.auth.api.client.fallback.SysUserFeignServiceFallback;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.common.config.FeignConfiguration;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.feign.config.FeignConfiguration;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @FeignClient(contextId = "sysUserFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysUserFeignServiceFallback.class)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
-import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import org.springframework.stereotype.Component;
 
@@ -12,8 +11,6 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
-import javax.servlet.http.HttpServletRequest;
-
 @Component
 public class SysUserFeignServiceFallback implements SysUserFeignService {
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/MenuQueryInfo.java

@@ -1,8 +1,7 @@
 package com.yonge.cooleshow.auth.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
-
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "父节点编号，默认0",required = false)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/RealnameAuthReq.java

@@ -27,7 +27,7 @@ public class RealnameAuthReq implements Serializable {
 
     @NotNull(message = "缺少是否修改用户信息")
     @ApiModelProperty(value = "是否修改用户信息", required = true)
-    private Boolean isSave;
+    private Boolean save;
 
     private Long userId;
     // 性别(1,男 0,女)
@@ -62,11 +62,11 @@ public class RealnameAuthReq implements Serializable {
     }
 
     public Boolean getSave() {
-        return isSave;
+        return save;
     }
 
     public void setSave(Boolean save) {
-        isSave = save;
+        this.save = save;
     }
 
     public int getGender() {

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/SysUserQueryInfo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.auth.api.dto;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class SysUserQueryInfo extends QueryInfo {
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/UserSetReq.java

@@ -1,8 +1,12 @@
 package com.yonge.cooleshow.auth.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.common.enums.UserGenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @Author: liweifan
@@ -16,6 +20,10 @@ public class UserSetReq {
     private String username;
     @ApiModelProperty(value = "性别 0女 1男")
     private Integer gender;
+    @ApiModelProperty(value = "出生日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthdate;
 
     public String getAvatar() {
         return avatar;
@@ -40,4 +48,12 @@ public class UserSetReq {
     public void setGender(Integer gender) {
         this.gender = gender;
     }
+
+    public Date getBirthdate() {
+        return birthdate;
+    }
+
+    public void setBirthdate(Date birthdate) {
+        this.birthdate = birthdate;
+    }
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/enums/CertificateTypeEnum.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.auth.api.enums;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
  * @Author Joburgess

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/enums/SysUserType.java

@@ -1,9 +1,8 @@
 package com.yonge.cooleshow.auth.api.enums;
 
+import com.yonge.toolset.base.enums.BaseEnum;
 import org.apache.commons.lang3.StringUtils;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
 public enum SysUserType implements BaseEnum<String, SysUserType> {
 
 	STUDENT("学生"), TEACHER("指导老师"), SYSTEM("系统內置");

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/enums/UserLockFlag.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.auth.api.enums;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
-/** 
+/**
  * 会员状态枚举类
  */
 public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/enums/YesOrNoEnum.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.auth.api.enums;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
     NO(0,"否"),

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/vo/UserSetVo.java

@@ -1,7 +1,11 @@
 package com.yonge.cooleshow.auth.api.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  *
@@ -18,8 +22,12 @@ public class UserSetVo {
     private Integer gender;
     @ApiModelProperty(value = "手机号")
     private String phone;
-    @ApiModelProperty(value = "是否实名 0否 1是")
-    private Boolean isReal;
+    @ApiModelProperty(value = "是否实名")
+    private Boolean real;
+    @ApiModelProperty(value = "出生日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthdate;
 
     public String getAvatar() {
         return avatar;
@@ -54,10 +62,18 @@ public class UserSetVo {
     }
 
     public Boolean getReal() {
-        return isReal;
+        return real;
     }
 
     public void setReal(Boolean real) {
-        isReal = real;
+        this.real = real;
+    }
+
+    public Date getBirthdate() {
+        return birthdate;
+    }
+
+    public void setBirthdate(Date birthdate) {
+        this.birthdate = birthdate;
     }
 }

cooleshow-auth/auth-server/pom.xml

@@ -80,8 +80,8 @@
         </dependency>
 
         <dependency>
-			<groupId>com.yonge.toolset</groupId>
-			<artifactId>thirdparty-component</artifactId>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>thirdparty-component</artifactId>
         </dependency>
 
         <dependency>
@@ -90,6 +90,12 @@
             <version>3.2.17</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-emoji</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 
     <build>

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/LocalFastJsonHttpMessageConverter.java → cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/config/LocalFastJsonHttpMessageConverter.java

@@ -1,16 +1,4 @@
-package com.yonge.cooleshow.common.config;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.http.converter.HttpMessageNotWritableException;
+package com.yonge.cooleshow.auth.config;
 
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.ObjectSerializer;
@@ -18,8 +6,19 @@ 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.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 import com.yonge.toolset.utils.json.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.http.converter.HttpMessageNotWritableException;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.Date;
 
 public class LocalFastJsonHttpMessageConverter extends FastJsonHttpMessageConverter {
 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/ParameterCheckServletRequestWrapper.java → cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/config/ParameterCheckServletRequestWrapper.java

@@ -1,20 +1,18 @@
-package com.yonge.cooleshow.common.config;
+package com.yonge.cooleshow.auth.config;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import com.vdurmont.emoji.EmojiParser;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.StreamUtils;
 
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.StreamUtils;
-
-import com.vdurmont.emoji.EmojiParser;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 
 public class ParameterCheckServletRequestWrapper extends HttpServletRequestWrapper {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/config/WebMvcConfig.java

@@ -14,7 +14,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.yonge.cooleshow.auth.interceptor.OperationLogInterceptor;
 import com.yonge.cooleshow.common.config.EnumConverterFactory;
-import com.yonge.cooleshow.common.config.LocalFastJsonHttpMessageConverter;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/config/filters/EmojiEncodingFilter.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.auth.config.filters;
+
+import com.vdurmont.emoji.EmojiParser;
+import com.yonge.cooleshow.auth.config.ParameterCheckServletRequestWrapper;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+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 ParameterCheckServletRequestWrapper((HttpServletRequest) request) {
+
+			@Override
+			public String getParameter(String name) {
+				// 参数名
+				String value = super.getParameter(name);
+				if (StringUtils.isNotBlank(value)) {
+					// 返回值之前 先进行 Emoji 转化
+					return EmojiParser.removeAllEmojis(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.removeAllEmojis(values[i]);
+					}
+				}
+				return values;
+			}
+
+		};
+		
+		chain.doFilter(request, response);
+	}
+
+}

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysConfigDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysConfig;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import java.util.List;
 
 public interface SysConfigDao extends BaseDAO<Long, SysConfig> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysMenuDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysMenu;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysMenuDao extends BaseDAO<Long, SysMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysOauthClientDetailsDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysOauthClientDetails;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysOauthClientDetailsDao extends BaseDAO<String, SysOauthClientDetails> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysRoleDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysRole;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysRoleDao extends BaseDAO<Long, SysRole> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysRoleMenuDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysRoleMenuDao extends BaseDAO<Long, SysRoleMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.UserLockFlag;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 
 public interface SysUserDao extends BaseDAO<Long, SysUser> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDeviceDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysUserDeviceDao extends BaseDAO<Long, SysUserDevice> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserLoginDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLogin;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysUserLoginDao extends BaseDAO<Long, SysUserLogin> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserLoginLogDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLoginLog;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysUserLoginLogDao extends BaseDAO<Long, SysUserLoginLog> {
 	

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserRoleDao.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.dal.dao;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 public interface SysUserRoleDao extends BaseDAO<Long, SysUserRole> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/enums/UserGenderEnum.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.auth.dal.enums;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
-/** 
+/**
  * 会员性别枚举
  */
 public enum UserGenderEnum implements BaseEnum<Integer, UserGenderEnum> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/enums/UserStatus.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.auth.dal.enums;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
-/** 
+/**
  * 会员状态枚举类
  */
 public enum UserStatus implements BaseEnum<Integer, UserStatus> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysConfigService.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysConfig;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysConfigService extends BaseService<Long, SysConfig> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysMenuService.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.yonge.cooleshow.auth.api.dto.MenuQueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysMenu;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysMenuService extends BaseService<Long, SysMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysOauthClientDetailsService.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysOauthClientDetails;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysOauthClientDetailsService extends BaseService<String, SysOauthClientDetails> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysRoleMenuService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysRoleMenuService extends BaseService<Long, SysRoleMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysRoleService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysRole;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysRoleService extends BaseService<Long, SysRole> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserDeviceService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserDeviceService extends BaseService<Long, SysUserDevice> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserLoginLogService.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLoginLog;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
-public interface SysUserLoginLogService extends BaseService<Long,SysUserLoginLog>{
+public interface SysUserLoginLogService extends BaseService<Long,SysUserLoginLog> {
 
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserLoginService.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLogin;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserLoginService extends BaseService<Long, SysUserLogin> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserRoleService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserRoleService extends BaseService<Long, SysUserRole> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.common.entity.ImUserModel;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserService extends BaseService<Long, SysUser> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysConfigServiceImpl.java

@@ -3,8 +3,8 @@ package com.yonge.cooleshow.auth.service.impl;
 import com.yonge.cooleshow.auth.api.entity.SysConfig;
 import com.yonge.cooleshow.auth.dal.dao.SysConfigDao;
 import com.yonge.cooleshow.auth.service.SysConfigService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysMenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,11 +13,10 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.dal.dao.SysMenuDao;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
 import com.yonge.cooleshow.auth.service.SysMenuService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysMenuServiceImpl extends BaseServiceImpl<Long, SysMenu>  implements SysMenuService {
+public class SysMenuServiceImpl extends BaseServiceImpl<Long, SysMenu> implements SysMenuService {
 	
 	@Autowired
 	private SysMenuDao sysMenuDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysOauthClientDetailsServiceImpl.java

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.auth.service.impl;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysOauthClientDetails;
 import com.yonge.cooleshow.auth.dal.dao.SysOauthClientDetailsDao;
 import com.yonge.cooleshow.auth.service.SysOauthClientDetailsService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysOauthClientDetailsServiceImpl extends BaseServiceImpl<String, SysOauthClientDetails>  implements SysOauthClientDetailsService {
+public class SysOauthClientDetailsServiceImpl extends BaseServiceImpl<String, SysOauthClientDetails> implements SysOauthClientDetailsService {
 	
 	@Autowired
 	private SysOauthClientDetailsDao sysOauthClientDetailsDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysRoleMenuServiceImpl.java

@@ -3,14 +3,14 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
 import com.yonge.cooleshow.auth.dal.dao.SysRoleMenuDao;
 import com.yonge.cooleshow.auth.service.SysRoleMenuService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class SysRoleMenuServiceImpl extends BaseServiceImpl<Long, SysRoleMenu> implements SysRoleMenuService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysRoleServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,12 +12,11 @@ import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.dal.dao.SysRoleDao;
 import com.yonge.cooleshow.auth.dal.dao.SysRoleMenuDao;
 import com.yonge.cooleshow.auth.service.SysRoleService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysRoleServiceImpl extends BaseServiceImpl<Long, SysRole>  implements SysRoleService {
+public class SysRoleServiceImpl extends BaseServiceImpl<Long, SysRole> implements SysRoleService {
 	
 	@Autowired
 	private SysRoleDao sysRoleDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -13,11 +14,10 @@ import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDeviceDao;
 import com.yonge.cooleshow.auth.service.SysUserDeviceService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevice>  implements SysUserDeviceService {
+public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevice> implements SysUserDeviceService {
 	
 	@Autowired
 	private SysUserDeviceDao sysUserDeviceDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserLoginLogServiceImpl.java

@@ -1,13 +1,13 @@
 package com.yonge.cooleshow.auth.service.impl;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLoginLog;
 import com.yonge.cooleshow.auth.dal.dao.SysUserLoginLogDao;
 import com.yonge.cooleshow.auth.service.SysUserLoginLogService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class SysUserLoginLogServiceImpl extends BaseServiceImpl<Long,SysUserLoginLog> implements SysUserLoginLogService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserLoginServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,8 +16,7 @@ import com.yonge.cooleshow.auth.api.enums.UserLockFlag;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
 import com.yonge.cooleshow.auth.dal.dao.SysUserLoginDao;
 import com.yonge.cooleshow.auth.service.SysUserLoginService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class SysUserLoginServiceImpl extends BaseServiceImpl<Long, SysUserLogin> implements SysUserLoginService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserRoleServiceImpl.java

@@ -2,17 +2,17 @@ package com.yonge.cooleshow.auth.service.impl;
 
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
 import com.yonge.cooleshow.auth.dal.dao.SysUserRoleDao;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysUserRoleServiceImpl extends BaseServiceImpl<Long, SysUserRole>  implements SysUserRoleService {
+public class SysUserRoleServiceImpl extends BaseServiceImpl<Long, SysUserRole> implements SysUserRoleService {
 	
 	@Autowired
 	private SysUserRoleDao sysUserRoleDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -21,10 +22,9 @@ import com.yonge.cooleshow.auth.service.SysRoleMenuService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.auth.service.SysUserService;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implements SysUserService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/RoleController.java

@@ -25,7 +25,7 @@ import com.yonge.cooleshow.auth.service.SysRoleMenuService;
 import com.yonge.cooleshow.auth.service.SysRoleService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 import com.yonge.cooleshow.common.security.SecurityConstants;
 
 @RestController()

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/queryInfo/RoleQueryInfo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.auth.web.controller.queryInfo;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class RoleQueryInfo extends QueryInfo {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/queryInfo/SysUserDeviceQueryInfo.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.auth.web.controller.queryInfo;
 
 import java.util.Date;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class SysUserDeviceQueryInfo extends QueryInfo {
 

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -233,6 +233,7 @@
             u.username_ as username,
             u.gender_ as gender,
             u.phone_ as phone,
+            u.birthdate_ as birthdate,
             (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal
         FROM sys_user u
         where u.id_ = #{id}
@@ -250,6 +251,9 @@
         <if test="param.gender != null">
             gender_ = #{param.gender},
         </if>
+        <if test="param.birthdate != null">
+            birthdate_ = #{param.birthdate},
+        </if>
         update_time_ = now()
         WHERE id_ = #{id}
     </update>

cooleshow-auth/pom.xml

@@ -22,6 +22,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-mybatis</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
     <modules>
         <module>auth-api</module>

cooleshow-cms/pom.xml

@@ -1,85 +1,95 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>com.yonge.cooleshow</groupId>
-		<artifactId>cooleshow</artifactId>
-		<version>1.0</version>
-	</parent>
+    <parent>
+        <groupId>com.yonge.cooleshow</groupId>
+        <artifactId>cooleshow</artifactId>
+        <version>1.0</version>
+    </parent>
 
-	<groupId>com.yonge.cooleshow</groupId>
-	<artifactId>cooleshow-cms</artifactId>
-	<version>1.0</version>
-	<packaging>jar</packaging>
+    <groupId>com.yonge.cooleshow</groupId>
+    <artifactId>cooleshow-cms</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
 
-	<name>cooleshow-cms</name>
-	<url>http://maven.apache.org</url>
+    <name>cooleshow-cms</name>
+    <url>http://maven.apache.org</url>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
-	<dependencies>
+    <dependencies>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
 
-		<!-- swagger-spring-boot -->
-		<dependency>
-			<groupId>com.spring4all</groupId>
-			<artifactId>swagger-spring-boot-starter</artifactId>
-		</dependency>
+        <!-- swagger-spring-boot -->
+        <dependency>
+            <groupId>com.spring4all</groupId>
+            <artifactId>swagger-spring-boot-starter</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>swagger-bootstrap-ui</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.yonge.cooleshow</groupId>
-			<artifactId>auth-api</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.yonge.cooleshow</groupId>
+            <artifactId>auth-api</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.yonge.toolset</groupId>
-			<artifactId>audit-log</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>freemarker</artifactId>
-					<groupId>org.freemarker</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.yonge.toolset</groupId>
-			<artifactId>utils</artifactId>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>audit-log</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>freemarker</artifactId>
+                    <groupId>org.freemarker</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-emoji</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-feign</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/config/LocalFastJsonHttpMessageConverter.java

@@ -0,0 +1,73 @@
+package com.yonge.cooleshow.cms.config;
+
+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.yonge.toolset.base.enums.BaseEnum;
+import com.yonge.toolset.utils.json.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.http.converter.HttpMessageNotWritableException;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class LocalFastJsonHttpMessageConverter extends FastJsonHttpMessageConverter {
+
+	private static final String FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+	@Override
+	protected Object readInternal(Class<? extends Object> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
+		return super.readInternal(clazz, inputMessage);
+	}
+
+	@Override
+	protected void writeInternal(Object obj, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException {
+
+		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();
+
+	public EnumFilter() {
+	}
+
+	@Override
+	public Object process(Object object, String name, Object value) {
+		if (value == null || StringUtils.isBlank(value.toString())) {
+			return value;
+		}
+		if (value instanceof BigDecimal || value instanceof Double || value instanceof Float) {
+			return new BigDecimal(value.toString());
+		}
+		if (BaseEnum.class.isAssignableFrom(value.getClass())) {
+			return ((BaseEnum<?, ?>) value).getCode();
+		}
+		return value;
+	}
+}

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/config/ParameterCheckServletRequestWrapper.java

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.cms.config;
+
+import com.vdurmont.emoji.EmojiParser;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.StreamUtils;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+
+public class ParameterCheckServletRequestWrapper extends HttpServletRequestWrapper {
+
+	private byte[] requestBody;
+	private Charset charSet;
+
+	public ParameterCheckServletRequestWrapper(HttpServletRequest request) throws IOException {
+		super(request);
+
+		String requestBodyStr = getRequestPostStr(request);
+		if (StringUtils.isNotBlank(requestBodyStr)) {
+			requestBodyStr = EmojiParser.removeAllEmojis(requestBodyStr);
+			requestBody = requestBodyStr.getBytes(charSet);
+		} else {
+			requestBody = new byte[0];
+		}
+	}
+
+	public String getRequestPostStr(HttpServletRequest request) throws IOException {
+		String charSetStr = request.getCharacterEncoding();
+		if (charSetStr == null) {
+			charSetStr = "UTF-8";
+		}
+		charSet = Charset.forName(charSetStr);
+
+		return StreamUtils.copyToString(request.getInputStream(), charSet);
+	}
+
+	/**
+	 * 重写 getInputStream()
+	 */
+	@Override
+	public ServletInputStream getInputStream() {
+		if (requestBody == null) {
+			requestBody = new byte[0];
+		}
+
+		final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(requestBody);
+
+		return new ServletInputStream() {
+			@Override
+			public boolean isFinished() {
+				return false;
+			}
+
+			@Override
+			public boolean isReady() {
+				return false;
+			}
+
+			@Override
+			public void setReadListener(ReadListener readListener) {
+
+			}
+
+			@Override
+			public int read() {
+				return byteArrayInputStream.read();
+			}
+		};
+	}
+
+	/**
+	 * 重写 getReader()
+	 */
+	@Override
+	public BufferedReader getReader() {
+		return new BufferedReader(new InputStreamReader(getInputStream()));
+	}
+
+}

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/config/WebMvcConfig.java

@@ -14,7 +14,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.yonge.cooleshow.cms.interceptor.OperationLogInterceptor;
 import com.yonge.cooleshow.common.config.EnumConverterFactory;
-import com.yonge.cooleshow.common.config.LocalFastJsonHttpMessageConverter;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/config/filters/EmojiEncodingFilter.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.cms.config.filters;
+
+import com.vdurmont.emoji.EmojiParser;
+import com.yonge.cooleshow.cms.config.ParameterCheckServletRequestWrapper;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+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 ParameterCheckServletRequestWrapper((HttpServletRequest) request) {
+
+			@Override
+			public String getParameter(String name) {
+				// 参数名
+				String value = super.getParameter(name);
+				if (StringUtils.isNotBlank(value)) {
+					// 返回值之前 先进行 Emoji 转化
+					return EmojiParser.removeAllEmojis(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.removeAllEmojis(values[i]);
+					}
+				}
+				return values;
+			}
+
+		};
+		
+		chain.doFilter(request, response);
+	}
+
+}

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/HelpCenterContentController.java

@@ -17,7 +17,7 @@ import com.yonge.cooleshow.cms.controller.queryinfo.HelpCenterContentQueryInfo;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
 import com.yonge.cooleshow.cms.service.HelpCenterContentService;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.log.model.AuditLogAnnotation;
 
 import javax.validation.Valid;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/MusicTheoryController.java

@@ -5,8 +5,8 @@ import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
 import com.yonge.cooleshow.cms.dto.search.MusicTheorySearch;
 import com.yonge.cooleshow.cms.service.SysNewsTypeService;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -5,7 +5,7 @@ import com.yonge.cooleshow.cms.dto.AppHomeDto;
 import com.yonge.cooleshow.cms.dto.AppParam;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.cms.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -6,7 +6,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.yonge.cooleshow.cms.dal.entity.NewsStatusEnum;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterCatalogDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface HelpCenterCatalogDao extends BaseDAO<Long, HelpCenterCatalog> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterContentDao.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.cms.dal.dao;
 import java.util.Map;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface HelpCenterContentDao extends BaseDAO<Long, HelpCenterContent> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysConfigDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.cms.dal.dao;
 
 import com.yonge.cooleshow.cms.dal.entity.SysConfig;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsInformationDao.java

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsTypeDao.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysNewsTypeDao extends BaseDAO<Long, SysNewsType> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/NewsStatusEnum.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.cms.dal.entity;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum NewsStatusEnum implements BaseEnum<Integer, NewsStatusEnum> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/search/MusicTheorySearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.cms.dto.search;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/HelpCenterCatalogService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.cms.service;
 import java.util.List;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface HelpCenterCatalogService extends BaseService<Long, HelpCenterCatalog> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/HelpCenterContentService.java

@@ -1,9 +1,9 @@
 package com.yonge.cooleshow.cms.service;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
-public interface HelpCenterContentService extends BaseService<Long,HelpCenterContent>{
+public interface HelpCenterContentService extends BaseService<Long,HelpCenterContent> {
 	
 	public boolean updateContentByCatalog(Long catalogId,Integer status);
 	

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsInformationService.java

@@ -7,9 +7,9 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysNewsInformationService extends BaseService<Long, SysNewsInformation> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsTypeService.java

@@ -5,9 +5,9 @@ import java.util.List;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysNewsTypeService extends BaseService<Long, SysNewsType> {
 	

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.cms.service.impl;
 
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,8 +10,7 @@ import com.yonge.cooleshow.cms.dal.dao.HelpCenterCatalogDao;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
 import com.yonge.cooleshow.cms.service.HelpCenterCatalogService;
 import com.yonge.cooleshow.cms.service.HelpCenterContentService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Long, HelpCenterCatalog> implements HelpCenterCatalogService {

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterContentServiceImpl.java

@@ -3,14 +3,14 @@ package com.yonge.cooleshow.cms.service.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.cms.dal.dao.HelpCenterContentDao;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
 import com.yonge.cooleshow.cms.service.HelpCenterContentService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class HelpCenterContentServiceImpl extends BaseServiceImpl<Long, HelpCenterContent> implements HelpCenterContentService {

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -7,10 +7,10 @@ import com.yonge.cooleshow.cms.dal.entity.NewsStatusEnum;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
 import com.yonge.cooleshow.cms.service.SysNewsInformationService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import com.yonge.toolset.utils.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import com.yonge.toolset.utils.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,11 +17,10 @@ import com.yonge.cooleshow.cms.dal.dao.SysNewsTypeDao;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.cms.service.SysNewsTypeService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysNewsTypeServiceImpl extends BaseServiceImpl<Long, SysNewsType>  implements SysNewsTypeService {
+public class SysNewsTypeServiceImpl extends BaseServiceImpl<Long, SysNewsType> implements SysNewsTypeService {
 	
 	@Autowired
 	private SysNewsTypeDao sysNewsTypeDao;

cooleshow-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -17,7 +17,7 @@
 		<result column="online_time_" property="onlineTime"/>
 		<result column="offline_time_" property="offlineTime"/>
 		<result column="sub_type_" property="subType"/>
-		<result column="status_" property="status" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler" />
+		<result column="status_" property="status" typeHandler="com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
@@ -46,7 +46,7 @@
 				and sni.sub_type_ = #{subType}
 			</if>
 			<if test="status != null">
-				and sni.status_ = #{status, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
+				and sni.status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="title != null">
 				and (sni.title_ like '%' #{title} '%'
@@ -63,7 +63,7 @@
 				<if test="platformType != 'ADMIN'" >
 					and sni.status_ = 1
 					<if test="type != 5">
-						and sni.online_time_ &lt;= now()
+						and if(sni.online_time_ is not null,sni.online_time_ &lt;= now(),1=1)
 						and if(sni.offline_time_ is not null,sni.offline_time_ &gt;= now(),1=1)
 					</if>
 				</if>
@@ -93,7 +93,7 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,video_cover_image_,type_,online_time_,offline_time_,sub_type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,memo_,attribute1_,attribute2_,subject_id_list_,create_by_,update_by_,show_time_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{videoCoverImage},#{type},#{onlineTime},#{offlineTime},#{subType},#{status, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{attribute1},#{attribute2},#{subjectIdList},#{createBy},#{updateBy},#{showTime})
+		VALUES(#{id},#{title},#{content},#{coverImage},#{videoCoverImage},#{type},#{onlineTime},#{offlineTime},#{subType},#{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{attribute1},#{attribute2},#{subjectIdList},#{createBy},#{updateBy},#{showTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -101,7 +101,7 @@
 		UPDATE sys_news_information
 		<set>
 			<if test="status != null">
-				status_ = #{status, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},
+				status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="title != null">
 				title_ = #{title},
@@ -212,7 +212,7 @@
 		</if>
 		<if test="status != null">
 			and sni.status_ = #{status,
-			typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
+			typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
 		</if>
 		<if test="title != null">
 			and sni.title_ like '%' #{title} '%'
@@ -245,7 +245,7 @@
 		</if>
 		<if test="status != null">
 			and sni.status_ = #{status,
-			typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
+			typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
 		</if>
 		<if test="title != null">
 			and sni.title_ like '%' #{title} '%'

cooleshow-cms/src/main/resources/config/mybatis/SysNewsTypeMapper.xml

@@ -138,7 +138,7 @@
 			<result column="online_time_" property="onlineTime"/>
 			<result column="offline_time_" property="offlineTime"/>
 			<result column="sub_type_" property="subType"/>
-			<result column="status_" property="status" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler" />
+			<result column="status_" property="status" typeHandler="com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler" />
 			<result column="create_time_" property="createTime" />
 			<result column="update_time_" property="updateTime" />
 			<result column="del_flag_" property="delFlag" />

cooleshow-common/pom.xml

@@ -14,24 +14,21 @@
 	<packaging>jar</packaging>
 
 	<name>cooleshow-common</name>
-	<url>http://maven.apache.org</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>com.yonge.toolset</groupId>
-			<artifactId>thirdparty-component</artifactId>
+			<artifactId>toolset-base</artifactId>
+			<version>1.0</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<groupId>com.yonge.toolset</groupId>
+			<artifactId>utils</artifactId>
 		</dependency>
-
 		<!-- Redis缓存整合开始 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -48,20 +45,9 @@
 			<artifactId>jedis</artifactId>
 		</dependency>
 		<!-- Redis缓存整合结束 -->
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-oauth2</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.vdurmont</groupId>
-			<artifactId>emoji-java</artifactId>
-		</dependency>
 	</dependencies>
 </project>

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/EnumConverter.java

@@ -1,9 +1,8 @@
 package com.yonge.cooleshow.common.config;
 
+import com.yonge.toolset.base.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
 public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String, T> {
 
 	private Class<T> enumType;

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/EnumConverterFactory.java

@@ -1,7 +1,6 @@
 package com.yonge.cooleshow.common.config;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
+import com.yonge.toolset.base.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.stereotype.Component;

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/RequestAttributeHystrixConcurrencyStrategy.java

@@ -1,128 +0,0 @@
-package com.yonge.cooleshow.common.config;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-
-import com.netflix.hystrix.HystrixThreadPoolKey;
-import com.netflix.hystrix.HystrixThreadPoolProperties;
-import com.netflix.hystrix.strategy.HystrixPlugins;
-import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
-import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariable;
-import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableLifecycle;
-import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
-import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook;
-import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
-import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
-import com.netflix.hystrix.strategy.properties.HystrixProperty;
-
-//@Component
-public class RequestAttributeHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
-	private static final Logger log = LoggerFactory.getLogger(RequestAttributeHystrixConcurrencyStrategy.class);
-
-	private HystrixConcurrencyStrategy delegate;
-
-	public RequestAttributeHystrixConcurrencyStrategy() {
-		try {
-			this.delegate = HystrixPlugins.getInstance().getConcurrencyStrategy();
-			if (this.delegate instanceof RequestAttributeHystrixConcurrencyStrategy) {
-				// Welcome to singleton hell...
-				return;
-			}
-			HystrixCommandExecutionHook commandExecutionHook = HystrixPlugins
-					.getInstance().getCommandExecutionHook();
-			HystrixEventNotifier eventNotifier = HystrixPlugins.getInstance()
-					.getEventNotifier();
-			HystrixMetricsPublisher metricsPublisher = HystrixPlugins.getInstance()
-					.getMetricsPublisher();
-			HystrixPropertiesStrategy propertiesStrategy = HystrixPlugins.getInstance()
-					.getPropertiesStrategy();
-			this.logCurrentStateOfHystrixPlugins(eventNotifier, metricsPublisher,
-					propertiesStrategy);
-			HystrixPlugins.reset();
-			HystrixPlugins.getInstance().registerConcurrencyStrategy(this);
-			HystrixPlugins.getInstance()
-					.registerCommandExecutionHook(commandExecutionHook);
-			HystrixPlugins.getInstance().registerEventNotifier(eventNotifier);
-			HystrixPlugins.getInstance().registerMetricsPublisher(metricsPublisher);
-			HystrixPlugins.getInstance().registerPropertiesStrategy(propertiesStrategy);
-		}
-		catch (Exception e) {
-			log.error("Failed to register Sleuth Hystrix Concurrency Strategy", e);
-		}
-	}
-
-	private void logCurrentStateOfHystrixPlugins(HystrixEventNotifier eventNotifier,
-			HystrixMetricsPublisher metricsPublisher,
-			HystrixPropertiesStrategy propertiesStrategy) {
-		if (log.isDebugEnabled()) {
-			log.debug("Current Hystrix plugins configuration is ["
-					+ "concurrencyStrategy [" + this.delegate + "]," + "eventNotifier ["
-					+ eventNotifier + "]," + "metricPublisher [" + metricsPublisher + "],"
-					+ "propertiesStrategy [" + propertiesStrategy + "]," + "]");
-			log.debug("Registering Sleuth Hystrix Concurrency Strategy.");
-		}
-	}
-
-	@Override
-	public <T> Callable<T> wrapCallable(Callable<T> callable) {
-		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-		return new WrappedCallable<>(callable, requestAttributes);
-	}
-
-	@Override
-	public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
-			HystrixProperty<Integer> corePoolSize,
-			HystrixProperty<Integer> maximumPoolSize,
-			HystrixProperty<Integer> keepAliveTime, TimeUnit unit,
-			BlockingQueue<Runnable> workQueue) {
-		return this.delegate.getThreadPool(threadPoolKey, corePoolSize, maximumPoolSize,
-				keepAliveTime, unit, workQueue);
-	}
-
-	@Override
-	public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
-			HystrixThreadPoolProperties threadPoolProperties) {
-		return this.delegate.getThreadPool(threadPoolKey, threadPoolProperties);
-	}
-
-	@Override
-	public BlockingQueue<Runnable> getBlockingQueue(int maxQueueSize) {
-		return this.delegate.getBlockingQueue(maxQueueSize);
-	}
-
-	@Override
-	public <T> HystrixRequestVariable<T> getRequestVariable(
-			HystrixRequestVariableLifecycle<T> rv) {
-		return this.delegate.getRequestVariable(rv);
-	}
-
-	static class WrappedCallable<T> implements Callable<T> {
-
-		private final Callable<T> target;
-		private final RequestAttributes requestAttributes;
-
-		public WrappedCallable(Callable<T> target, RequestAttributes requestAttributes) {
-			this.target = target;
-			this.requestAttributes = requestAttributes;
-		}
-
-		@Override
-		public T call() throws Exception {
-			try {
-				RequestContextHolder.setRequestAttributes(requestAttributes);
-				return target.call();
-			}
-			finally {
-				RequestContextHolder.resetRequestAttributes();
-			}
-		}
-	}
-}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/controller/BaseController.java

@@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.base.exception.ThirdpartyException;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 @ControllerAdvice

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/HttpResponseResult.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.base.exception.ThirdpartyException;
 import com.yonge.toolset.utils.http.HttpUtil;
 import com.yonge.toolset.utils.json.JsonUtil;
 import org.apache.commons.codec.binary.Base64;

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/AccessSource.java

@@ -1,6 +1,8 @@
 package com.yonge.cooleshow.common.enums;
 
-/** 
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
  * @author sunzl 
  * 2015年8月25日 下午4:19:00 
  * 会员状态枚举类

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/PlatformEnum.java

@@ -1,12 +1,14 @@
 package com.yonge.cooleshow.common.enums;
 
+import com.yonge.toolset.base.enums.BaseEnum;
+
 /**
  * Description
  *
  * @author liujunchi
  * @date 2022-04-24
  */
-public enum PlatformEnum implements BaseEnum<String,PlatformEnum>{
+public enum PlatformEnum implements BaseEnum<String,PlatformEnum> {
 
     STUDENT("STUDENT","STUDENT"),
     TEACHER("TEACHER","TEACHER");

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/UserGenderEnum.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.common.enums;
 
-import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
  * @author sunzl 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/exception/BizException.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.common.exception;
 
-import com.yonge.toolset.utils.string.MessageFormatter;
+import com.yonge.toolset.base.string.MessageFormatter;
 
 public class BizException extends RuntimeException {
 

cooleshow-mall/mall-admin/pom.xml

@@ -29,6 +29,11 @@
         </dependency>
 
         <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>thirdparty-component</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>mall-mbg</artifactId>
         </dependency>
@@ -54,6 +59,17 @@
             <version>20.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.yonge.cooleshow</groupId>
+            <artifactId>mall-pay</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-emoji</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 
     <build>

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/MallAdminApplication.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableDiscoveryClient
 @MapperScan({"com.yonge.cooleshow.admin.dao","com.yonge.cooleshow.mbg.mapper"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow.admin", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common",
-                               "com.yonge.cooleshow.common"})
+                               "com.yonge.cooleshow.common","com.yonge.cooleshow","com.yonge.toolset.thirdparty"})
 @EnableSwagger2Doc
 @EnableFeignClients("com.yonge.cooleshow")
 public class MallAdminApplication {

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/config/LocalFastJsonHttpMessageConverter.java

@@ -0,0 +1,73 @@
+package com.yonge.cooleshow.admin.config;
+
+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.yonge.toolset.base.enums.BaseEnum;
+import com.yonge.toolset.utils.json.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.http.converter.HttpMessageNotWritableException;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class LocalFastJsonHttpMessageConverter extends FastJsonHttpMessageConverter {
+
+	private static final String FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+	@Override
+	protected Object readInternal(Class<? extends Object> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
+		return super.readInternal(clazz, inputMessage);
+	}
+
+	@Override
+	protected void writeInternal(Object obj, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException {
+
+		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();
+
+	public EnumFilter() {
+	}
+
+	@Override
+	public Object process(Object object, String name, Object value) {
+		if (value == null || StringUtils.isBlank(value.toString())) {
+			return value;
+		}
+		if (value instanceof BigDecimal || value instanceof Double || value instanceof Float) {
+			return new BigDecimal(value.toString());
+		}
+		if (BaseEnum.class.isAssignableFrom(value.getClass())) {
+			return ((BaseEnum<?, ?>) value).getCode();
+		}
+		return value;
+	}
+}

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/config/ParameterCheckServletRequestWrapper.java

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.config;
+
+import com.vdurmont.emoji.EmojiParser;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.StreamUtils;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+
+public class ParameterCheckServletRequestWrapper extends HttpServletRequestWrapper {
+
+	private byte[] requestBody;
+	private Charset charSet;
+
+	public ParameterCheckServletRequestWrapper(HttpServletRequest request) throws IOException {
+		super(request);
+
+		String requestBodyStr = getRequestPostStr(request);
+		if (StringUtils.isNotBlank(requestBodyStr)) {
+			requestBodyStr = EmojiParser.removeAllEmojis(requestBodyStr);
+			requestBody = requestBodyStr.getBytes(charSet);
+		} else {
+			requestBody = new byte[0];
+		}
+	}
+
+	public String getRequestPostStr(HttpServletRequest request) throws IOException {
+		String charSetStr = request.getCharacterEncoding();
+		if (charSetStr == null) {
+			charSetStr = "UTF-8";
+		}
+		charSet = Charset.forName(charSetStr);
+
+		return StreamUtils.copyToString(request.getInputStream(), charSet);
+	}
+
+	/**
+	 * 重写 getInputStream()
+	 */
+	@Override
+	public ServletInputStream getInputStream() {
+		if (requestBody == null) {
+			requestBody = new byte[0];
+		}
+
+		final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(requestBody);
+
+		return new ServletInputStream() {
+			@Override
+			public boolean isFinished() {
+				return false;
+			}
+
+			@Override
+			public boolean isReady() {
+				return false;
+			}
+
+			@Override
+			public void setReadListener(ReadListener readListener) {
+
+			}
+
+			@Override
+			public int read() {
+				return byteArrayInputStream.read();
+			}
+		};
+	}
+
+	/**
+	 * 重写 getReader()
+	 */
+	@Override
+	public BufferedReader getReader() {
+		return new BufferedReader(new InputStreamReader(getInputStream()));
+	}
+
+}

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/config/WebMvcConfig.java

@@ -1,14 +1,11 @@
 package com.yonge.cooleshow.admin.config;
 
 import com.yonge.cooleshow.common.config.EnumConverterFactory;
-import com.yonge.cooleshow.common.config.LocalFastJsonHttpMessageConverter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.MediaType;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/config/filters/EmojiEncodingFilter.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.admin.config.filters;
+
+import com.vdurmont.emoji.EmojiParser;
+import com.yonge.cooleshow.admin.config.ParameterCheckServletRequestWrapper;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+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 ParameterCheckServletRequestWrapper((HttpServletRequest) request) {
+
+			@Override
+			public String getParameter(String name) {
+				// 参数名
+				String value = super.getParameter(name);
+				if (StringUtils.isNotBlank(value)) {
+					// 返回值之前 先进行 Emoji 转化
+					return EmojiParser.removeAllEmojis(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.removeAllEmojis(values[i]);
+					}
+				}
+				return values;
+			}
+
+		};
+		
+		chain.doFilter(request, response);
+	}
+
+}

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/OmsOrderReturnApplyController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.enums.OrdeerCacherEnmu;
 import com.yonge.cooleshow.mall.common.api.CommonPage;
 import com.yonge.cooleshow.mall.common.api.CommonResult;
 import com.yonge.cooleshow.admin.dto.OmsOrderReturnApplyResult;
@@ -9,11 +10,16 @@ import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.admin.service.OmsOrderReturnApplyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 订单退货申请管理Controller
@@ -26,6 +32,11 @@ public class OmsOrderReturnApplyController {
     @Autowired
     private OmsOrderReturnApplyService returnApplyService;
 
+    @Autowired
+    private RedissonClient redissonClient;
+
+    private static final Logger log = LoggerFactory.getLogger(OmsOrderReturnApplyController.class);
+
     @ApiOperation("分页查询退货申请")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
@@ -59,10 +70,21 @@ public class OmsOrderReturnApplyController {
     @RequestMapping(value = "/update/status/{id}", method = RequestMethod.POST)
     @ResponseBody
     public CommonResult updateStatus(@PathVariable Long id, @RequestBody OmsUpdateStatusParam statusParam) {
-        int count = returnApplyService.updateStatus(id, statusParam);
-        if (count > 0) {
-            return CommonResult.success(count);
+        RLock lock = redissonClient.getLock(OrdeerCacherEnmu.LOCK_REFUND_ORDER_MALL + ":refundOrder:" + id);
+        try {
+            boolean b = lock.tryLock(60, 60, TimeUnit.SECONDS);
+            if (b) {
+                int count = returnApplyService.updateStatus(id, statusParam);
+                if (count > 0) {
+                    return CommonResult.success(count);
+                }
+            }
+        } catch (Exception e) {
+            log.error(e.getLocalizedMessage());
+            e.printStackTrace();
+            lock.unlock();
         }
+
         return CommonResult.failed();
     }