登录 登出 修改密码

foyo-service/pom.xml

@@ -62,6 +62,14 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.2.3</version>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.13</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

foyo-service/src/main/java/com/huiju/foyo/common/BaseController.java

@@ -8,4 +8,7 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 public class BaseController {
+
+
+
 }

foyo-service/src/main/java/com/huiju/foyo/common/Md5Utils.java

@@ -0,0 +1,27 @@
+package com.huiju.foyo.common;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+public class Md5Utils {
+
+    public static String encryptionMd5(String str) {
+        return DigestUtils.md5Hex(str);
+    }
+
+    /**
+     * 密码比对
+     * @param encrypPass 已加密
+     * @param pass 未加密
+     * @return
+     */
+    public static boolean isMd5ThanPass(String encrypPass, String pass ) {
+        String encPass = encryptionMd5(pass);
+        return encPass.equals(encrypPass);
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(encryptionMd5("123456"));
+        System.out.println(isMd5ThanPass("e10adc3949ba59abbe56e057f20f883e", "123456"));
+    }
+}

foyo-service/src/main/java/com/huiju/foyo/controller/LoginController.java

@@ -1,15 +1,19 @@
 package com.huiju.foyo.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.foyo.common.BaseController;
+import com.huiju.foyo.common.Md5Utils;
 import com.huiju.foyo.common.ResponseBean;
 import com.huiju.foyo.model.SysUser;
 import com.huiju.foyo.service.ISysUserService;
+import com.huiju.foyo.session.UserControl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -21,57 +25,66 @@ public class LoginController {
 
 	@Autowired
 	ISysUserService iSysUserService;
-	
-	@PostMapping("/admin/login/login")
-	public ResponseBean login(@RequestBody String jsonString){
-		ResponseBean responseBean = new ResponseBean();
 
-		JSONObject params = JSONObject.parseObject(jsonString);
-		if (null == params) {
-			responseBean.addError("请填写用户名及密码");
-			return responseBean;
-		}
-
-		String name = params.getString("name");
-		String passed = params.getString("password");
+	@RequestMapping("/admin/toLogin")
+	public ResponseBean toLogin() {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean.addError("用户未登录");
+		return responseBean;
+	}
 
-		if (null == name || "".equals(name.trim()) || null == passed || "".equals(passed.trim())) {
-			responseBean.addError("用户名或者密码不正确");
-			return responseBean;
-		}
+	/**
+	 * 登录
+	 * @param jsonString
+	 * @return
+	 */
+	@PostMapping("/admin/login")
+	public ResponseBean login(@RequestBody String jsonString){
+		return iSysUserService.login(jsonString);
+	}
 
-		SysUser sysUser = iSysUserService.getUserByLoginName(name);
+	/**
+	 * 退出登录
+	 * @return
+	 */
+	@PostMapping("/admin/logout")
+	public ResponseBean logout() {
+		UserControl.removeUser();
+		return new ResponseBean();
+	}
 
-		// 比较密码是否一致
-		// todo
+	/**
+	 * 获取用户信息
+	 * @return
+	 */
+	@GetMapping("/admin/user/info")
+	public ResponseBean info(HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
 
-		// 生成 session 或者 token
-		// todo
+		// 判断是否登录
+		SysUser user = UserControl.getUser();
 
-		// 返回内容密码为空
-		sysUser.setPasswd(null);
+		Map<String, Object> map = new HashMap<>();
+		map.put("roles","['admin']");
+		map.put("token",user.getToken());
+		map.put("introduction","我是超级管理员");
+		map.put("avatar", user.getAvatar());
+		map.put("name", user.getName());
 
-		responseBean.addSuccess(sysUser);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 
-	@PostMapping("/admin/login/logout")
-	public ResponseBean logout() {
-		// todo
-		return new ResponseBean();
-	}
-	
-	@GetMapping("/admin/user/info")
-	public String info(){
-		// 判断是否登录
-		// todo
+	/**
+	 * 修改密码
+	 * @param oldPass
+	 * @param newPass
+	 * @return
+	 */
+	@PutMapping("/admin/user/upPass")
+	public ResponseBean updatePass(@RequestParam(value = "oldPass") String oldPass,
+								   @RequestParam(value = "newPass") String newPass) {
 
-		JSONObject jsonObject = new JSONObject();
-		jsonObject.put("roles","['admin']");
-		jsonObject.put("token","admin");
-		jsonObject.put("introduction","我是超级管理员");
-		jsonObject.put("avatar","https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif");
-		jsonObject.put("name","'Super Admin'");
-		return jsonObject.toJSONString();
+		return iSysUserService.upPass(oldPass, newPass);
 	}
 }

foyo-service/src/main/java/com/huiju/foyo/exception/ExceptionHandle.java

@@ -0,0 +1,25 @@
+package com.huiju.foyo.exception;
+
+import com.huiju.foyo.common.ResponseBean;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ControllerAdvice
+public class ExceptionHandle {
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleError(Exception e){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addError("系统异常");
+        return responseBean;
+    }
+
+    @ExceptionHandler(FoyoException.class)
+    public ResponseBean handleError(FoyoException e){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addError(e.getMessage());
+        return responseBean;
+    }
+
+}

foyo-service/src/main/java/com/huiju/foyo/exception/FoyoException.java

@@ -0,0 +1,11 @@
+package com.huiju.foyo.exception;
+
+public class FoyoException extends RuntimeException {
+
+    public FoyoException(String message) {
+        super(message);
+    }
+
+    public FoyoException() {
+    }
+}

foyo-service/src/main/java/com/huiju/foyo/filter/FoyoFilter.java

@@ -0,0 +1,42 @@
+package com.huiju.foyo.filter;
+
+import com.huiju.foyo.model.SysUser;
+import com.huiju.foyo.session.SessionLoad;
+import com.huiju.foyo.session.UserControl;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class FoyoFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+        if (request.getRequestURI().equals("/admin/login")) {
+            filterChain.doFilter(servletRequest, servletResponse);
+            return;
+        }
+
+        SysUser user = SessionLoad.getUser();
+        if (null == user) {
+            user = (SysUser) request.getSession().getAttribute(UserControl.SESSION_USER);
+            if (null == user) {
+                // 重定向登录
+                request.getRequestDispatcher("/admin/toLogin").forward(servletRequest, servletResponse);
+                return;
+            }
+        }
+
+        // 设置用户
+        UserControl.setUser(user);
+
+        // 继续执行
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+}

foyo-service/src/main/java/com/huiju/foyo/model/SysUser.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -23,6 +24,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@ToString
 public class SysUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -49,4 +51,10 @@ public class SysUser implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 用户token
+     */
+    @TableField(exist = false)
+    private String token;
+
 }

foyo-service/src/main/java/com/huiju/foyo/service/ISysUserService.java

@@ -1,8 +1,29 @@
 package com.huiju.foyo.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.foyo.common.ResponseBean;
 import com.huiju.foyo.model.SysUser;
 
 public interface ISysUserService extends IService<SysUser> {
+    /**
+     * 根据用户名获取用户信息
+     * @param name
+     * @return
+     */
     SysUser getUserByLoginName(String name);
+
+    /**
+     * 登录
+     * @param jsonString
+     * @return
+     */
+    ResponseBean login(String jsonString);
+
+    /**
+     * 修改密码
+     * @param oldPass
+     * @param newPass
+     * @return
+     */
+    ResponseBean upPass(String oldPass, String newPass);
 }

foyo-service/src/main/java/com/huiju/foyo/service/impl/SysUserServiceImpl.java

@@ -1,10 +1,16 @@
 package com.huiju.foyo.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.util.StringUtil;
+import com.huiju.foyo.common.Md5Utils;
+import com.huiju.foyo.common.ResponseBean;
+import com.huiju.foyo.session.SessionLoad;
 import com.huiju.foyo.dao.SysUserMapper;
 import com.huiju.foyo.model.SysUser;
 import com.huiju.foyo.service.ISysUserService;
+import com.huiju.foyo.session.UserControl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,4 +36,68 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         return sysUserMapper.selectOne(wrapper);
     }
+
+
+    @Override
+    public ResponseBean login(String jsonString) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject params = JSONObject.parseObject(jsonString);
+        if (null == params) {
+            responseBean.addError("请填写用户名及密码");
+            return responseBean;
+        }
+
+        String name = params.getString("username");
+        String passed = params.getString("password");
+
+        if (null == name || "".equals(name.trim()) || null == passed || "".equals(passed.trim())) {
+            responseBean.addError("用户名或者密码不正确");
+            return responseBean;
+        }
+
+        SysUser sysUser = getUserByLoginName(name);
+
+        // 比较密码是否一致
+        if (!Md5Utils.isMd5ThanPass(sysUser.getPasswd(), passed)){
+            responseBean.addError("用户名或者密码不正确");
+            return responseBean;
+        }
+
+        // 生成 session 或者 token
+        UserControl.setUser(sysUser);
+
+        // 返回内容密码为空
+        sysUser.setPasswd(null);
+
+        responseBean.addSuccess(sysUser);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean upPass(String oldPass, String newPass) {
+        ResponseBean responseBean = new ResponseBean();
+
+        SysUser sessionUser = UserControl.getUser();
+
+        // 根据用户名查询最新信息
+        SysUser userByLoginName = getUserByLoginName(sessionUser.getName());
+        if (!Md5Utils.isMd5ThanPass(userByLoginName.getPasswd(), oldPass)) {
+            responseBean.addError("请输入正确的旧密码");
+            return responseBean;
+        }
+
+        if (newPass.length() < 6) {
+            responseBean.addError("新密码不能小于6位");
+            return responseBean;
+        }
+
+        String encryptionMd5 = Md5Utils.encryptionMd5(newPass);
+        userByLoginName.setPasswd(encryptionMd5);
+
+        this.updateById(userByLoginName);
+
+        responseBean.addSuccess("操作成功");
+        return responseBean;
+    }
 }

foyo-service/src/main/java/com/huiju/foyo/session/SessionLoad.java

@@ -0,0 +1,41 @@
+package com.huiju.foyo.session;
+
+import com.huiju.foyo.model.SysUser;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * session 操作
+ * @author weiximei
+ */
+@Slf4j
+public class SessionLoad {
+
+    private static ThreadLocal<SysUser> threadLocal = new ThreadLocal<>();
+
+    /**
+     * 设置用户信息
+     * @param user
+     */
+    public static void setUser(SysUser user){
+        log.info("当前线程 --- [{}] --- 设置用户 {} ", Thread.currentThread().getName(), user);
+        threadLocal.set(user);
+    }
+
+    /**
+     * 获取用户信息
+     * @return
+     */
+    public static SysUser getUser() {
+        SysUser user = threadLocal.get();
+        log.info("当前线程 --- [{}] --- 获取用户 {} ", Thread.currentThread().getName(), user);
+        return user;
+    }
+
+    /**
+     * 移除用户
+     */
+    public static void removeUser() {
+        threadLocal.remove();
+    }
+
+}

foyo-service/src/main/java/com/huiju/foyo/session/UserControl.java

@@ -0,0 +1,69 @@
+package com.huiju.foyo.session;
+
+import com.huiju.foyo.exception.FoyoException;
+import com.huiju.foyo.model.SysUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 用户session
+ * @author weiximei
+ */
+@Component
+@Slf4j
+public class UserControl {
+
+    public static final String SESSION_USER = "user";
+
+    /**
+     * 设置用户
+     * @param user
+     */
+    public static void setUser(SysUser user) {
+        if (null == user) {
+            throw new FoyoException("用户信息不能为空");
+        }
+        HttpSession session = getSession();
+        user.setToken(session.getId());
+        session.setAttribute(SESSION_USER, user);
+        log.info("当前用户sessionId: {}", session.getId());
+        SessionLoad.setUser(user);
+    }
+
+    /**
+     * 获取当前用户
+     * @return
+     */
+    public static SysUser getUser() {
+        HttpSession session = getSession();
+        log.info("当前用户sessionId: {}", session.getId());
+
+        SysUser sysUser = SessionLoad.getUser();
+        if (null == sysUser) {
+            throw new FoyoException("用户未登录");
+        }
+
+        return sysUser;
+    }
+
+    /**
+     * 移除用户
+     */
+    public static void removeUser() {
+        HttpSession session = getSession();
+        session.removeAttribute(SESSION_USER);
+        log.info("当前用户sessionId: {}, 退出登录", session.getId());
+
+        SessionLoad.removeUser();
+    }
+
+    private static HttpSession getSession() {
+        HttpSession session = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest().getSession();
+        return session;
+    }
+}

vue-element-admin/src/api/login.js

@@ -6,7 +6,7 @@ export function loginByUsername(username, password) {
     password
   }
   return request({
-    url: '/login/login',
+    url: '/login',
     method: 'post',
     data
   })
@@ -14,16 +14,26 @@ export function loginByUsername(username, password) {
 
 export function logout() {
   return request({
-    url: '/login/logout',
+    url: '/logout',
     method: 'post'
   })
 }
 
-export function getUserInfo(token) {
+export function getUserInfo() {
   return request({
     url: '/user/info',
-    method: 'get',
-    params: { token }
+    method: 'get'
+  })
+}
+
+export function updatePass(data) {
+  return request({
+    url: '/user/upPass',
+    method: 'put',
+    params: {
+      oldPass: data.oldPass,
+      newPass: data.newPass
+    }
   })
 }
 

vue-element-admin/src/views/login/index.vue

@@ -36,7 +36,7 @@
         </span>
       </el-form-item>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">{{ $t('login.logIn') }}</el-button>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin('loginForm')">{{ $t('login.logIn') }}</el-button>
 
     </el-form>
 
@@ -112,13 +112,17 @@ export default {
         this.passwordType = 'password'
       }
     },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+    handleLogin(form) {
+      this.$refs[form].validate(valid => {
         if (valid) {
-          console.log('222222222222222')
           this.loading = true
-          this.$store.dispatch('LoginByUsername', this.loginForm).then(() => {
+          this.$store.dispatch('LoginByUsername', this.loginForm).then((res) => {
             this.loading = false
+            const resCode = res.code
+            if (resCode !== '0') {
+              this.$message.error(res.message || res.msg)
+              return
+            }
             this.$router.push({ path: this.redirect || '/' })
           }).catch(() => {
             this.loading = false