找回密码

danbai225 · danbai225 · commit 9ddddb1650d2 · 2020-07-29T19:08:31.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM openjdk:8-jre-alpine
 LABEL maintainer="db225@qq.com"
 
+RUN echo "Asia/Shanghai" > /etc/timezone
 ADD dbys.jar /bin/app/dbys.jar
 ADD /lib /bin/app/lib
 CMD exec java -Dloader.path="/bin/app/lib" -jar /bin/app/dbys.jar
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.danbai</groupId>
     <artifactId>ys</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <name>ys</name>
     <description>Demo project for Spring Boot</description>
     <properties>
diff --git a/src/main/java/com/danbai/ys/controller/MainController.java b/src/main/java/com/danbai/ys/controller/MainController.java
@@ -113,6 +113,12 @@ String reg() {
         return "reg";
     }
 
+    @RequestMapping(value = "/forgetpass", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(value = "注册视图")
+    String forgetPass() {
+        return "forgetPass";
+    }
+
     @RequestMapping(value = "/reg", produces = "text/plain;charset=UTF-8", method = RequestMethod.POST)
     @ApiOperation(value = "注册api")
     String regApi(User user, Model model, String yzm) {
diff --git a/src/main/java/com/danbai/ys/controller/restful/v1/User.java b/src/main/java/com/danbai/ys/controller/restful/v1/User.java
@@ -69,10 +69,16 @@ public BaseResult thisUserGkls(HttpServletRequest request,Token token,Boolean so
     public BaseResult token(com.danbai.ys.entity.User user){
         return ResultUtil.success(userService.login(user));
     }
+
     @DeleteMapping("/token")
     @ApiOperation(value ="退出登录删除token")
     public BaseResult exit(Token token){
         userService.deleteToken(token.getUsername());
         return ResultUtil.successOk();
     }
+    @PostMapping("/forgetPass")
+    @ApiOperation(value ="忘记密码通过邮箱修改")
+    public BaseResult forgetPass(com.danbai.ys.entity.User user,String yzm){
+        return ResultUtil.success(userService.forgetPass(user, yzm));
+    }
 }
diff --git a/src/main/java/com/danbai/ys/service/UserService.java b/src/main/java/com/danbai/ys/service/UserService.java
@@ -105,4 +105,12 @@ public interface UserService {
      * @return
      */
     Token login(User user);
+
+    /**
+     * 忘记密码通过邮箱修改
+     * @param user
+     * @param yzm
+     * @return
+     */
+    String forgetPass(User user,String yzm);
 }
diff --git a/src/main/java/com/danbai/ys/service/impl/RegisterValidateServiceImpl.java b/src/main/java/com/danbai/ys/service/impl/RegisterValidateServiceImpl.java
@@ -38,8 +38,8 @@ public void senValidate(String email) {
         for (int i = 0; i < MAXINT; i++) {
             yzm += String.valueOf(r.nextInt(10));
         }
-        String content = "欢迎注册淡白影视,您的验证码是:" + yzm + ",有效时间4分钟";
-        emailUtil.sendEmail("淡白影视注册邮件", content, email);
+        String content = "欢迎使用淡白影视,您的验证码是:" + yzm + ",有效时间4分钟";
+        emailUtil.sendEmail("淡白影视验证码邮件", content, email);
         redisTemplate.opsForValue().set(email, yzm, 4, TimeUnit.MINUTES);
         logger.info("向邮箱"+email+"发送验证邮件");
     }
diff --git a/src/main/java/com/danbai/ys/service/impl/UserServiceImpl.java b/src/main/java/com/danbai/ys/service/impl/UserServiceImpl.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.DigestUtils;
+import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.http.Cookie;
@@ -37,6 +38,7 @@ public class UserServiceImpl implements UserService {
     RegisterValidateServiceImpl registerValidateService;
     @Autowired
     RedisTemplate redisTemplate;
+
     @Override
     public User getUser(User user) {
         return userMapper.selectOne(user);
@@ -45,7 +47,7 @@ public User getUser(User user) {
     @Override
     public boolean addUser(User user) {
         if (userMapper.insert(user) > 0) {
-            logger.info("有新的用户啦!--"+user.getUsername());
+            logger.info("有新的用户啦!--" + user.getUsername());
             return true;
         }
         return false;
@@ -83,13 +85,13 @@ public boolean yzUser(User user, HttpServletRequest request, HttpServletResponse
             user1.setUsername(user.getUsername());
             User user2 = getUser(user1);
             if (user2 != null) {
-                if (DigestUtils.md5DigestAsHex((user.getUsername()+user.getPassword()).getBytes()).equals(user2.getPassword())) {
+                if (DigestUtils.md5DigestAsHex((user.getUsername() + user.getPassword()).getBytes()).equals(user2.getPassword())) {
                     HttpSession sessoin = request.getSession();
                     sessoin.setMaxInactiveInterval(60 * 60 * 24);
                     user2.setPassword("password");
                     sessoin.setAttribute("user", user2);
                     Cookie cookie = new Cookie("JSESSIONID", sessoin.getId());
-                    cookie.setMaxAge(60 * 60 * 24*7);
+                    cookie.setMaxAge(60 * 60 * 24 * 7);
                     response.addCookie(cookie);
                     return true;
                 }
@@ -106,7 +108,7 @@ public void reg(User user, Model model, String yzm) {
                 return;
             }
 
-            if(!Pattern.matches("^[\u4e00-\u9fa5_a-zA-Z0-9]+$",user.getUsername())){
+            if (!Pattern.matches("^[\u4e00-\u9fa5_a-zA-Z0-9]+$", user.getUsername())) {
                 model.addAttribute("message", "用户名不能有符号");
                 return;
             }
@@ -122,7 +124,7 @@ public void reg(User user, Model model, String yzm) {
                     return;
                 }
                 if (user1 == null) {
-                    user.setPassword(DigestUtils.md5DigestAsHex((user.getUsername()+user.getPassword()).getBytes()));
+                    user.setPassword(DigestUtils.md5DigestAsHex((user.getUsername() + user.getPassword()).getBytes()));
                     user.setUserType(1);
                     user.setHeadurl("http://gravatar.com/avatar/" + user.getUsername() + "?s=256&d=identicon");
                     if (addUser(user)) {
@@ -159,7 +161,7 @@ public String regapp(User user, String yzm) {
                     return JSON.toJSONString(map);
                 }
                 if (user1 == null) {
-                    user.setPassword(DigestUtils.md5DigestAsHex((user.getUsername()+user.getPassword()).getBytes()));
+                    user.setPassword(DigestUtils.md5DigestAsHex((user.getUsername() + user.getPassword()).getBytes()));
                     user.setUserType(1);
                     user.setHeadurl("http://gravatar.com/avatar/" + user.getUsername() + "?s=256&d=identicon");
                     if (addUser(user)) {
@@ -179,29 +181,29 @@ public String regapp(User user, String yzm) {
 
     @Override
     public Token createToken(String username) {
-        String tokenid= UUID.randomUUID().toString().replace ("-", "");
-        Token token=new Token(username,tokenid);
-        redisTemplate.opsForValue().set(Token.TOKEN+username,token,7,TimeUnit.DAYS);
+        String tokenid = UUID.randomUUID().toString().replace("-", "");
+        Token token = new Token(username, tokenid);
+        redisTemplate.opsForValue().set(Token.TOKEN + username, token, 7, TimeUnit.DAYS);
         return token;
     }
 
     @Override
     public boolean checkToken(Token token) {
-        if (token == null||token.getUsername()==null||token.getToken()==null||token.getUsername().length()<1|token.getToken().length()<1) {
+        if (token == null || token.getUsername() == null || token.getToken() == null || token.getUsername().length() < 1 | token.getToken().length() < 1) {
             return false;
         }
-        Token rtoken = (Token) redisTemplate.opsForValue().get(Token.TOKEN+token.getUsername());
-        if(rtoken!=null&&rtoken.getToken().equals(token.getToken())){
+        Token rtoken = (Token) redisTemplate.opsForValue().get(Token.TOKEN + token.getUsername());
+        if (rtoken != null && rtoken.getToken().equals(token.getToken())) {
             // 如果验证成功，说明此用户进行了一次有效操作，延长 token 的过期时间
-            redisTemplate.expire(Token.TOKEN+token.getUsername (),7, TimeUnit.DAYS);
+            redisTemplate.expire(Token.TOKEN + token.getUsername(), 7, TimeUnit.DAYS);
             return true;
         }
         return false;
     }
 
     @Override
     public void deleteToken(String username) {
-        redisTemplate.delete(Token.TOKEN+username);
+        redisTemplate.delete(Token.TOKEN + username);
     }
 
     @Override
@@ -211,10 +213,40 @@ public Token login(User user) {
             user1.setUsername(user.getUsername());
             User user2 = getUser(user1);
             if (user2 != null) {
-                if (DigestUtils.md5DigestAsHex((user.getUsername()+user.getPassword()).getBytes()).equals(user2.getPassword())) {
-                    return createToken(user.getUsername());                }
+                if (DigestUtils.md5DigestAsHex((user.getUsername() + user.getPassword()).getBytes()).equals(user2.getPassword())) {
+                    return createToken(user.getUsername());
+                }
             }
         }
         return null;
     }
+
+    @Override
+    public String forgetPass(User user, String yzm) {
+        if (StringUtils.isEmpty(yzm)) {
+            return "验证码不能为空";
+        }
+        if (user != null) {
+            String str = registerValidateService.getVerificationCode(user.getEmail());
+            if (str != null && str.equals(yzm)) {
+                registerValidateService.deleteVerificationCode(user.getEmail());
+                User user2 = new User();
+                user2.setUsername(user.getUsername());
+                User user1 = getUser(user2);
+                if (!user1.getEmail().equals(user.getEmail())) {
+                    return "用户名和邮箱不匹配";
+                }
+                user1.setPassword(DigestUtils.md5DigestAsHex((user.getUsername() + user.getPassword()).getBytes()));
+                if (userMapper.updateByPrimaryKey(user1) == 1) {
+                    //退出登录
+                    deleteToken(user1.getUsername());
+                    return "修改成功";
+                }
+
+            } else {
+                return "验证码有误";
+            }
+        }
+        return "请求数据有误，请检查";
+    }
 }
diff --git a/src/main/java/com/danbai/ys/utils/ResultUtil.java b/src/main/java/com/danbai/ys/utils/ResultUtil.java
@@ -22,7 +22,9 @@ public static <T> BaseResult<T> error(String errorMsg) {
     public static <T> BaseResult<T> error(Integer code, String errorMsg) {
         return commonResult(0, code, errorMsg, null);
     }
-
+    public static <T> BaseResult<T> success(String msg) {
+        return commonResult(1, 200, msg, null);
+    }
     private static <T> BaseResult<T> commonResult(Integer status, Integer code, String errMsg, T data) {
         BaseResult<T> result = new BaseResult<>();
         result.setStatus(status);
diff --git a/src/main/java/com/danbai/ys/websocket/CinemaSocketManagement.java b/src/main/java/com/danbai/ys/websocket/CinemaSocketManagement.java
@@ -168,7 +168,13 @@ public static void roomInfo(String socketId) {
         JSONObject roomJson = new JSONObject();
         roomJson.put("type", "roomInfo");
         CinemaSocket cinemaSocket = CinemaSocket.POOL.get(socketId);
+        if(cinemaSocket==null){
+            return;
+        }
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
+        if(room==null){
+            return;
+        }
         roomJson.put("id", room.getId());
         roomJson.put("name", room.getName());
         roomJson.put("online", room.getSockets().size());
@@ -189,7 +195,13 @@ public static void roomInfo(String socketId) {
 
     public static void sendChat(String socketId, String msg) {
         CinemaSocket cinemaSocket = CinemaSocket.POOL.get(socketId);
+        if(cinemaSocket==null){
+            return;
+        }
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
+        if(room==null){
+            return;
+        }
         JSONObject sendMsg = new JSONObject();
         sendMsg.put("type", "sendChat");
         sendMsg.put("id", Integer.parseInt(socketId, 16));
@@ -201,7 +213,13 @@ public static void sendChat(String socketId, String msg) {
 
     public static void sendUrl(String socketId, String url) {
         CinemaSocket cinemaSocket = CinemaSocket.POOL.get(socketId);
+        if(cinemaSocket==null){
+            return;
+        }
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
+        if(room==null){
+            return;
+        }
         if (room.getAuthorId().equals(socketId)) {
             CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId()).setUrl(url);
             JSONObject sendMsg = new JSONObject();
@@ -213,7 +231,13 @@ public static void sendUrl(String socketId, String url) {
 
     public static void sendTime(String socketId, double time) {
         CinemaSocket cinemaSocket = CinemaSocket.POOL.get(socketId);
+        if(cinemaSocket==null){
+            return;
+        }
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
+        if(room==null){
+            return;
+        }
         if (room.getAuthorId().equals(socketId)) {
             CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId()).setTime(time);
             JSONObject sendMsg = new JSONObject();
@@ -225,14 +249,19 @@ public static void sendTime(String socketId, double time) {
 
     public static void transfer(String socketId, String transferId) {
         CinemaSocket cinemaSocket = CinemaSocket.POOL.get(socketId);
+        if(cinemaSocket==null){
+            return;
+        }
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
+        if(room==null){
+            return;
+        }
         if (room.getAuthorId().equals(socketId)) {
             CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId()).setAuthorId(Integer.toHexString(Integer.valueOf(transferId)));
         }
     }
 
     public static void postTime(VideoTime videoTime, Token token){
-
         //与一起看无关  观看历史同步
         if(SpringUtil.getBean(UserServiceImpl.class).checkToken(token)){
             SpringUtil.getBean(YsServiceImpl.class).addYsTime(videoTime);
diff --git a/src/main/resources/templates/forgetPass.html b/src/main/resources/templates/forgetPass.html
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
diff --git a/src/main/resources/templates/reg.html b/src/main/resources/templates/reg.html

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,16 @@ public BaseResult thisUserGkls(HttpServletRequest request,Token token,Boolean so`
`69`	`69`	`public BaseResult token(com.danbai.ys.entity.User user){`
`70`	`70`	`return ResultUtil.success(userService.login(user));`
`71`	`71`	`}`
	`72`	`+`
`72`	`73`	`@DeleteMapping("/token")`
`73`	`74`	`@ApiOperation(value ="退出登录删除token")`
`74`	`75`	`public BaseResult exit(Token token){`
`75`	`76`	`userService.deleteToken(token.getUsername());`
`76`	`77`	`return ResultUtil.successOk();`
`77`	`78`	`}`
	`79`	`+ @PostMapping("/forgetPass")`
	`80`	`+ @ApiOperation(value ="忘记密码通过邮箱修改")`
	`81`	`+ public BaseResult forgetPass(com.danbai.ys.entity.User user,String yzm){`
	`82`	`+ return ResultUtil.success(userService.forgetPass(user, yzm));`
	`83`	`+ }`
`78`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public void senValidate(String email) {`
`38`	`38`	`for (int i = 0; i < MAXINT; i++) {`
`39`	`39`	`yzm += String.valueOf(r.nextInt(10));`
`40`	`40`	`}`
`41`		`- String content = "欢迎注册淡白影视,您的验证码是:" + yzm + ",有效时间4分钟";`
`42`		`- emailUtil.sendEmail("淡白影视注册邮件", content, email);`
	`41`	`+ String content = "欢迎使用淡白影视,您的验证码是:" + yzm + ",有效时间4分钟";`
	`42`	`+ emailUtil.sendEmail("淡白影视验证码邮件", content, email);`
`43`	`43`	`redisTemplate.opsForValue().set(email, yzm, 4, TimeUnit.MINUTES);`
`44`	`44`	`logger.info("向邮箱"+email+"发送验证邮件");`
`45`	`45`	`}`