休息时间到。代码优化

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

@@ -36,6 +36,65 @@ public class CouponController {
 
     private final Random mRandom = new Random();
 
+    /**
+     * 查询优惠券
+     */
+    @RequestMapping(value = "/api/getCouponList", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
+    @ResponseBody
+    public String getCouponList(int pageNum, int pageSize) {
+        ResponseResult<List<String>> responseResult = new ResponseResult<List<String>>();
+        responseResult.setMessage("获取失败");
+
+        // 关闭通道
+        SystemBean systemBean = systemRepository.findSystemBean();
+        if (systemBean != null && systemBean.isVipLimit) {
+            responseResult.setMessage("休息时间到");
+            return JSON.toJSONString(responseResult);
+        }
+
+        File photoDir = new File(FileTool.TARGET_DIR_AUTO_IMAGES);
+        String[] nameArray = photoDir.list();
+        if (nameArray == null || nameArray.length == 0) {
+            responseResult.setMessage("没有找到图片");
+            return JSON.toJSONString(responseResult);
+        }
+
+        List<String> photoUrlList = new ArrayList<String>();
+        int maxPageNum = nameArray.length - pageSize + 1;
+        // 如果只有一页，就把所有的返回去
+        if (maxPageNum <= 1) {
+            for (String s : nameArray) {
+                photoUrlList.add(String.format(FileTool.FORMATTER_IMAGE_URL, s));
+            }
+
+            responseResult.setContent(photoUrlList);
+            responseResult.setCode(ResultCode.SUCCESS);
+            responseResult.setMessage("获取成功");
+            return JSON.toJSONString(responseResult);
+        }
+
+        int randomPageNum = mRandom.nextInt(maxPageNum);
+        for (int i = 0; i < pageSize; i++) {
+            photoUrlList.add(String.format(FileTool.FORMATTER_IMAGE_URL, nameArray[randomPageNum+i]));
+        }
+
+        responseResult.setContent(photoUrlList);
+        responseResult.setCode(ResultCode.SUCCESS);
+        responseResult.setMessage("获取成功");
+        return JSON.toJSONString(responseResult);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 新增和更新优惠券
      */
@@ -120,52 +179,4 @@ public class CouponController {
         responseResult.setMessage("删除成功");
         return JSON.toJSONString(responseResult);
     }
-
-    /**
-     * 查询优惠券
-     */
-    @RequestMapping(value = "/api/getCouponList", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
-    @ResponseBody
-    public String getCouponList(int pageNum, int pageSize) {
-        ResponseResult<List<String>> responseResult = new ResponseResult<List<String>>();
-        responseResult.setMessage("获取失败");
-
-        // 关闭通道
-        SystemBean systemBean = systemRepository.findSystemBean();
-        if (systemBean != null && systemBean.isVipLimit) {
-            responseResult.setMessage("休息时间到");
-            return JSON.toJSONString(responseResult);
-        }
-
-        File photoDir = new File(FileTool.TARGET_DIR_AUTO_IMAGES);
-        String[] nameArray = photoDir.list();
-        if (nameArray == null || nameArray.length == 0) {
-            responseResult.setMessage("没有找到图片");
-            return JSON.toJSONString(responseResult);
-        }
-
-        List<String> photoUrlList = new ArrayList<String>();
-        int maxPageNum = nameArray.length - pageSize + 1;
-        // 如果只有一页，就把所有的返回去
-        if (maxPageNum <= 1) {
-            for (String s : nameArray) {
-                photoUrlList.add(String.format(FileTool.FORMATTER_IMAGE_URL, s));
-            }
-
-            responseResult.setContent(photoUrlList);
-            responseResult.setCode(ResultCode.SUCCESS);
-            responseResult.setMessage("获取成功");
-            return JSON.toJSONString(responseResult);
-        }
-
-        int randomPageNum = mRandom.nextInt(maxPageNum);
-        for (int i = 0; i < pageSize; i++) {
-            photoUrlList.add(String.format(FileTool.FORMATTER_IMAGE_URL, nameArray[randomPageNum+i]));
-        }
-
-        responseResult.setContent(photoUrlList);
-        responseResult.setCode(ResultCode.SUCCESS);
-        responseResult.setMessage("获取成功");
-        return JSON.toJSONString(responseResult);
-    }
 }

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

@@ -48,7 +48,7 @@ public class GoodsController {
      */
     @RequestMapping(value = "/api/revertGoodsEnable", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
     @ResponseBody
-    public String addGoods(@RequestHeader HttpHeaders header, Long goodsId) {
+    public String revertGoodsEnable(@RequestHeader HttpHeaders header, Long goodsId) {
         ResponseResult<String> responseResult = new ResponseResult<String>();
         responseResult.setMessage("操作失败");
 
@@ -113,8 +113,6 @@ public class GoodsController {
             return JSON.toJSONString(responseResult);
         }
 
-
-
         // 删除插图
         Set<String> contentImageList = dbGoodsBean.contentImageUrlList;
         if (contentImageList != null && contentImageList.size() > 0) {
@@ -305,7 +303,7 @@ public class GoodsController {
     }
 
     /**
-     * 查询京东商品
+     * 浏览帖子
      */
     @RequestMapping(value = "/api/seeGoods", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
     @ResponseBody
@@ -344,6 +342,13 @@ public class GoodsController {
             return JSON.toJSONString(responseResult);
         }
 
+        // 关闭通道
+        SystemBean systemBean = systemRepository.findSystemBean();
+        if (systemBean != null && systemBean.isVipLimit) {
+            responseResult.setMessage("休息时间到");
+            return JSON.toJSONString(responseResult);
+        }
+
         String fileName = "";
         String fileUrl = "";
         try {
@@ -396,6 +401,12 @@ public class GoodsController {
             return null;
         }
 
+        // 关闭通道
+        SystemBean systemBean = systemRepository.findSystemBean();
+        if (systemBean != null && systemBean.isVipLimit) {
+            return null;
+        }
+
         String token = null;
         String fileName = null;
         String fileUrl = null;

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

@@ -44,59 +44,6 @@ public class SystemController {
     @Autowired
     private SystemRepository systemRepository;
 
-    /**
-     * 意见反馈
-     */
-    @RequestMapping(value = "/api/feedback", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
-    @ResponseBody
-    public String dealFeedback(String email, String token, String feedback) {
-        ResponseResult<String> responseResult = new ResponseResult<String>();
-        responseResult.setCode(ResultCode.FAILED_COMMON);
-        responseResult.setMessage("反馈失败");
-
-        Feedback feedbackBean = new Feedback();
-        feedbackBean.setEmail(email);
-        feedbackBean.setFeedback(feedback);
-        feedbackBean.setTime(System.currentTimeMillis());
-
-        // 开始重设密码，插入数据库
-        try {
-            feedbackRepository.save(feedbackBean);
-            responseResult.setCode(ResultCode.SUCCESS);
-            responseResult.setMessage("反馈成功");
-        } catch (Exception e) {
-            responseResult.setMessage("反馈失败");
-            e.printStackTrace();
-        }
-
-        try {
-            // 同时发送邮件
-            new EmailTool().sendEmail("吾记反馈：" + "【From: " + email + "】" + feedback, ServerConstants.EMAIL_ADMIN);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return JSON.toJSONString(responseResult);
-    }
-
-    @RequestMapping(value = "/api/upgrade", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
-    public ResponseEntity<byte[]> download(HttpServletRequest request) throws IOException {
-        // 放到D:\\software\\apache-tomcat-7.0.90\\webapps\\wuji\\upgrade\\wuji.apk
-        // 获取的时候，就是访问这个URL：http://www.xxx.com/api/upgrade
-        // 需要正式发布才起作用
-        String webPath = request.getSession().getServletContext().getRealPath("upgrade") + File.separator + "wuji.apk";
-        File file = new File(webPath);
-        byte[] body = null;
-        InputStream is = new FileInputStream(file);
-        body = new byte[is.available()];
-        is.read(body);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Disposition", "attchement;filename=" + file.getName());
-        HttpStatus statusCode = HttpStatus.OK;
-        ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, statusCode);
-        return entity;
-    }
-
     /**
      * 查询系统设置
      */
@@ -195,4 +142,61 @@ public class SystemController {
         responseResult.setMessage("获取成功");
         return JSON.toJSONString(responseResult);
     }
+
+
+
+
+
+    /**
+     * 意见反馈
+     */
+    @RequestMapping(value = "/api/feedback", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
+    @ResponseBody
+    public String dealFeedback(String email, String token, String feedback) {
+        ResponseResult<String> responseResult = new ResponseResult<String>();
+        responseResult.setCode(ResultCode.FAILED_COMMON);
+        responseResult.setMessage("反馈失败");
+
+        Feedback feedbackBean = new Feedback();
+        feedbackBean.setEmail(email);
+        feedbackBean.setFeedback(feedback);
+        feedbackBean.setTime(System.currentTimeMillis());
+
+        // 开始重设密码，插入数据库
+        try {
+            feedbackRepository.save(feedbackBean);
+            responseResult.setCode(ResultCode.SUCCESS);
+            responseResult.setMessage("反馈成功");
+        } catch (Exception e) {
+            responseResult.setMessage("反馈失败");
+            e.printStackTrace();
+        }
+
+        try {
+            // 同时发送邮件
+            new EmailTool().sendEmail("吾记反馈：" + "【From: " + email + "】" + feedback, ServerConstants.EMAIL_ADMIN);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return JSON.toJSONString(responseResult);
+    }
+
+    @RequestMapping(value = "/api/upgrade", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
+    public ResponseEntity<byte[]> download(HttpServletRequest request) throws IOException {
+        // 放到D:\\software\\apache-tomcat-7.0.90\\webapps\\wuji\\upgrade\\wuji.apk
+        // 获取的时候，就是访问这个URL：http://www.xxx.com/api/upgrade
+        // 需要正式发布才起作用
+        String webPath = request.getSession().getServletContext().getRealPath("upgrade") + File.separator + "wuji.apk";
+        File file = new File(webPath);
+        byte[] body = null;
+        InputStream is = new FileInputStream(file);
+        body = new byte[is.available()];
+        is.read(body);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Disposition", "attchement;filename=" + file.getName());
+        HttpStatus statusCode = HttpStatus.OK;
+        ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, statusCode);
+        return entity;
+    }
 }

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

@@ -58,120 +58,6 @@ public class UserController {
         }
     }
 
-    // 添加@ResponseBody注解就可以返回json了
-    /**
-     * 获取验证码，返回aes给客户端
-     */
-    @RequestMapping(value = "/api/code", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
-    @ResponseBody
-    public String getAuthCode(String email) {
-        ResponseResult<Boolean> responseResult = new ResponseResult<Boolean>();
-        responseResult.setContent(false);
-        responseResult.setMessage("获取验证码失败");
-        String code = CodeGenerator.getInstance().getRandomCode();
-        int result = new EmailTool().sendEmail("伊甸园温馨提醒您，您的6位验证码(5分钟内有效)是：" + code, email);
-        if (result == EmailTool.SUCCESS) {
-            mCodeMap.put(email, System.currentTimeMillis()+"-"+code);
-            responseResult.setCode(ResultCode.SUCCESS);
-            responseResult.setMessage("获取验证码成功");
-            responseResult.setContent(true);
-            responseResult.setExtra(SecureManager.KEY_FOR_CLIENT + "=" + SecureManager.IV_FOR_CLIENT);
-        } else {
-            responseResult.setCode(ResultCode.FAILED_COMMON);
-            responseResult.setMessage("获取验证码失败");
-        }
-        return JSON.toJSONString(responseResult);
-    }
-
-    /**
-     * 注册
-     */
-    @RequestMapping(value = "/api/register", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
-    @ResponseBody
-    public String register(@RequestBody Map<String, Object> registerMap) {
-        ResponseResult<User> responseResult = new ResponseResult<User>();
-        responseResult.setCode(ResultCode.FAILED_COMMON);
-        responseResult.setMessage("注册失败");
-
-        if (registerMap == null) {
-            return JSON.toJSONString(responseResult);
-        }
-
-        String email = String.valueOf(registerMap.get("email"));
-        String code = String.valueOf(registerMap.get("code"));
-        String password = String.valueOf(registerMap.get("password"));
-        String nickname = String.valueOf(registerMap.get("nickname"));
-        String cashAccount = String.valueOf(registerMap.get("cashAccount"));
-
-        // 从数据库查询，如果没有这个email并且不在黑名单里，才可以继续注册
-        User dbUser = userRepository.findUserByEmail(email);
-        if (dbUser != null) {
-            responseResult.setCode(ResultCode.FAILED_USER_ALREADY_EXIST);
-            responseResult.setMessage("该邮箱已被使用");
-            return JSON.toJSONString(responseResult);
-        }
-
-        // 查看是否已发送验证码
-        if (!mCodeMap.containsKey(email)) {
-            responseResult.setMessage("请重新获取验证码");
-            return JSON.toJSONString(responseResult);
-        }
-
-        // 查看服务器发送的验证码和用户发过来的验证码是否一致
-        String content = mCodeMap.get(email);
-        String realCode = content.substring(content.indexOf("-")+1);
-        if (!code.equals(realCode)) {
-            responseResult.setMessage("验证码错误");
-            return JSON.toJSONString(responseResult);
-
-        }
-
-        // 开始注册，插入数据库
-        User user = new User();
-        user.setEmail(email);
-        user.setNickName(nickname);
-        user.setRegisterTimeMillis(System.currentTimeMillis());
-        user.setPassword(password);
-        user.setCashAccount(cashAccount);
-        try {
-            String token = TokenGenerator.getInstance().getToken(email);
-            if (token == null || token.equals("")) {
-                responseResult.setMessage("注册失败，请检查数据格式");
-                return JSON.toJSONString(responseResult);
-            }
-
-            // 注册成功，生成token给用户
-            user.setToken(token);
-            userRepository.save(user);
-
-            user.setPassword("");
-            responseResult.setCode(ResultCode.SUCCESS);
-            responseResult.setMessage("注册成功");
-            responseResult.setContent(user);
-
-            // 注册成功，从内存中移除相应的验证码，节省资源
-            mCodeMap.remove(email);
-
-        } catch (Exception e) {
-            responseResult.setMessage("注册失败，请检查数据格式");
-            e.printStackTrace();
-        }
-
-        return JSON.toJSONString(responseResult);
-    }
-
-    /**
-     * 登录之前先获取AES
-     */
-    @RequestMapping(value = "/api/aes", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
-    @ResponseBody
-    public String getAES() {
-        ResponseResult responseResult = new ResponseResult();
-        responseResult.setExtra(SecureManager.KEY_FOR_CLIENT + "=" + SecureManager.IV_FOR_CLIENT);
-        responseResult.setCode(ResultCode.SUCCESS);
-        return JSON.toJSONString(responseResult);
-    }
-
     /**
      * 登录：email+加密的密码
      */
@@ -235,12 +121,37 @@ public class UserController {
         }
     }
 
+    /**
+     * 登录：email+token
+     */
+    @RequestMapping(value = "/api/login/token", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
+    @ResponseBody
+    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())) {
+            // 拿到token就可以拿到token的有效时间，以后可以做过期校验
+            responseResult.setMessage("请重新登录");
+            responseResult.setCode(ResultCode.FAILED_NEED_RE_LOGIN);
+            return JSON.toJSONString(responseResult);
+        }
+
+        responseResult.setContent(user);
+        responseResult.setMessage("登录成功");
+        responseResult.setCode(ResultCode.SUCCESS);
+        return JSON.toJSONString(responseResult);
+    }
+
     /**
      * 设置为VIP
      */
     @RequestMapping(value = "/api/setVip", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
     @ResponseBody
-    public String setApiConfig(@RequestHeader HttpHeaders header, String email) {
+    public String setVip(@RequestHeader HttpHeaders header, String email) {
         ResponseResult<String> responseResult = new ResponseResult<String>();
         responseResult.setMessage("设置失败");
         if (!RequestTool.isRequestAdminValid(header, userRepository)) {
@@ -270,28 +181,89 @@ public class UserController {
 
 
 
+
+
+
+
+
+
+
+
+
     /**
-     * 登录：email+token
+     * 注册
      */
-    @RequestMapping(value = "/api/login/token", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
+    @RequestMapping(value = "/api/register", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
     @ResponseBody
-    public String loginToken(@RequestHeader HttpHeaders header) {
-        String token = header.getFirst("token");
-        String email = header.getFirst("email");
-
+    public String register(@RequestBody Map<String, Object> registerMap) {
         ResponseResult<User> responseResult = new ResponseResult<User>();
-        responseResult.setMessage("请重新登录");
-        User user = userRepository.findUserByEmail(email);
-        if (user == null || !TextUtils.equals(token, user.getToken())) {
-            // 拿到token就可以拿到token的有效时间，以后可以做过期校验
-            responseResult.setMessage("请重新登录");
-            responseResult.setCode(ResultCode.FAILED_NEED_RE_LOGIN);
+        responseResult.setCode(ResultCode.FAILED_COMMON);
+        responseResult.setMessage("注册失败");
+
+        if (registerMap == null) {
             return JSON.toJSONString(responseResult);
         }
 
-        responseResult.setContent(user);
-        responseResult.setMessage("登录成功");
-        responseResult.setCode(ResultCode.SUCCESS);
+        String email = String.valueOf(registerMap.get("email"));
+        String code = String.valueOf(registerMap.get("code"));
+        String password = String.valueOf(registerMap.get("password"));
+        String nickname = String.valueOf(registerMap.get("nickname"));
+        String cashAccount = String.valueOf(registerMap.get("cashAccount"));
+
+        // 从数据库查询，如果没有这个email并且不在黑名单里，才可以继续注册
+        User dbUser = userRepository.findUserByEmail(email);
+        if (dbUser != null) {
+            responseResult.setCode(ResultCode.FAILED_USER_ALREADY_EXIST);
+            responseResult.setMessage("该邮箱已被使用");
+            return JSON.toJSONString(responseResult);
+        }
+
+        // 查看是否已发送验证码
+        if (!mCodeMap.containsKey(email)) {
+            responseResult.setMessage("请重新获取验证码");
+            return JSON.toJSONString(responseResult);
+        }
+
+        // 查看服务器发送的验证码和用户发过来的验证码是否一致
+        String content = mCodeMap.get(email);
+        String realCode = content.substring(content.indexOf("-")+1);
+        if (!code.equals(realCode)) {
+            responseResult.setMessage("验证码错误");
+            return JSON.toJSONString(responseResult);
+
+        }
+
+        // 开始注册，插入数据库
+        User user = new User();
+        user.setEmail(email);
+        user.setNickName(nickname);
+        user.setRegisterTimeMillis(System.currentTimeMillis());
+        user.setPassword(password);
+        user.setCashAccount(cashAccount);
+        try {
+            String token = TokenGenerator.getInstance().getToken(email);
+            if (token == null || token.equals("")) {
+                responseResult.setMessage("注册失败，请检查数据格式");
+                return JSON.toJSONString(responseResult);
+            }
+
+            // 注册成功，生成token给用户
+            user.setToken(token);
+            userRepository.save(user);
+
+            user.setPassword("");
+            responseResult.setCode(ResultCode.SUCCESS);
+            responseResult.setMessage("注册成功");
+            responseResult.setContent(user);
+
+            // 注册成功，从内存中移除相应的验证码，节省资源
+            mCodeMap.remove(email);
+
+        } catch (Exception e) {
+            responseResult.setMessage("注册失败，请检查数据格式");
+            e.printStackTrace();
+        }
+
         return JSON.toJSONString(responseResult);
     }
 
@@ -445,4 +417,41 @@ public class UserController {
         responseResult.setCode(ResultCode.SUCCESS);
         return JSON.toJSONString(responseResult);
     }
+
+    /**
+     * 登录之前先获取AES
+     */
+    @RequestMapping(value = "/api/aes", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
+    @ResponseBody
+    public String getAES() {
+        ResponseResult responseResult = new ResponseResult();
+        responseResult.setExtra(SecureManager.KEY_FOR_CLIENT + "=" + SecureManager.IV_FOR_CLIENT);
+        responseResult.setCode(ResultCode.SUCCESS);
+        return JSON.toJSONString(responseResult);
+    }
+
+    // 添加@ResponseBody注解就可以返回json了
+    /**
+     * 获取验证码，返回aes给客户端
+     */
+    @RequestMapping(value = "/api/code", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
+    @ResponseBody
+    public String getAuthCode(String email) {
+        ResponseResult<Boolean> responseResult = new ResponseResult<Boolean>();
+        responseResult.setContent(false);
+        responseResult.setMessage("获取验证码失败");
+        String code = CodeGenerator.getInstance().getRandomCode();
+        int result = new EmailTool().sendEmail("伊甸园温馨提醒您，您的6位验证码(5分钟内有效)是：" + code, email);
+        if (result == EmailTool.SUCCESS) {
+            mCodeMap.put(email, System.currentTimeMillis()+"-"+code);
+            responseResult.setCode(ResultCode.SUCCESS);
+            responseResult.setMessage("获取验证码成功");
+            responseResult.setContent(true);
+            responseResult.setExtra(SecureManager.KEY_FOR_CLIENT + "=" + SecureManager.IV_FOR_CLIENT);
+        } else {
+            responseResult.setCode(ResultCode.FAILED_COMMON);
+            responseResult.setMessage("获取验证码失败");
+        }
+        return JSON.toJSONString(responseResult);
+    }
 }