更新项目

mms-font/src/api/user.js

@@ -8,9 +8,9 @@ export function login(data) {
   })
 }
 
-export function getInfo() {
+export function getInfo(data) {
   return request({
-    url: '/sys/user/info/',
+    url: '/sys/user/info/' + data,
     method: 'get'
   })
 }

mms-font/src/store/modules/user.js

 import { login, logout, getInfo } from '@/api/user'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getToken, setToken, removeToken, setUserId } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
 
 const state = {
+  userId: '',
   token: getToken(),
   name: '',
   avatar: '',
@@ -11,6 +12,9 @@ const state = {
 }
 
 const mutations = {
+  SET_USERID: (state, userId) => {
+    state.userId = userId
+  },
   SET_TOKEN: (state, token) => {
     state.token = token
   },
@@ -34,10 +38,11 @@ const actions = {
     const { userName, password } = userInfo
     return new Promise((resolve, reject) => {
       login({ userName: userName.trim(), password: password }).then(response => {
-        const { data } = response
-        commit('SET_TOKEN', data)
-        console.log(data)
-        setToken(data)
+        const { token, userId } = response
+        commit('SET_TOKEN', token)
+        commit('SET_USERID', userId)
+        setToken(token)
+        setUserId(userId)
         resolve()
       }).catch(error => {
         reject(error)
@@ -47,11 +52,10 @@ const actions = {
 
   // get user info
   getInfo({ commit, state }) {
-    console.log(state)
+    console.log(state.userId)
     return new Promise((resolve, reject) => {
-      getInfo(state.token).then(response => {
+      getInfo(state.userId).then(response => {
         const { data } = response
-
         if (!data) {
           reject('Verification failed, please Login again.')
         }

mms-font/src/utils/auth.js

@@ -2,6 +2,8 @@ import Cookies from 'js-cookie'
 
 const TokenKey = 'Admin-Token'
 
+const UserId = 'User-Id'
+
 export function getToken() {
   return Cookies.get(TokenKey)
 }
@@ -10,6 +12,10 @@ export function setToken(token) {
   return Cookies.set(TokenKey, token)
 }
 
+export function setUserId(userId) {
+  return Cookies.set(UserId, userId)
+}
+
 export function removeToken() {
   return Cookies.remove(TokenKey)
 }

mms/src/main/java/com/pannk/demo/mms/modules/sys/service/SysUserService.java

@@ -12,7 +12,19 @@ import com.pannk.demo.mms.modules.sys.entity.SysUserEntity;
  */
 public interface SysUserService extends IService<SysUserEntity> {
 
+    /**
+     * 查询用户
+     *
+     * @param userName 用户名
+     * @return
+     */
     SysUserEntity queryByUserName(String userName);
 
+    /**
+     * 登录
+     *
+     * @param loginForm 登录表单
+     * @return
+     */
     Result login(LoginForm loginForm);
 }

mms/src/main/java/com/pannk/demo/mms/modules/sys/service/impl/SysUserServiceImpl.java

@@ -2,11 +2,11 @@ package com.pannk.demo.mms.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pannk.demo.mms.common.base.Result;
-import com.pannk.demo.mms.modules.sys.entity.LoginForm;
-import com.pannk.demo.mms.modules.sys.entity.SysUserEntity;
 import com.pannk.demo.mms.common.utils.RedisUtil;
 import com.pannk.demo.mms.common.utils.TokenUtil;
 import com.pannk.demo.mms.modules.sys.dao.SysUserMapper;
+import com.pannk.demo.mms.modules.sys.entity.LoginForm;
+import com.pannk.demo.mms.modules.sys.entity.SysUserEntity;
 import com.pannk.demo.mms.modules.sys.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +31,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     @Override
     public Result login(LoginForm loginForm) {
         SysUserEntity sysUserEntity = queryByUserName(loginForm.getUserName());
-        if (sysUserEntity==null||!sysUserEntity.getPassword().equals(loginForm.getPassword())){
+        if (sysUserEntity == null || !sysUserEntity.getPassword().equals(loginForm.getPassword())) {
             return Result.error("账号或密码不正确");
         }
-        if (sysUserEntity.getStatus()==1){
+        if (sysUserEntity.getStatus() == 1) {
             return Result.error("账号被锁定,请联系管理员处理");
         }
         String token = TokenUtil.generateToken();
-        redisUtil.set(sysUserEntity.getCode(),token);
-        return Result.success(token);
+        redisUtil.set(sysUserEntity.getCode(), token);
+        Result result = Result.success();
+        result.put("token", token);
+        result.put("userId", sysUserEntity.getId());
+        return result;
     }
 }

mms/src/main/resources/application.yml

@@ -19,5 +19,6 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 logging:
   config: classpath:logback-spring.xml
\ No newline at end of file

mms/src/main/resources/logback-spring.xml

@@ -68,7 +68,7 @@
     <!--root:它也是<logger>元素，但是它是根logger,是所有<logger>的上级。只有一个level属性，因为name已经被命名为"root",且已经是最上级了。-->
     <!--level: 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL和OFF，不能设置为INHERITED或者同义词NULL。 默认是DEBUG。-->
 
-    <root level="error">
+    <root level="ERROR">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="ROLLINGFILE"/>
     </root>