Pārlūkot izejas kodu

feat(logger): account operation

Casper Dai 2 gadi atpakaļ
vecāks
revīzija
de9f381c05
2 mainītis faili ar 13 papildinājumiem un 11 dzēšanām
  1. 9 7
      src/api/user.js
  2. 4 4
      src/views/realm/user/Settings.vue

+ 9 - 7
src/api/user.js

@@ -74,9 +74,9 @@ export function toggleUser ({ userId, userName }, enabled) {
   }, enabled ? '启用' : '停用')
 }
 
-export function deleteUser (userId) {
+export function deleteUser ({ userId, userName }) {
   return messageSend({
-    url: `/admin/users/${userId}`,
+    url: `/admin/users/${userId}?userName=${userName}`,
     method: 'DELETE'
   }, '注销')
 }
@@ -88,21 +88,22 @@ export function getUserCredentials (userId) {
   }).then(({ data }) => data)
 }
 
-export function deleteUserCredentials (userId, credentialId) {
+export function deleteUserCredentials ({ userId, userName }, credentialId) {
   return messageSend({
-    url: `/admin/users/${userId}/credentials/${credentialId}`,
+    url: `/admin/users/${userId}/credentials/${credentialId}?userName=${userName}`,
     method: 'DELETE'
   }, '重置')
 }
 
-export function resetPassword (userId) {
+export function resetPassword ({ userId, userName }) {
   return messageSend({
     url: `/admin/users/${userId}/resetPassword`,
     method: 'PUT',
     data: {
       type: 'password',
       value: process.env.VUE_APP_USER_PASSWORD,
-      temporary: true
+      temporary: true,
+      userLabel: userName
     }
   }, '重置')
 }
@@ -375,12 +376,13 @@ export function getUsersByDepartment (query) {
   })
 }
 
-export function updateUserDepartment (userId, { id, name }) {
+export function updateUserDepartment ({ userId, userName }, { id, name }) {
   return tenantRequest({
     url: '/admin/users/regrouping',
     method: 'PUT',
     data: addTenantKey({
       userId,
+      userName,
       ...(id ? { departmentId: id, departmentName: name } : { departmentName: '顶层部门' })
     })
   })

+ 4 - 4
src/views/realm/user/Settings.vue

@@ -275,7 +275,7 @@ export default {
         '操作确认',
         { type: 'warning' }
       ).then(() => {
-        resetPassword(this.userId)
+        resetPassword(this.user)
       })
     },
     onResetOTP () {
@@ -284,7 +284,7 @@ export default {
         '操作确认',
         { type: 'warning' }
       ).then(() => {
-        deleteUserCredentials(this.userId, this.credentials.otp.id).then(() => {
+        deleteUserCredentials(this.user, this.credentials.otp.id).then(() => {
           this.credentials.otp = null
         })
       })
@@ -295,7 +295,7 @@ export default {
         '操作确认',
         { type: 'warning' }
       ).then(() => {
-        deleteUser(this.userId).then(() => this.$emit('del'))
+        deleteUser(this.user).then(() => this.$emit('del'))
       })
     },
     onGroupClick (group) {
@@ -319,7 +319,7 @@ export default {
         { type: 'warning' }
       ).then(() => {
         const loading = this.$showLoading()
-        updateUserDepartment(this.userId, this.$group).then(() => {
+        updateUserDepartment(this.user, this.$group).then(() => {
           this.$message({
             type: 'success',
             message: '修改成功'