根据token获取用户最新信息

src/main/java/com/miekir/shibei/bean/db/GoodsBean.java

@@ -88,14 +88,14 @@ public class GoodsBean {
      * 赞的数量
      */
     @Basic
-    @Column(name = "dingNum", nullable = true, insertable = true, updatable = true)
+    @Column(name = "dingNum", nullable = true, insertable = true, updatable = true, columnDefinition = "int default 0")
     public int dingNum;
 
     /**
      * 踩的数量
      */
     @Basic
-    @Column(name = "caiNum", nullable = true, insertable = true, updatable = true)
+    @Column(name = "caiNum", nullable = true, insertable = true, updatable = true, columnDefinition = "int default 0")
     public int caiNum;
 
     /**
@@ -141,14 +141,14 @@ public class GoodsBean {
      * 创建时间
      */
     @Basic
-    @Column(name = "createTimeMillis", nullable = true, insertable = true, updatable = true)
+    @Column(name = "createTimeMillis", nullable = true, insertable = true, updatable = true, columnDefinition = "bigint default 0")
     public long createTimeMillis;
 
     /**
      * 更新时间
      */
     @Basic
-    @Column(name = "updateTimeMillis", nullable = true, insertable = true, updatable = true)
+    @Column(name = "updateTimeMillis", nullable = true, insertable = true, updatable = true, columnDefinition = "bigint default 0")
     public long updateTimeMillis;
 
     @Basic
@@ -159,9 +159,17 @@ public class GoodsBean {
      * 浏览次数
      */
     @Basic
-    @Column(name = "seeNum", nullable = true, insertable = true, updatable = true)
+    @Column(name = "seeNum", nullable = true, insertable = true, updatable = true, columnDefinition = "bigint default 0")
     public Long seeNum;
 
+    //columnDefinition = "int default 0"
+    /**
+     * 收藏次数
+     */
+    @Basic
+    @Column(name = "favNum", nullable = true, insertable = true, updatable = true, columnDefinition = "bigint default 0")
+    public Long favNum;
+
     /**是否是本地写死的数据*/
     @Basic
     @Column(name = "isLocal", nullable = true, insertable = true, updatable = true)

src/main/java/com/miekir/shibei/controller/api/CouponController.java

@@ -34,7 +34,7 @@ public class CouponController {
     @Autowired
     private SystemRepository systemRepository;
 
-    private Random mRandom = new Random();
+    private final Random mRandom = new Random();
 
     /**
      * 新增和更新优惠券
@@ -137,7 +137,6 @@ public class CouponController {
             return JSON.toJSONString(responseResult);
         }
 
-
         File photoDir = new File(FileTool.TARGET_DIR_AUTO_IMAGES);
         String[] nameArray = photoDir.list();
         if (nameArray == null || nameArray.length == 0) {

src/main/java/com/miekir/shibei/controller/api/GoodsController.java

@@ -31,7 +31,7 @@ public class GoodsController {
     @Autowired
     private SystemRepository systemRepository;
 
-    private Random mRandom = new Random();
+    private final Random mRandom = new Random();
 
     /**
      * 新增和更新京东商品

src/main/java/com/miekir/shibei/controller/api/UserController.java

@@ -16,10 +16,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -241,8 +238,11 @@ public class UserController {
      */
     @RequestMapping(value = "/api/login/token", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
     @ResponseBody
-    public String loginToken(String email, String token) {
-        ResponseResult responseResult = new ResponseResult();
+    public String loginToken(@RequestHeader HttpHeaders header) {
+        String token = header.getFirst("token");
+        String email = header.getFirst("email");
+
+        ResponseResult<User> responseResult = new ResponseResult<User>();
         responseResult.setMessage("请重新登录");
         User user = userRepository.findUserByEmail(email);
         if (user == null || !TextUtils.equals(token, user.getToken())) {
@@ -251,7 +251,8 @@ public class UserController {
             responseResult.setCode(ResultCode.FAILED_NEED_RE_LOGIN);
         }
 
-        responseResult.setMessage("token登录成功");
+        responseResult.setContent(user);
+        responseResult.setMessage("登录成功");
         responseResult.setCode(ResultCode.SUCCESS);
         return JSON.toJSONString(responseResult);
     }

src/main/java/com/miekir/shibei/controller/task/CrawlerService.java

@@ -32,8 +32,8 @@ public class CrawlerService {
     @PostConstruct
     public void init() {
         // 调试的时候会执行两次，真正部署时其实是执行一次
-        // 一启动完成就开始去爬虫
-        Executors.newSingleThreadExecutor().submit(new Runnable() {
+        // todo 一启动完成就开始去爬虫
+        /*Executors.newSingleThreadExecutor().submit(new Runnable() {
             @Override
             public void run() {
                 // 递归会导致StackOverflowError，所以用循环代替
@@ -42,6 +42,6 @@ public class CrawlerService {
                     shouldContinue = Sex8Tool.startGettingData(CrawlerService.this);
                 }
             }
-        });
+        });*/
     }
 }