Merge branch 'master' of http://124.70.43.205:3000/xushili/ConfigurationSoftwareReport

src/main/java/com/gyee/table/config/WebMvcConfig.java

@@ -1,16 +1,9 @@
 package com.gyee.table.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.nio.charset.Charset;
-import java.util.List;
-
 /**
  * 拦截器
  */

src/main/java/com/gyee/table/controller/TableHeaderController.java

@@ -2,21 +2,17 @@ package com.gyee.table.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.gyee.table.entity.TableHeaderColumn;
-import com.gyee.table.mapper.ObjectAllMapper;
 import com.gyee.table.result.Result;
 import com.gyee.table.result.ResultCode;
 import com.gyee.table.service.IObjectService;
 import com.gyee.table.service.ITableHeaderColumnService;
 import com.gyee.table.service.ITableHeaderService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * <p>
@@ -26,6 +22,7 @@ import java.util.regex.Pattern;
  * @author gfhd
  * @since 2023-01-11
  */
+@Slf4j
 @RestController
 @RequestMapping("/table")
 public class TableHeaderController {

src/main/java/com/gyee/table/entity/TableHeaderColumn.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonRawValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.Serializable;

src/main/java/com/gyee/table/service/IObjectService.java

@@ -2,8 +2,6 @@ package com.gyee.table.service;
 
 import com.alibaba.fastjson2.JSONObject;
 
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/resources/application.yml

@@ -11,4 +11,16 @@ spring:
 
 mybatis-plus:
   typeAliasesPackage: com.gyee.table.entity
-  mapper-locations: classpath:mappers/*.xml
+  mapper-locations: classpath:mappers/*.xml
+
+logging:
+  level:
+    #root: info
+    com.gyee: warn
+  file:
+    name: server.log
+    path: ./log
+  logback:
+    rollingpolicy:
+      max-file-size: 3MB
+      file-name-pattern: server.%d{yyyy-MM-dd}.%i.log