詹子聪 пре 5 година
родитељ
комит
fe18ecb79f

+ 1 - 1
pom.xml

@@ -105,7 +105,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.48</version>
+            <version>1.2.73</version>
         </dependency>
 
         <!--发邮件-->

+ 3 - 0
src/main/java/com/miekir/shibei/bean/WeatherBean.java

@@ -1,5 +1,7 @@
 package com.miekir.shibei.bean;
 
+import com.alibaba.fastjson.annotation.JSONType;
+
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -7,6 +9,7 @@ package com.miekir.shibei.bean;
  * @date 2020/8/14 20:44
  * Description: 天气实体
  */
+@JSONType(orders={"code","msg","temperatureRange","temperatureNow","wind","air","desc"})
 public class WeatherBean {
     public int code = -1;
     public String msg;

+ 3 - 0
src/main/java/com/miekir/shibei/bean/YijiBean.java

@@ -1,5 +1,7 @@
 package com.miekir.shibei.bean;
 
+import com.alibaba.fastjson.annotation.JSONType;
+
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -7,6 +9,7 @@ package com.miekir.shibei.bean;
  * @date 2020/8/14 22:16
  * Description: 宜忌实体
  */
+@JSONType(orders={"code","msg","newDate","oldDate","hsDate","yi","ji"})
 public class YijiBean {
     public int code = -1;
     public String msg;

+ 5 - 4
src/main/java/com/miekir/shibei/controller/api/JsonController.java

@@ -1,6 +1,7 @@
 package com.miekir.shibei.controller.api;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.Feature;
 import com.miekir.shibei.bean.*;
 import com.miekir.shibei.repository.JsonRepository;
 import com.miekir.shibei.repository.UserRepository;
@@ -40,7 +41,7 @@ public class JsonController {
         WeatherBean weatherBean = new WeatherBean();
 
         // 根据token查找用户
-        User dbUserBean;
+        /*User dbUserBean;
         try {
             List<User> dbUserList = userRepository.findUserByToken(token);
             if (dbUserList != null && dbUserList.size() == 1) {
@@ -56,7 +57,7 @@ public class JsonController {
         }
 
         // todo 以后收费
-        /*if (!dbUserBean.isVip()) {
+        if (!dbUserBean.isVip()) {
             return "请更新客户端并开通服务后重试";
         }*/
 //        String currentDate = DateTool.getCurrentDate();
@@ -77,7 +78,7 @@ public class JsonController {
         YijiBean yijiBean = new YijiBean();
 
         // 根据token查找用户
-        User dbUserBean;
+        /*User dbUserBean;
         try {
             List<User> dbUserList = userRepository.findUserByToken(token);
             if (dbUserList != null && dbUserList.size() == 1) {
@@ -92,7 +93,7 @@ public class JsonController {
         }
 
         // todo 以后收费
-        /*if (!dbUserBean.isVip()) {
+        if (!dbUserBean.isVip()) {
             return "请更新客户端并开通服务后重试";
         }*/
         String currentDate = DateTool.getCurrentDate();