From 86c787814e624256d1c1413d3180a67afe4405a7 Mon Sep 17 00:00:00 2001
From: "qinxiaodong@pannk.com" <ab123568ab>
Date: Thu, 5 Nov 2020 18:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mms-font/.env.development                       |  2 +-
 mms-font/src/store/modules/user.js              |  4 ++--
 mms-font/src/utils/request.js                   |  1 -
 mms-font/src/utils/validate.js                  |  9 ---------
 mms-font/src/views/dashboard/index.vue          | 17 ++---------------
 mms-font/src/views/login/index.vue              | 14 +-------------
 .../sys/service/impl/SysUserServiceImpl.java    |  2 +-
 7 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/mms-font/.env.development b/mms-font/.env.development
index 8ffd31a..08fd0f2 100644
--- a/mms-font/.env.development
+++ b/mms-font/.env.development
@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://127.0.0.1:8080'
diff --git a/mms-font/src/store/modules/user.js b/mms-font/src/store/modules/user.js
index 7800941..95021fa 100644
--- a/mms-font/src/store/modules/user.js
+++ b/mms-font/src/store/modules/user.js
@@ -31,9 +31,9 @@ const mutations = {
 const actions = {
   // user login
   login({ commit }, userInfo) {
-    const { username, password } = userInfo
+    const { userName, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ username: username.trim(), password: password }).then(response => {
+      login({ userName: userName.trim(), password: password }).then(response => {
         const { data } = response
         commit('SET_TOKEN', data.token)
         setToken(data.token)
diff --git a/mms-font/src/utils/request.js b/mms-font/src/utils/request.js
index 56e400d..e85161c 100644
--- a/mms-font/src/utils/request.js
+++ b/mms-font/src/utils/request.js
@@ -44,7 +44,6 @@ service.interceptors.response.use(
    */
   response => {
     const res = response.data
-
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !== 0) {
       Message({
diff --git a/mms-font/src/utils/validate.js b/mms-font/src/utils/validate.js
index 6b3ac41..2dc8e10 100644
--- a/mms-font/src/utils/validate.js
+++ b/mms-font/src/utils/validate.js
@@ -10,15 +10,6 @@ export function isExternal(path) {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
-}
-
 /**
  * @param {string} url
  * @returns {Boolean}
diff --git a/mms-font/src/views/dashboard/index.vue b/mms-font/src/views/dashboard/index.vue
index 1720ea8..c3da2cd 100644
--- a/mms-font/src/views/dashboard/index.vue
+++ b/mms-font/src/views/dashboard/index.vue
@@ -1,31 +1,18 @@
 <template>
-  <div class="dashboard-container">
-    <component :is="currentRole" />
-  </div>
+  <div class="dashboard-container" />
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import adminDashboard from './admin'
-import editorDashboard from './editor'
-
 export default {
   name: 'Dashboard',
-  components: { adminDashboard, editorDashboard },
+  components: { },
   data() {
     return {
-      currentRole: 'adminDashboard'
     }
   },
   computed: {
-    ...mapGetters([
-      'roles'
-    ])
   },
   created() {
-    if (!this.roles.includes('admin')) {
-      this.currentRole = 'editorDashboard'
-    }
   }
 }
 </script>
diff --git a/mms-font/src/views/login/index.vue b/mms-font/src/views/login/index.vue
index d4d3e77..1a9d667 100644
--- a/mms-font/src/views/login/index.vue
+++ b/mms-font/src/views/login/index.vue
@@ -73,20 +73,12 @@
 </template>
 
 <script>
-import { validUsername } from '@/utils/validate'
 import LangSelect from '@/components/LangSelect'
 
 export default {
   name: 'Login',
   components: { LangSelect },
   data() {
-    const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
-        callback(new Error('Please enter the correct user name'))
-      } else {
-        callback()
-      }
-    }
     const validatePassword = (rule, value, callback) => {
       if (value.length < 6) {
         callback(new Error('The password can not be less than 6 digits'))
@@ -100,9 +92,6 @@ export default {
         password: '111111'
       },
       loginRules: {
-        userName: [
-          { required: true, trigger: 'blur', validator: validateUsername }
-        ],
         password: [
           { required: true, trigger: 'blur', validator: validatePassword }
         ]
@@ -159,8 +148,7 @@ export default {
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true
-          this.$store
-            .dispatch('user/login', this.loginForm)
+          this.$store.dispatch('user/login', this.loginForm)
             .then(() => {
               this.$router.push({
                 path: this.redirect || '/',
diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java b/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java
index 4cb76bf..45463f9 100644
--- a/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java
@@ -31,7 +31,7 @@ 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){
-- 
GitLab