feature

1. 允许修改登录类型
behappy-project · Apr 26, 2023 · 50c187c · 50c187c
1 parent 0576462
commit 50c187c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/screw/src/main/java/org/xiaowu/behappy/screw/service/UserService.java b/screw/src/main/java/org/xiaowu/behappy/screw/service/UserService.java
@@ -93,7 +93,6 @@ public UserDto login(UserDto userDTO) {
                     // 校验数据库是否包含此user数据，如果没有则save
                     LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(User::getUsername, userDTO.getUsername());
-                    queryWrapper.eq(User::getLoginType, LoginType.LDAP);
                     User userInfo = getUserInfo(queryWrapper);
                     if (userInfo == null) {
                         dbUser = userList.get(0);

diff --git a/vue/public/config.js b/vue/public/config.js
@@ -1,2 +1,3 @@
+export const version = "v2.1.1"
 export const serverIp = window.location.origin
 // export const serverIp = "http://localhost:8080"
diff --git a/vue/src/views/Login.vue b/vue/src/views/Login.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="wrapper">
-    <div style="margin: 10px 20px; font-size: 14px;">Version: v2.1.0</div>
+    <div style="margin: 10px 20px; font-size: 14px;">Version: {{version}}</div>
     <div
         style="margin: 200px auto; background-color: #fff; width: 350px; height: 300px; padding: 20px; border-radius: 10px">
       <div style="margin: 20px 0; text-align: center; font-size: 24px"><b>登 录</b></div>
@@ -23,11 +23,12 @@
 </template>
 
 <script>
-
+import {version} from "../../public/config";
 export default {
   name: "Login",
   data() {
     return {
+      version,
       user: {},
       rules: {
         username: [

diff --git a/vue/src/views/Register.vue b/vue/src/views/Register.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="wrapper">
+    <div style="margin: 10px 20px; font-size: 14px;">Version: {{version}}</div>
     <div style="margin: 100px auto; background-color: #fff; width: 350px; height: 400px; padding: 20px; border-radius: 10px">
       <div style="margin: 20px 0; text-align: center; font-size: 24px"><b>注 册</b></div>
       <el-form :model="user" :rules="rules" ref="userForm">
@@ -22,10 +23,12 @@
 </template>
 
 <script>
+import {version} from "../../public/config";
 export default {
   name: "Login",
   data() {
     return {
+      version,
       user: {},
       rules: {
         username: [

diff --git a/vue/src/views/User.vue b/vue/src/views/User.vue
@@ -85,6 +85,11 @@
         <el-form-item label="地址">
           <el-input v-model="form.address" autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="登录类型">
+            <el-select clearable v-model="form.loginType" placeholder="请选择登录类型" style="width: 100%">
+                <el-option v-for="(item,index) in loginTypes" :key="index" :label="item.val" :value="item.val"></el-option>
+            </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -113,6 +118,14 @@ export default {
       dialogFormVisible: false,
       multipleSelection: [],
       roles: [],
+      loginTypes: [
+          {
+              val: "LDAP"
+          },
+          {
+              val: "DATABASE"
+          },
+      ],
       user: JSON.parse(localStorage.getItem("user"))
     }
   },