sss

src/main/java/com/sysu/admin/api/crop/ApiCropController.java

@@ -89,8 +89,9 @@ public class ApiCropController extends BaseComponent {
 
     @RequestMapping("/list")
     @LogAspect
-    public BaseResult list(@RequestBody String data){
+    public BaseResult list(@RequestBody String data, @RequestHeader("token") String token){
         CropVo vo = JSON.parseObject(data, CropVo.class);
+        vo.setToken(token);
         super.validate(vo, ApiReqValid.TokenCheckValid.class);
         CurrentToken currentToken = CurrentToken.getCurrentToken(vo.getToken());
         List<CropLand> cityLandList = cityLandService.findIdAndNameByExecutor(Long.valueOf(currentToken.getUserId()));
@@ -98,8 +99,9 @@ public class ApiCropController extends BaseComponent {
     }
 
     @RequestMapping("/updateStatus")
-    public BaseResult updateStatus(@RequestBody String data){
+    public BaseResult updateStatus(@RequestBody String data, @RequestHeader("token") String token){
         CropVo vo = JSON.parseObject(data, CropVo.class);
+        vo.setToken(token);
         super.validate(vo, ApiReqValid.TokenCheckValid.class);
         CurrentToken currentToken = CurrentToken.getCurrentToken(vo.getToken());
         cityLandService.updateStatus(vo.getId(),vo.getStatus(), Long.parseLong(currentToken.getUserId()));
@@ -108,8 +110,9 @@ public class ApiCropController extends BaseComponent {
 
     @PostMapping("/uploadData")
     @LogAspect
-    public BaseResult uploadData(@RequestBody String json){
+    public BaseResult uploadData(@RequestBody String json, @RequestHeader("token") String token){
         CropVo vo = JSON.parseObject(json, CropVo.class);
+        vo.setToken(token);
         super.validate(vo, ApiReqValid.TokenCheckValid.class);
         CurrentToken currentToken = CurrentToken.getCurrentToken(vo.getToken());
         CropLand bean = cityLandService.findOne(vo.getId());

src/main/java/com/sysu/admin/api/user/ApiUserController.java

@@ -23,10 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.xmlbeans.impl.xb.ltgfmt.FileDesc;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -46,9 +43,9 @@ public class ApiUserController extends BaseComponent {
      * @return
      */
     @PostMapping("/login")
-    public BaseResult login(@RequestBody String data) {
+    public BaseResult login(@RequestBody String data, @RequestHeader("token") String token) {
         SmsReqVo sms = JSON.parseObject(data, SmsReqVo.class);
-        if(StringUtils.isNotEmpty(sms.getToken())){
+        if(StringUtils.isNotEmpty(token)){
             return R.succ(getTokenUser(sms.getToken()));
         }else{
             if(ObjectUtils.isEmpty(sms.getCode())){

src/main/java/com/sysu/admin/support/cfg/ThreadContext.java

@@ -11,7 +11,7 @@ import java.util.concurrent.Executors;
  */
 public class ThreadContext {
 
-    static public ExecutorService executor = Executors.newFixedThreadPool(5);
+//    static public ExecutorService executor = Executors.newFixedThreadPool(5);
 
 
     public static void main(String[] args) {

src/main/java/com/xiesx/fastboot/core/fastjson/cfg/FastJsonCfg.java

@@ -0,0 +1,79 @@
+package com.xiesx.fastboot.core.fastjson.cfg;
+
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.xiesx.fastboot.core.fastjson.cfg.FastJsonProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.math.BigInteger;
+import java.util.List;
+
+@Configuration
+@EnableConfigurationProperties(FastJsonProperties.class)
+public class FastJsonCfg implements WebMvcConfigurer {
+
+    public static SerializerFeature[] serializerFeatures = new SerializerFeature[] {
+            // 字符类型字段如果为null，输出为""，而不是null
+//            SerializerFeature.WriteNullStringAsEmpty,
+            // 数值字段如果为null，输出为0，而不是null
+//            SerializerFeature.WriteNullNumberAsZero,
+            // Boolean字段如果为null，输出为false，而不是null
+//            SerializerFeature.WriteNullBooleanAsFalse,
+            // 枚举类型用ToString输出为
+//            SerializerFeature.WriteEnumUsingToString,
+            // 是否输出值为null的字段
+            // SerializerFeature.WriteMapNullValue,
+            // list字段如果为null，输出为[]，而不是null
+            // SerializerFeature.WriteNullListAsEmpty,
+            // 输出格式后的日期
+            SerializerFeature.WriteDateUseDateFormat,
+            // 禁用循环引用
+            SerializerFeature.DisableCircularReferenceDetect,
+            // 忽略错误的get
+            SerializerFeature.IgnoreErrorGetter,
+            // 输出格式化
+            // SerializerFeature.PrettyFormat
+    };
+
+    @Autowired
+    private FastJsonProperties fastJsonProperties;
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(0, fastJsonHttpMessageConverters());
+    }
+
+    public FastJsonHttpMessageConverter fastJsonHttpMessageConverters() {
+        // 转换器
+        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
+        // json配置
+        fastConverter.setFastJsonConfig(fastJsonConfig());
+        // 支持类型
+        fastConverter.setSupportedMediaTypes(MediaType.parseMediaTypes(MediaType.APPLICATION_JSON_VALUE));
+        return fastConverter;
+    }
+
+    public FastJsonConfig fastJsonConfig() {
+        // 自定义配置
+        FastJsonConfig fastJsonConfig = new FastJsonConfig();
+        // 序列化
+        fastJsonConfig.setSerializerFeatures(serializerFeatures);
+        // 日期
+        fastJsonConfig.setDateFormat(fastJsonProperties.getDateFormat());
+        // 精度
+        SerializeConfig serializeConfig = SerializeConfig.globalInstance;
+        serializeConfig.put(Long.class, ToStringSerializer.instance);
+        serializeConfig.put(Long.TYPE, ToStringSerializer.instance);
+        serializeConfig.put(BigInteger.class, ToStringSerializer.instance);
+        fastJsonConfig.setSerializeConfig(serializeConfig);
+        return fastJsonConfig;
+    }
+}