merge: 解决合并冲突

Author: colorful3

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>io.github.talelin</groupId>
     <artifactId>latticy</artifactId>
-    <version>0.1.1-RC1</version>
+    <version>0.2.0-RC1</version>
     <name>latticy</name>
     <description>Demo project for lin cms</description>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.github.talelin</groupId>
             <artifactId>lin-cms-spring-boot-starter</artifactId>
-            <version>0.1.1-RC1</version>
+            <version>0.2.0-RC2</version>
         </dependency>
 
         <dependency>
@@ -131,6 +131,7 @@
                 <includes>
                     <include>**/*.properties</include>
                     <include>**/*.xml</include>
+                    <include>**/*.yml</include>
                     <include>**/*.tld</include>
                 </includes>
                 <filtering>false</filtering>

src/main/java/io/github/talelin/latticy/LatticyApplication.java

@@ -9,9 +9,9 @@
 /**
  * @author pedro@TaleLin
  */
-@SpringBootApplication(scanBasePackages = {"io.github.talelin.latticy"})
-@MapperScan(basePackages = {"io.github.talelin.latticy.mapper"})
 @RestController
+@MapperScan(basePackages = {"io.github.talelin.latticy.mapper"})
+@SpringBootApplication(scanBasePackages = {"io.github.talelin.latticy"})
 public class LatticyApplication {
 
     public static void main(String[] args) {

src/main/java/io/github/talelin/latticy/bo/FileBO.java

@@ -4,14 +4,15 @@
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
 @Data
 public class FileBO {
 
     /**
      * 文件 id
      */
-    private Long id;
+    private Integer id;
 
     /**
      * 文件 key，上传时指定的

src/main/java/io/github/talelin/latticy/bo/GroupPermissionBO.java

@@ -3,7 +3,9 @@
 import cn.hutool.core.bean.BeanUtil;
 import io.github.talelin.latticy.model.GroupDO;
 import io.github.talelin.latticy.model.PermissionDO;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -15,7 +17,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class GroupPermissionBO {
-    private Long id;
+    private Integer id;
 
     private String name;
 

src/main/java/io/github/talelin/latticy/common/aop/ResultAspect.java

@@ -3,38 +3,32 @@
 import cn.hutool.core.util.StrUtil;
 import io.github.talelin.latticy.common.configuration.CodeMessageConfiguration;
 import io.github.talelin.latticy.vo.UnifyResponseVO;
-import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.stereotype.Component;
 
 /**
- * 处理返回结果为 UnifyResponseVO 的视图函数
- * 默认的返回均是英文，在此处通过code替换成中文
+ * 处理返回结果为 UnifyResponseVO 的 Controller
+ * message 默认为 null，在此处通过 code 设置为对应消息
  *
  * @author pedro@TaleLin
  * @author colorful@TaleLin
+ * @author Juzi@TaleLin
  */
 @Aspect
 @Component
-@Slf4j
 public class ResultAspect {
+    @AfterReturning(returning = "result", pointcut = "execution(public * io.github.talelin.latticy.controller..*.*(..))")
+    public void doAfterReturning(UnifyResponseVO<String> result) {
+        int code = result.getCode();
+        String oldMessage = result.getMessage();
+        // code-message.properties 中配置的 message
+        String newMessage = CodeMessageConfiguration.getMessage(code);
 
-
-    @Pointcut("execution(public * io.github.talelin.latticy.controller..*.*(..))")
-    public void handlePlaceholder() {
-    }
-
-    @AfterReturning(returning = "ret", pointcut = "handlePlaceholder()")
-    public void doAfterReturning(Object ret) throws Throwable {
-        if (ret instanceof UnifyResponseVO) {
-            UnifyResponseVO result = (UnifyResponseVO) ret;
-            int code = result.getCode();
-            String message = CodeMessageConfiguration.getMessage(code);
-            if (StrUtil.isNotBlank(message) && StrUtil.isBlank((CharSequence) result.getMessage())) {
-                result.setMessage(message);
-            }
+        // 如果 code-message.properties 中指定了相应的 message 并且 UnifyResponseVO 的 message 为null
+        // 则使用 newMessage 替换 oldMessage
+        if (StrUtil.isNotBlank(newMessage) && StrUtil.isBlank(oldMessage)) {
+            result.setMessage(newMessage);
         }
     }
 }

src/main/java/io/github/talelin/latticy/common/configuration/CommonConfiguration.java

@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import io.github.talelin.autoconfigure.bean.RouteMetaCollector;
-import io.github.talelin.latticy.module.file.FileProperties;
+import io.github.talelin.autoconfigure.bean.PermissionMetaCollector;
 import io.github.talelin.latticy.common.interceptor.RequestLogInterceptor;
+import io.github.talelin.latticy.module.file.FileProperties;
+import io.github.talelin.latticy.module.log.MDCAccessServletFilter;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -35,13 +37,13 @@ public ISqlInjector sqlInjector() {
     }
 
     /**
-     * 记录每个被 @RouteMeta 记录的信息，在beans的后置调用
+     * 记录每个被 @PermissionMeta 记录的信息，在beans的后置调用
      *
-     * @return RouteMetaCollector
+     * @return PermissionMetaCollector
      */
     @Bean
-    public RouteMetaCollector postProcessBeans() {
-        return new RouteMetaCollector();
+    public PermissionMetaCollector postProcessBeans() {
+        return new PermissionMetaCollector();
     }
 
 
@@ -56,4 +58,18 @@ public Jackson2ObjectMapperBuilderCustomizer customJackson() {
             jacksonObjectMapperBuilder.propertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
         };
     }
+
+    /**
+     * 用于将 request 相关信息（如请求 url）放入 MDC 中供日志使用
+     *
+     * @return Logback 的 MDCInsertingServletFilter
+     */
+    @Bean
+    public FilterRegistrationBean<MDCAccessServletFilter> mdcInsertingServletFilter() {
+        FilterRegistrationBean<MDCAccessServletFilter> filterRegistrationBean = new FilterRegistrationBean<>();
+        MDCAccessServletFilter mdcAccessServletFilter = new MDCAccessServletFilter();
+        filterRegistrationBean.setFilter(mdcAccessServletFilter);
+        filterRegistrationBean.setName("mdc-access-servlet-filter");
+        return filterRegistrationBean;
+    }
 }

src/main/java/io/github/talelin/latticy/common/configuration/WebConfiguration.java

@@ -40,10 +40,10 @@ public class WebConfiguration implements WebMvcConfigurer {
     @Autowired
     private RequestLogInterceptor requestLogInterceptor;
 
-    @Value("${lin.cms.file.store-dir:assets/}")
+    @Value("${lin.file.store-dir:assets/}")
     private String dir;
 
-    @Value("${lin.cms.file.serve-path:assets/**}")
+    @Value("${lin.file.serve-path:assets/**}")
     private String servePath;
 
     /**

src/main/java/io/github/talelin/latticy/common/enumeration/GroupLevelEnum.java

@@ -0,0 +1,40 @@
+package io.github.talelin.latticy.common.enumeration;
+
+import com.baomidou.mybatisplus.core.enums.IEnum;
+
+/**
+ * @author colorful@TaleLin
+ * @author Juzi@TaleLin
+ */
+public enum GroupLevelEnum implements IEnum<Integer> {
+    /**
+     * 超级管理员
+     */
+    ROOT(1),
+    /**
+     * 游客
+     */
+    GUEST(2),
+    /**
+     * 普通用户
+     */
+    USER(3);
+
+    private final Integer value;
+
+    GroupLevelEnum(Integer value) {
+        this.value = value;
+    }
+
+    /**
+     * MybatisEnumTypeHandler 转换时调用此方法
+     *
+     * @return 枚举对应的 code 值
+     * @see com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler
+     */
+    @Override
+    public Integer getValue() {
+        return this.value;
+    }
+
+}

src/main/java/io/github/talelin/latticy/common/exception/RestExceptionHandler.java

@@ -2,9 +2,9 @@
 
 import cn.hutool.core.util.StrUtil;
 import io.github.talelin.autoconfigure.bean.Code;
+import io.github.talelin.autoconfigure.exception.HttpException;
 import io.github.talelin.latticy.common.configuration.CodeMessageConfiguration;
 import io.github.talelin.latticy.vo.UnifyResponseVO;
-import io.github.talelin.autoconfigure.exception.HttpException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,6 +26,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,19 +51,20 @@ public class RestExceptionHandler {
      * HttpException
      */
     @ExceptionHandler({HttpException.class})
-    public UnifyResponseVO processException(HttpException exception, HttpServletRequest request, HttpServletResponse response) {
-        log.error("", exception);
+    public UnifyResponseVO processException(HttpException exception, HttpServletRequest request, HttpServletResponse response) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
         UnifyResponseVO unifyResponse = new UnifyResponseVO();
         unifyResponse.setRequest(getSimpleRequest(request));
         int code = exception.getCode();
-        boolean messageOnly = exception.isMessageOnly();
+        boolean defaultMessage = exception.ifDefaultMessage();
         unifyResponse.setCode(code);
         response.setStatus(exception.getHttpCode());
         String errorMessage = CodeMessageConfiguration.getMessage(code);
-        if (StrUtil.isBlank(errorMessage) || messageOnly) {
+        if (StrUtil.isBlank(errorMessage) || !defaultMessage) {
             unifyResponse.setMessage(exception.getMessage());
+            log.error("", exception);
         } else {
             unifyResponse.setMessage(errorMessage);
+            log.error("", exception.getClass().getConstructor(int.class, String.class).newInstance(code, errorMessage));
         }
         return unifyResponse;
     }

src/main/java/io/github/talelin/latticy/common/factory/YamlPropertySourceFactory.java

@@ -0,0 +1,20 @@
+package io.github.talelin.latticy.common.factory;
+
+import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Juzi@TaleLin
+ */
+public class YamlPropertySourceFactory implements PropertySourceFactory {
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException {
+        List<PropertySource<?>> sources = new YamlPropertySourceLoader().load(resource.getResource().getFilename(), resource.getResource());
+        return sources.get(0);
+    }
+}