notice

src/main/java/common/controller/NoticeController.java

@@ -40,10 +40,10 @@ public class NoticeController {
         return ResultModel.OK(noticeService.findAll(user));
         }
 
-    @RequestMapping(value = "read/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "read", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel loginCheck(@PathVariable Long id) {
-        return ResultModel.OK(noticeService.read(id));
+    public ResultModel loginCheck(@CurrentAccount User user) {
+        return ResultModel.OK(noticeService.read(user));
     }
 
 }

src/main/java/common/controller/UserController.java

@@ -2,12 +2,14 @@ package common.controller;
 
 import common.model.Menu;
 import common.model.User;
+import common.repository.UserRepository;
 import common.service.MenuService;
 import common.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
+import util.CipherUtil;
 import util.ResultModel;
 
 import javax.servlet.http.HttpServletResponse;
@@ -17,11 +19,14 @@ import java.util.List;
  * Created by mxq on 2017/12/21.
  */
 @Controller
-@RequestMapping("user")
+@RequestMapping("system/user")
 public class UserController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    UserRepository userRepository;
+
 
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ResponseBody
@@ -51,20 +56,32 @@ public class UserController {
         return ResultModel.OK();
     }
 
-    @RequestMapping(value = "/update/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/update/name", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel updateName(@CurrentAccount User loginAccount, @RequestParam String name, @PathVariable Long id) {
-        userService.updateName(loginAccount, id, name);
-        return ResultModel.OK();
+    public ResultModel updateName(@CurrentAccount User loginAccount, @RequestParam String name) {
+        User login = userRepository.login(name);
+        if(null == login){
+            userService.updateName(loginAccount, name);
+            return ResultModel.OK(true);
+        }else{
+            return ResultModel.OK(false);
+        }
+
     }
 
-    @RequestMapping(value = "/update/{id}/pwd", method = RequestMethod.PUT)
+    @RequestMapping(value = "/update/password", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel updatePwd(@CurrentAccount User loginAccount, @RequestParam String pwd, @PathVariable Long id) {
-        userService.updatePwd(loginAccount, id, pwd);
-        return ResultModel.OK();
+    public ResultModel updatePwd(@CurrentAccount User loginAccount, @RequestParam String pwd, @RequestParam String oldpwd) {
+        User login = userRepository.login(loginAccount.getEmail(), CipherUtil.generatePassword(oldpwd));
+        if(null != login){
+            userService.updatePwd(loginAccount, pwd);
+            return ResultModel.OK(true);
+        }else{
+            return ResultModel.OK(false);
+        }
     }
 
+    //忘记密码时，修改密码
     @RequestMapping(value = "/update/pwd", method = RequestMethod.PUT)
     @ResponseBody
     public ResultModel updatePwd(@RequestParam String email, @RequestParam String pwd) {
@@ -72,17 +89,18 @@ public class UserController {
         return ResultModel.OK(userService.updatePwd(email, pwd));
     }
 
-    @RequestMapping(value = "forget/", method = RequestMethod.GET)
+    //忘记密码时，发送验证码
+    @RequestMapping(value = "/code", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel sengCode(@RequestParam String email) {
 
         return ResultModel.OK(userService.sendCode(email));
     }
 
-    @RequestMapping(value = "valid/code", method = RequestMethod.GET)
+    //验证码验证
+    @RequestMapping(value = "/update/pwd", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel validCode(@RequestParam String email, @RequestParam String code) {
-        userService.validCode(email, code);
-        return ResultModel.OK();
+    public ResultModel validCode(@RequestParam String email, @RequestParam String code, @RequestParam String pwd) {
+        return ResultModel.OK(userService.validCode(email, code, pwd));
     }
 }

src/main/java/common/repository/NoticeRepository.java

@@ -14,4 +14,6 @@ public interface NoticeRepository extends JpaRepository<Notice, Long> {
     @Query(value="select * from notice where user = ?1 and ds >= ?2",nativeQuery=true)
     List<Notice> findall(Long user, String ds);
 
+    @Query(value="select * from notice where user = ?1",nativeQuery=true)
+    List<Notice> findall(Long user);
 }

src/main/java/common/service/NoticeService.java

@@ -12,5 +12,5 @@ public interface NoticeService {
 
     List<Notice> findAll(User user);
 
-    Notice read(Long id);
+    Boolean read(User user);
 }

src/main/java/common/service/UserService.java

@@ -18,13 +18,13 @@ public interface UserService {
 
     User delete(User login, Long id);
 
-    User updateName(User login, Long id, String name);
+    User updateName(User login, String name);
 
-    User updatePwd(User login, Long id, String pwd);
+    User updatePwd(User login, String pwd);
 
     User updatePwd(String email, String pwd);
 
     Boolean sendCode(String email);
 
-    String validCode(String email, String code);
+    String validCode(String email, String code, String pwd);
 }

src/main/java/common/service/impl/NoticeServiceImpl.java

@@ -7,7 +7,9 @@ import common.service.NoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import util.DateUtil;
+import util.ValidateUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,9 +29,17 @@ public class NoticeServiceImpl implements NoticeService {
     }
 
     @Override
-    public Notice read(Long id) {
-        Notice one = noticeRepository.findOne(id);
-        one.setNotRead(false);
-        return noticeRepository.save(one);
+    public Boolean read(User user) {
+        List<Notice> noticeList = noticeRepository.findall(user.getId());
+        if(ValidateUtil.isValid(noticeList)){
+            List<Notice> notices = new ArrayList<>();
+            for (Notice n : noticeList){
+                n.setNotRead(false);
+                notices.add(n);
+            }
+            noticeRepository.save(notices);
+        }
+
+        return true;
     }
 }

src/main/java/common/service/impl/UserServiceImpl.java

@@ -94,8 +94,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public User updateName(User login, Long id, String name) {
-        User one = userRepository.findOne(id);
+    public User updateName(User login, String name) {
+        User one = userRepository.findOne(login.getId());
         one.setName(name);
         one.setModifyTime(new Date());
         one.setModifyAccount(login.getId());
@@ -103,8 +103,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public User updatePwd(User login, Long id, String pwd) {
-        User one = userRepository.findOne(id);
+    public User updatePwd(User login, String pwd) {
+        User one = userRepository.findOne(login.getId());
         one.setPassword(CipherUtil.generatePassword(pwd));
         one.setModifyTime(new Date());
         one.setModifyAccount(login.getId());
@@ -122,6 +122,10 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public Boolean sendCode(String email) {
+        User user = userRepository.login(email);
+        if(null == user){
+            return false;
+        }
         String code = CharacterUtils.getRandomString(4);
         List<String> list = new ArrayList<>();
         list.add(email);
@@ -140,15 +144,20 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String validCode(String email, String code) {
-        Code valid = codeRepository.findValid(email, new Date());
+    public String validCode(String email, String code, String pwd) {
+        Calendar beforeTime = Calendar.getInstance();
+        beforeTime.add(Calendar.MINUTE, -5);// 5分钟之前的时间
+        Date beforeD = beforeTime.getTime();
+
+        Code valid = codeRepository.findValid(email, beforeD);
         if(null != valid){
             boolean b = valid.getCode().equals(code);
             if(b){
+                updatePwd(email, pwd);
                 return "true";
             }
             return "false";
         }
-        return "invalid";
+        return "false";
     }
 }

src/main/java/security/interceptor/AuthorizationInterceptor.java

@@ -39,7 +39,10 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
 
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         //放开登录
-        if (request.getRequestURL().indexOf("login/login") != -1){
+        if (request.getRequestURL().indexOf("login/login") != -1
+                || request.getRequestURL().indexOf("update/pwd") != -1
+                || request.getRequestURL().indexOf("user/forget") != -1
+                || request.getRequestURL().indexOf("user/code") != -1){
             return true;
         }
         //从header中得到token

src/main/java/tkio/task/NoticeTask.java

@@ -101,7 +101,7 @@ public class NoticeTask {
                     Notice notice = new Notice();
                     notice.setUser(id);
                     notice.setPlatform("tkio");
-                    notice.setContent("tkio有" + num + "个客户过期,请及时联系客户");
+                    notice.setContent("今日tkio有" + num + "个客户过期,请及时联系客户");
                     notice.setDs(today);
                     notice.setNotRead(true);
                     list.add(notice);

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -11,6 +11,7 @@ common\model\Auth.class
 tkio\repository\AccountRepository.class
 common\model\Menu.class
 track\repository\TrackAppRepository.class
+common\service\impl\NoticeServiceImpl.class
 exception\GlobalExceptionAdvice.class
 tkio\model\Campaign.class
 security\RedisTokenManager.class
@@ -54,6 +55,7 @@ common\repository\MenuRepository.class
 common\model\City.class
 common\service\impl\AppServiceImpl.class
 common\repository\ReminderRepository.class
+common\controller\NoticeController.class
 util\StringUtil.class
 track\model\Channel.class
 track\model\Campaign.class
@@ -75,7 +77,6 @@ tkio\service\AccountFlowRestrictService.class
 util\UserLogThread.class
 tkio\model\DataAuth.class
 common\model\KeyValue.class
-common\model\Test.class
 common\repository\UserRepository.class
 track\repository\TrackCampaignRepository.class
 util\ResultModel.class
@@ -87,6 +88,7 @@ security\resolvers\LoginUserMethodArgumentsResolver.class
 tkio\service\TkioAccountService.class
 common\model\TrackAccount4Web.class
 common\repository\NoticeRepository.class
+common\service\NoticeService.class
 common\model\RoleType.class
 tkio\task\AccountTask.class
 security\annotation\Authorization.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -34,6 +34,7 @@ E:\newgit\manager\src\main\java\security\AbstractTokenManager.java
 E:\newgit\manager\src\main\java\util\CharacterUtils.java
 E:\newgit\manager\src\main\java\common\repository\Account4WebRepository.java
 E:\newgit\manager\src\main\java\track\model\Account.java
+E:\newgit\manager\src\main\java\common\controller\NoticeController.java
 E:\newgit\manager\src\main\java\tkio\repository\PackageTypeRepository.java
 E:\newgit\manager\src\main\java\common\service\UserLogService.java
 E:\newgit\manager\src\main\java\common\repository\MenuRepository.java
@@ -72,6 +73,7 @@ E:\newgit\manager\src\main\java\common\model\Email.java
 E:\newgit\manager\src\main\java\common\repository\ReminderRepository.java
 E:\newgit\manager\src\main\java\common\model\RoleType.java
 E:\newgit\manager\src\main\java\exception\TipException.java
+E:\newgit\manager\src\main\java\common\service\impl\NoticeServiceImpl.java
 E:\newgit\manager\src\main\java\track\repository\TrackChannelRepository.java
 E:\newgit\manager\src\main\java\tkio\model\App.java
 E:\newgit\manager\src\main\java\track\model\Channel.java
@@ -81,7 +83,6 @@ E:\newgit\manager\src\main\java\security\TokenManager.java
 E:\newgit\manager\src\main\java\common\repository\CodeRepository.java
 E:\newgit\manager\src\main\java\dic\OperateObjectTypeEnum.java
 E:\newgit\manager\src\main\java\util\HttpClientUtil.java
-E:\newgit\manager\src\main\java\common\model\Test.java
 E:\newgit\manager\src\main\java\tkio\model\Auth.java
 E:\newgit\manager\src\main\java\common\repository\AppInfoRepository.java
 E:\newgit\manager\src\main\java\track\model\App.java
@@ -117,5 +118,6 @@ E:\newgit\manager\src\main\java\common\model\City.java
 E:\newgit\manager\src\main\java\common\model\AppCategory.java
 E:\newgit\manager\src\main\java\common\model\Reminder.java
 E:\newgit\manager\src\main\java\tkio\repository\SalesManLeaderRepository.java
+E:\newgit\manager\src\main\java\common\service\NoticeService.java
 E:\newgit\manager\src\main\java\tkio\model\IsNotified.java
 E:\newgit\manager\src\main\java\util\IP.java