代码更新

2022-11-18 17:13:14 +08:00
parent 3d18aa821f
commit ef95140a8e
6 changed files with 89 additions and 54 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
@@ -6,12 +6,16 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.TransactionManagementConfigurer;

+import javax.annotation.Resource;
 import javax.sql.DataSource;

@Configuration
@Slf4j
-public class DataBaseConfig {
+public class DataBaseConfig implements TransactionManagementConfigurer {

    @Primary
    @Bean(name = "dataSource")
@@ -20,4 +24,20 @@ public class DataBaseConfig {
        return new DruidDataSource();
    }

+
+
+    @Resource(name="transactionManager")
+    private PlatformTransactionManager transactionManager;
+
+    // 创建事务管理器
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager transactionManager(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    // 实现接口 TransactionManagementConfigurer 方法，其返回值代表在拥有多个事务管理器的情况下默认使用的事务管理器
+    @Override
+    public PlatformTransactionManager annotationDrivenTransactionManager() {
+        return transactionManager;
+    }
 }
--- a/lms/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
@@ -95,6 +95,9 @@ public class AuthorizationController {
        // 获取权限列表 - 登录查找权限
        List<String> permissionList = roleService.getPermissionList(userDto);

+        // 判断是否被锁
+        if (!userDto.getEnabled()) throw new BadRequestException("账号未激活");
+
        // 登录输入，登出删除
        CurrentUser user = new CurrentUser();
        user.setId(userDto.getId());
--- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
@@ -19,6 +19,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -109,7 +110,10 @@ public class UserController {
    public ResponseEntity<Object> create(@Validated @RequestBody User resources){
        checkLevel(resources);
        // 默认密码 123456
-        resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
+        if (ObjectUtil.isEmpty(resources.getPassword()))
+            resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
+        else
+            resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
        userService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
    }
--- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
@@ -15,6 +15,8 @@
 */
 package org.nl.modules.system.service.impl;

+import cn.dev33.satoken.secure.SaSecureUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.config.FileProperties;
@@ -89,9 +91,6 @@ public class UserServiceImpl implements UserService {
        if (userRepository.findByUsername(resources.getUsername()) != null) {
            throw new EntityExistException(User.class, "username", resources.getUsername());
        }
-        if (userRepository.findByEmail(resources.getEmail()) != null) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }
        resources.setCreateBy(SecurityUtils.getCurrentUsername());
        userRepository.save(resources);
    }
@@ -102,45 +101,36 @@ public class UserServiceImpl implements UserService {
        User user = userRepository.findById(resources.getId()).orElseGet(User::new);
        ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
        User user1 = userRepository.findByUsername(resources.getUsername());
-        User user2 = userRepository.findByEmail(resources.getEmail());

        if (user1 != null && !user.getId().equals(user1.getId())) {
            throw new EntityExistException(User.class, "username", resources.getUsername());
        }
-
-        if (user2 != null && !user.getId().equals(user2.getId())) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }
        // 如果用户的角色改变
        if (!resources.getRoles().equals(user.getRoles())) {
            redisUtils.del(CacheKey.DATA_USER  + resources.getId());
            redisUtils.del(CacheKey.MENU_USER + resources.getId());
            redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
        }
-        // 如果用户名称修改
-        if(!resources.getUsername().equals(user.getUsername())){
-            redisUtils.del("user::username:" + user.getUsername());
-        }
+        redisUtils.del("user::username:" + user.getUsername());
        // 如果用户被禁用，则清除用户登录信息
        if(!resources.getEnabled()){
            onlineUserService.kickOutForUsername(resources.getUsername());
        }
-        User clone = new User(); // jpa 多表问题，需要用新的类来进行修改
-        clone.setId(resources.getId());
-        clone.setUsername(resources.getUsername());
-        clone.setEmail(resources.getEmail());
-        clone.setEnabled(resources.getEnabled());
-        clone.setRoles(resources.getRoles());
-        clone.setDept(resources.getDept());
-        clone.setPhone(resources.getPhone());
-        clone.setNickName(resources.getNickName());
-        clone.setGender(resources.getGender());
+        user.setId(resources.getId());
+        user.setUsername(resources.getUsername());
+        user.setEmail(resources.getEmail());
+        user.setEnabled(resources.getEnabled());
+        user.setRoles(resources.getRoles());
+        user.setDept(resources.getDept());
+        user.setPhone(resources.getPhone());
+        user.setNickName(resources.getNickName());
+        user.setGender(resources.getGender());
+        if (ObjectUtil.isNotEmpty(resources.getPassword()))
+            user.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));

-        userRepository.save(clone);
+        userRepository.save(user);
        // 清除缓存
        delCaches(user.getId(), user.getUsername());
-        // 修改session
-//        flushSession(user);
    }

    @Override
@@ -153,8 +143,6 @@ public class UserServiceImpl implements UserService {
        userRepository.save(user);
        // 清理缓存
        delCaches(user.getId(), user.getUsername());
-        // 修改session
-//        flushSession(user);
    }

    @Override
@@ -184,7 +172,6 @@ public class UserServiceImpl implements UserService {
    public void updatePass(String username, String pass) {
        userRepository.updatePass(username, pass, new Date());
        redisUtils.del("user::username:" + username);
-//        flushSession(userRepository.findByUsername(username));
    }

    @Override
@@ -200,7 +187,6 @@ public class UserServiceImpl implements UserService {
            FileUtil.del(oldPath);
        }
        @NotBlank String username = user.getUsername();
-//        flushSession(user);
        return new HashMap<String, String>(1) {{
            put("avatar", file.getName());
        }};
@@ -210,7 +196,6 @@ public class UserServiceImpl implements UserService {
    @Transactional(rollbackFor = Exception.class)
    public void updateEmail(String username, String email) {
        userRepository.updateEmail(username, email);
-//        flushSession(userRepository.findByUsername(username));
    }

    @Override
@@ -239,17 +224,5 @@ public class UserServiceImpl implements UserService {
     */
    public void delCaches(Long id, String username) {
        redisUtils.del(CacheKey.USER_ID + id);
-//        flushCache(username);
    }
-
-    /**
-     * 清理 登陆时 用户缓存信息
-     *
-     * @param user /
-     */
-//    private void flushSession(User user) {
-//        UserDto userDto = this.findByName(user.getUsername());
-//        List<String> permissionList = roleService.getPermissionList(userDto.getId().toString());
-//        flushSessionUtil.flushSessionInfo(userDto, permissionList);
-//    }
 }
--- a/lms/nladmin-ui/src/views/login.vue
+++ b/lms/nladmin-ui/src/views/login.vue
@@ -9,7 +9,7 @@
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="new-password" placeholder="密码" @keyup.enter.native="handleLogin">
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
@@ -120,14 +120,12 @@ export default {
          code: this.loginForm.code,
          uuid: this.loginForm.uuid
        }
-        if (user.password !== this.cookiePass) {
-          user.password = encrypt(user.password)
-        }
+        user.password = encrypt(user.password)
        if (valid) {
          this.loading = true
          if (user.rememberMe) {
            Cookies.set('username', user.username, { expires: Config.passCookieExpires })
-            Cookies.set('password', user.password, { expires: Config.passCookieExpires })
+            Cookies.set('password', this.loginForm.password, { expires: Config.passCookieExpires })
            Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
          } else {
            Cookies.remove('username')
--- a/lms/nladmin-ui/src/views/system/user/index.vue
+++ b/lms/nladmin-ui/src/views/system/user/index.vue
@@ -80,7 +80,7 @@
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="form.email" style="width: 200px;" />
            </el-form-item>
-            <el-form-item label="部门" prop="dept.id">
+            <el-form-item label="部门" prop="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
              <treeselect
                v-model="form.dept.id"
                :options="depts"
@@ -89,7 +89,10 @@
                placeholder="选择部门"
              />
            </el-form-item>
-
+            <br v-if="!crud.status.add">
+            <el-form-item label="密码" prop="password" v-if="crud.status.add">
+              <el-input v-model="form.password" style="width: 200px;" show-password/>
+            </el-form-item>
            <el-form-item label="性别">
              <el-radio-group v-model="form.gender" style="width: 178px">
                <el-radio label="男">男</el-radio>
@@ -168,16 +171,25 @@
          <el-table-column
            v-permission="['admin','user:edit','user:del']"
            label="操作"
-            width="115"
+            width="200"
            align="center"
            fixed="right"
          >
            <template slot-scope="scope">
              <udOperation
+                style="display: inline"
                :data="scope.row"
                :permission="permission"
                :disabled-dle="scope.row.id === user.id"
              />
+              <el-button
+                type="text"
+                slot="left"
+                icon="el-icon-refresh-left"
+                v-permission="permission.edit"
+                @click="resetPassword(scope.row)">
+                重置密码
+              </el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -212,7 +224,8 @@ const defaultForm = {
  enabled: 'true',
  roles: [],
  dept: { id: null },
-  phone: null
+  phone: null,
+  password: null
 }
 export default {
  name: 'User',
@@ -256,7 +269,7 @@ export default {
    ])
  },
  created() {
-    this.crud.msg.add = '新增成功，默认密码：123456'
+    this.crud.msg.add = '新增成功'
  },
  mounted: function() {
    const that = this
@@ -292,6 +305,7 @@ export default {
    },
    // 新增前将多选的值设置为空
    [CRUD.HOOK.beforeToAdd]() {
+      this.form.password = '123456'
      this.roleDatas = []
    },
    // 初始化编辑时候的角色与岗位
@@ -435,6 +449,29 @@ export default {
    },
    checkboxT(row, rowIndex) {
      return row.id !== this.user.id
+    },
+    resetPassword(row) {
+      row.password = null
+      this.$prompt('', '重置密码', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPlaceholder: '请输入新的密码',
+        inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
+        inputErrorMessage: '密码格式不正确,只能是6-20位密码',
+        closeOnClickModal: false
+      }).then(({ value }) => {
+        row.password = value
+        crudUser.edit(row).then(res => {
+          console.log(res)
+          this.crud.toQuery()
+          this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消输入'
+        })
+      })
    }
  }
 }