增加注册、修改密码功能

src/main/java/com/uas/platform/b2bManage/controller/AccountController.java

@@ -10,11 +10,14 @@ import com.uas.platform.b2bManage.service.UseLogService;
 import com.uas.platform.b2bManage.service.UserService;
 import com.uas.platform.b2bManage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
+import com.uas.platform.core.util.encry.Md5Utils;
 import javassist.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
@@ -124,8 +127,8 @@ public class AccountController extends BaseController {
      * 通过链接修改密码
      */
     @RequestMapping(value = "/resetPwd/url", method = RequestMethod.GET)
-    public void resetPwdByUrl(String secretKey, HttpServletResponse response) throws IOException, NotFoundException {
-        userService.resetPwd(secretKey, response);
+    public void resetPwdByUrl(String secretKey, HttpServletResponse response, HttpServletRequest request) throws IOException, NotFoundException, ServletException {
+        userService.resetPwd(secretKey, response, request);
     }
 
     /**
@@ -136,6 +139,7 @@ public class AccountController extends BaseController {
      */
     @RequestMapping(value = "/resetPassword/{id}", method = RequestMethod.POST)
     public void resetPassword(@PathVariable("id") Long id, String password, HttpServletResponse response) throws IOException {
+        useLogService.appendLog(UseType.RESETPASSWORD.code(), SystemSession.getUser().getPassword() + "-->" + Md5Utils.encode(password, SystemSession.getUser().getName()), AgentUtils.getIp(request));
         userService.resetPassword(id, password, response);
     }
 }

src/main/java/com/uas/platform/b2bManage/model/SecretKeyRecord.java

@@ -1,10 +1,7 @@
 package com.uas.platform.b2bManage.model;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 生成秘钥记录

src/main/java/com/uas/platform/b2bManage/model/UseType.java

@@ -37,6 +37,11 @@ public enum UseType {
      */
     REDIRECT("重定向"),
 
+    /**
+     * 修改密码
+     */
+    RESETPASSWORD("修改密码"),
+
     /**
      * 空状态
      */

src/main/java/com/uas/platform/b2bManage/service/UserService.java

@@ -4,6 +4,7 @@ import com.uas.platform.b2bManage.model.User;
 import javassist.NotFoundException;
 import org.springframework.ui.ModelMap;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -69,7 +70,7 @@ public interface UserService {
      * @param response 请求
      * @return
      */
-    User resetPwd(String secretKey, HttpServletResponse response) throws IOException, NotFoundException;
+    User resetPwd(String secretKey, HttpServletResponse response, HttpServletRequest request) throws IOException, NotFoundException, ServletException;
 
     /**
      * 修改密码

src/main/java/com/uas/platform/b2bManage/service/impl/UserServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -153,7 +154,7 @@ public class UserServiceImpl implements UserService {
      * @return
      */
     @Override
-    public User resetPwd(String secretKey, HttpServletResponse response) throws IOException, NotFoundException {
+    public User resetPwd(String secretKey, HttpServletResponse response, HttpServletRequest request) throws IOException, NotFoundException, ServletException {
         if (StringUtils.isEmpty(secretKey)) {
             response.sendRedirect(Constant.INVALIDURL);
         }
@@ -170,6 +171,7 @@ public class UserServiceImpl implements UserService {
                     throw new NotFoundException("未找到该邮箱用户信息");
                 } else {
                     SystemSession.setUser(users.get(0));
+                    request.getSession().setAttribute("user", users.get(0));
                     recordDao.delete(record);
                     response.sendRedirect(Constant.RESETPWD_URL);
                 }