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 index 5499cd0..c2c0182 100644 --- 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 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 index d0dcc16..e8b079a 100644 --- 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 index f972f85..604a032 100644 --- a/vue/src/views/Login.vue +++ b/vue/src/views/Login.vue @@ -1,6 +1,6 @@