接口修改

vue/src/api/account.js

@@ -1,13 +1,31 @@
 import request from '@/config/request'
 
+const baseUrl = '/account'
+
 export function login(data) {
-    return request.post('/login', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/login`, data).then(({data}) => data.data)
 }
 
 export function logout() {
-    return request.get('/logout')
+    return request.get(`${baseUrl}/logout`)
 }
 
 export function register(data) {
-    return request.post('/register', data)
+    return request.post(`${baseUrl}/register`, data)
+}
+
+export function updateUserPwd(data) {
+    return request.post(`${baseUrl}/updatePwd`, data).then(({data}) => data)
+}
+
+export function updateAvatar(key) {
+    return request.get(`${baseUrl}/updateAvatar?key=${encodeURIComponent(key)}`).then(({data}) => ({...data, key}))
+}
+
+export function validate(pwd) {
+    return request.get(`${baseUrl}/validate?pwd=${pwd}`).then(({data}) => data)
+}
+
+export function checkName(name) {
+    return request.get(`${baseUrl}/checkName?name=${name}`).then(({data}) => data)
 }

vue/src/api/message/manage.js

@@ -0,0 +1,27 @@
+import request from '@/config/request'
+
+const baseUrl = '/message/manage'
+
+export function search(data) {
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
+}
+
+export function add(data) {
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
+}
+
+export function update(data) {
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
+}
+
+export function publish(data) {
+    return request.post(`${baseUrl}/publish`, data).then(({data}) => data)
+}
+
+export function withdraw(data) {
+    return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data)
+}
+
+export function del(id, title) {
+    return request.get(`${baseUrl}/del?id=${id}&title=${title}`).then(({data}) => data)
+}

vue/src/api/message/manage/index.js

@@ -1,27 +0,0 @@
-import request from '@/config/request'
-
-const baseUrl = '/message/manage'
-
-export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
-}
-
-export function add(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
-}
-
-export function update(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
-}
-
-export function publish(data) {
-    return request.post(baseUrl + '/publish', data).then(({data}) => data)
-}
-
-export function withdraw(data) {
-    return request.post(baseUrl + '/withdraw', data).then(({data}) => data)
-}
-
-export function del(id) {
-    return request.get(baseUrl + `/del?id=${id}`).then(({data}) => data)
-}

vue/src/api/record.js

@@ -0,0 +1,11 @@
+import request from '@/config/request'
+
+const baseUrl = '/record'
+
+export function searchLoginHistory(data) {
+    return request.post(`${baseUrl}/searchLoginHistory`, data).then(({data}) => data.data)
+}
+
+export function searchUserAction(data) {
+    return request.post(`${baseUrl}/searchUserAction`, data).then(({data}) => data.data)
+}

vue/src/api/system/user.js

@@ -6,14 +6,6 @@ export function getUsers(data) {
     return request.post(baseUrl + '/search', data).then(({data}) => data.data)
 }
 
-export function getLoginHistory(data) {
-    return request.post(baseUrl + '/getLoginHistory', data).then(({data}) => data.data)
-}
-
-export function getUserAction(data) {
-    return request.post(baseUrl + '/getUserAction', data).then(({data}) => data.data)
-}
-
 export function kick(data) {
     return request.post(baseUrl + '/kick', data).then(({data}) => data)
 }
@@ -33,19 +25,3 @@ export function delUser(data) {
 export function resetUserPwd(data) {
     return request.post(baseUrl + '/resetPwd', data).then(({data}) => data)
 }
-
-export function updateUserPwd(data) {
-    return request.post(baseUrl + '/updatePwd', data).then(({data}) => data)
-}
-
-export function updateAvatar(key) {
-    return request.get(baseUrl + '/updateAvatar?key=' + encodeURIComponent(key)).then(({data}) => ({...data, key}))
-}
-
-export function validate(pwd) {
-    return request.get(baseUrl + '/validate?pwd=' + pwd).then(({data}) => data)
-}
-
-export function checkName(name) {
-    return request.get(baseUrl + '/checkName?name=' + name).then(({data}) => data)
-}

vue/src/views/app/login/RegisterForm.vue

@@ -47,8 +47,7 @@
 
 <script>
     import md5 from "js-md5"
-    import {checkName} from "@/api/system/user"
-    import {register} from "@/api/account"
+    import {register, checkName} from "@/api/account"
     import {elSuccess} from "@/utils/message"
 
     export default {

vue/src/views/index/components/PanelGroup/index.vue

@@ -10,7 +10,7 @@
     import PanelGroupItem from './PanelGroupItem'
     import variables from '@/assets/styles/variables.scss'
     import {getFourBlock} from '@/api/statistic'
-    import {isEmpty, mergeObj} from "@/utils"
+    import {isEmpty} from "@/utils"
     import {auth} from "@/utils/auth"
 
     export default {

vue/src/views/message/manage/index.vue

@@ -160,7 +160,7 @@
                 elConfirm(`确定删除消息【${this.row.title}】？`)
                     .then(() => {
                         this.config.operating = true
-                        return del(this.row.id)
+                        return del(this.row.id, this.row.title)
                     })
                     .then(() => {
                         elSuccess('删除成功')

vue/src/views/system/user/components/EditDialog.vue

@@ -33,7 +33,8 @@
     import DialogForm from '@/components/DialogForm'
     import RoleSelector from './RoleSelector'
     import dialogMixin from "@/mixins/dialogMixin"
-    import {addUser, updateUser, checkName} from "@/api/system/user"
+    import {checkName} from "@/api/account"
+    import {addUser, updateUser} from "@/api/system/user"
     import {isEmpty} from '@/utils'
     import {elConfirm} from "@/utils/message"
 

vue/src/views/userCenter/components/Account.vue

@@ -27,7 +27,7 @@
 <script>
     import DialogForm from '@/components/DialogForm'
     import dialogMixin from "@/mixins/dialogMixin"
-    import {updateUserPwd} from "@/api/system/user"
+    import {updateUserPwd} from "@/api/account"
     import {elSuccess} from "@/utils/message"
 
     export default {

vue/src/views/userCenter/components/Avatar.vue

@@ -39,7 +39,7 @@
     import dialogMixin from "@/mixins/dialogMixin"
     import {elError, elSuccess} from "@/utils/message"
     import {autoCompleteUrl, upload} from "@/utils/file"
-    import {updateAvatar} from "@/api/system/user"
+    import {updateAvatar} from "@/api/account"
 
     export default {
         name: "Avatar",

vue/src/views/userCenter/components/LoginHistory.vue

@@ -31,7 +31,7 @@
 
 <script>
     import tablePageMixin from '@/mixins/tablePageMixin'
-    import {getLoginHistory} from "@/api/system/user"
+    import {searchLoginHistory} from "@/api/record"
 
     export default {
         name: "LoginHistory",
@@ -56,7 +56,7 @@
             search() {
                 if (this.config.loading) return
                 this.config.loading = true
-                getLoginHistory({...this.searchForm, uid: this.uid})
+                searchLoginHistory({...this.searchForm, uid: this.uid})
                     .then(({list, total}) => {
                         this.searchForm.total = total
                         this.tableData = list

vue/src/views/userCenter/components/UserAction.vue

@@ -38,7 +38,7 @@
 
 <script>
     import tablePageMixin from '@/mixins/tablePageMixin'
-    import {getUserAction} from "@/api/system/user"
+    import {searchUserAction} from "@/api/record"
 
     export default {
         name: "UserAction",
@@ -63,7 +63,7 @@
             search() {
                 if (this.config.loading) return
                 this.config.loading = true
-                getUserAction({...this.searchForm, uid: this.uid})
+                searchUserAction({...this.searchForm, uid: this.uid})
                     .then(({list, total}) => {
                         this.searchForm.total = total
                         this.tableData = list