From a870596705b3fddd653866589c551e20c9eaf320 Mon Sep 17 00:00:00 2001
From: "[yxf]" <[1524240689@qq.com]>
Date: Wed, 1 Apr 2026 14:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=85=8D=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserServiceImpl.java         | 27 ------
 im-uniapp/pages/login/login.vue               | 89 +++----------------
 2 files changed, 14 insertions(+), 102 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java
index 3a89f18..897cc16 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java
@@ -87,33 +87,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public LoginVO login(LoginDTO dto) {
-        User user = this.findUserByUserName(dto.getUserName());
-        if (Objects.isNull(user)) {
-            throw new GlobalException("用户不存在");
-        }
-        if(user.getIsCustomer() == 2){
-            throw new GlobalException("用户不存在");
-        }
-        if (user.getIsBanned()) {
-            String tip = String.format("您的账号因'%s'已被管理员封禁,请联系客服!",user.getReason());
-            throw new GlobalException(tip);
-        }
-        if (!passwordEncoder.matches(dto.getPassword(), user.getPassword())) {
-            throw new GlobalException(ResultCode.PASSWOR_ERROR);
-        }
-        if(!Objects.isNull(dto.getIp())){
-            user.setLastLoginIp(dto.getIp());
-            this.updateIpAndAddress(user);
-        }
-        // 生成token
-        UserSession session = BeanUtils.copyProperties(user, UserSession.class);
-        session.setUserId(user.getId());
-        session.setTerminal(dto.getTerminal());
-        String strJson = JSON.toJSONString(session);
-        String accessToken = JwtUtil.sign(user.getId(), strJson, jwtProperties.getAccessTokenExpireIn(),
-            jwtProperties.getAccessTokenSecret());
-        String refreshToken = JwtUtil.sign(user.getId(), strJson, jwtProperties.getRefreshTokenExpireIn(),
-            jwtProperties.getRefreshTokenSecret());
         // 生成游客唯一标识UUID
         String guestUuid = UUID.randomUUID().toString();
 
diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue
index 2e8b51a..0842b58 100644
--- a/im-uniapp/pages/login/login.vue
+++ b/im-uniapp/pages/login/login.vue
@@ -1,57 +1,14 @@
 <template>
-	<view class="login">
-		<!-- 主要内容区域 -->
-		<view class="content">
-			<!-- Logo和标题区域 -->
-			<view class="header">
-				<view class="title">欢迎登录</view>
-				<view class="subtitle">登录您的账号，开启聊天之旅</view>
-			</view>
-
-			<!-- 表单区域 -->
-			<view class="form-container">
-				<view class="form">
-					<view class="form-item" :class="{'focused': userNameFocused}">
-						<view class="icon-wrapper">
-							<view class="icon iconfont icon-username"></view>
-						</view>
-						<input class="input" type="text" v-model="dataForm.userName" placeholder="用户名"
-							@focus="userNameFocused = true" @blur="userNameFocused = false" />
-					</view>
-					<view class="form-item" :class="{'focused': passwordFocused}">
-						<view class="icon-wrapper">
-							<view class="icon iconfont icon-pwd"></view>
-						</view>
-						<input class="input" :type="isShowPwd?'text':'password'" v-model="dataForm.password"
-							placeholder="密码" @focus="passwordFocused = true" @blur="passwordFocused = false" />
-						<view class="icon-suffix iconfont" :class="isShowPwd?'icon-pwd-show':'icon-pwd-hide'"
-							@click="onSwitchShowPwd"></view>
-					</view>
-				</view>
-
-				<!-- 登录按钮 -->
-				<button class="submit-btn" @click="submit" type="primary">
-					<view class="btn-content">
-						<text class="btn-text">立即登录</text>
-					</view>
-				</button>
-
-				<!-- 底部导航 -->
-				<view class="nav-tool-bar">
-					<view class="nav-register">
-						<navigator url="/pages/register/register" class="register-link">
-							<text class="register-text">没有账号？</text>
-							<text class="register-highlight">立即注册</text>
-						</navigator>
-					</view>
-				</view>
-			</view>
-		</view>
+	<view>
 	</view>
 </template>
 
 <script>
 import UNI_APP from '@/.env.js';
+
+// 【全局唯一锁】整个APP只执行一次，无论多少个页面实例
+let GLOBAL_AUTO_LOGIN_LOCK = false;
+
 export default {
 	data() {
 		return {
@@ -67,18 +24,7 @@ export default {
 		}
 	},
 	methods: {
-		async submit() {
-			if (!this.dataForm.userName) {
-				return uni.showToast({
-					title: "请输入您的账号",
-					icon: "none"
-				})
-			}
-			if (!this.dataForm.password) {
-				return uni.showToast({
-					title: "请输入您的密码",
-					icon: "none"
-				})
+<<<<<<< HEAD
 		autoLogin() {
 			// ========================
 			// 全局锁：这辈子只跑一次
@@ -100,12 +46,7 @@ export default {
 				    })
 				return;
 			}
-
-			await this.getIp();
-
-			console.log("登录参数：", this.dataForm);
-
-
+      this.getIp();
 			// 无账号密码 → 不登录
 			// if (!userName || !password) {
 			// 	console.log("无缓存账号密码，不自动登录");
@@ -123,7 +64,7 @@ export default {
 			}).then(loginInfo => {
 				uni.setStorageSync("isAgree", this.isAgree);
 				uni.setStorageSync("loginInfo", loginInfo);
-
+				
 				getApp().$vm.init()
 				console.log("loginInfo", loginInfo);
 				this.$http({
@@ -147,11 +88,10 @@ export default {
 				console.log("自动登录失败", err);
 			});
 			// uni.navigateTo({ url: "/pages/chat/chat-box?chatIdx=0"  });
-
-
-
+			
+			
+			
 		},
-
 		async getIp() {
 			// 获取本机ip
 			return new Promise((resolve, reject) => {
@@ -172,19 +112,18 @@ export default {
 			});
 		},
 
-
 		onSwitchShowPwd() {
 			this.isShowPwd = !this.isShowPwd;
 		}
 	},
 
 	onLoad() {
-
+		
 		// 延迟执行，彻底避开双加载
 		setTimeout(() => {
 			this.autoLogin();
-
-
+			
+			
 		}, 50);
 	},