修改用户端传参

im-platform/src/main/java/com/bx/implatform/dto/LoginDTO.java

@@ -35,7 +35,7 @@ public class LoginDTO {
     private String uniqueToken;
 
     @Schema(description = "客服ID")
-    private String keFuId;
+    private String customerId;
 
     @Schema(description = "可切换客服账号")
     private String switchableAccountIds;

im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java

@@ -163,24 +163,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      */
     private Long getCustomerServiceId(LoginDTO dto) {
         // 1. 如果前端传了 kefuid，直接使用并验证该客服是否有效
-        if (StrUtil.isNotBlank(dto.getKeFuId())) {
+        if (StrUtil.isNotBlank(dto.getCustomerId())) {
             try {
-                Long kefuid = Long.parseLong(dto.getKeFuId());
+                Long customerId = Long.parseLong(dto.getCustomerId());
 
                 // 验证该客服是否存在且有效
-                User customer = this.getById(kefuid);
+                User customer = this.getById(customerId);
                 if (customer != null && customer.getIsCustomer() == 2) {
                     // 验证该客服的uniqueToken是否与传入的匹配
                     if (dto.getUniqueToken().equals(customer.getUniqueToken())) {
-                        return kefuid;
+                        return customerId;
                     } else {
-                        log.warn("前端传入的客服ID {} 的uniqueToken与当前不匹配，将使用token查询", kefuid);
+                        log.warn("前端传入的客服ID {} 的uniqueToken与当前不匹配，将使用token查询", customerId);
                     }
                 } else {
-                    log.warn("前端传入的客服ID {} 无效或不是客服，将使用token查询", kefuid);
+                    log.warn("前端传入的客服ID {} 无效或不是客服，将使用token查询", customerId);
                 }
             } catch (NumberFormatException e) {
-                log.warn("前端传入的kefuid格式错误：{}", dto.getKeFuId());
+                log.warn("前端传入的kefuid格式错误：{}", dto.getCustomerId());
             }
         }
         // 2. 通过uniqueToken查询客服

im-uniapp/pages/login/login.vue

@@ -21,7 +21,7 @@ export default {
 				ip: '',
 				sourceUrl: '',
 				uniqueToken: '',
-				kefuid: ''
+				customerid: ''
 			}
 		}
 	},
@@ -43,15 +43,15 @@ export default {
 				}
 			}
 			// #endif
-			
+
 			// #ifdef APP-PLUS
 			this.dataForm.sourceUrl = 'app';
 			// #endif
-			
+
 			// #ifdef MP-WEIXIN
 			this.dataForm.sourceUrl = 'wechat-miniprogram';
 			// #endif
-			
+
 			// 如果没有获取到，设置默认值
 			if (!this.dataForm.sourceUrl) {
 				this.dataForm.sourceUrl = 'unknown';
@@ -59,35 +59,35 @@ export default {
 			this.dataForm.sourceUrl = this.dataForm.sourceUrl.replace(/\/+$/, '');
 			console.log("来源网址：", this.dataForm.sourceUrl);
 		},
-		
+
-		// 获取URL参数中的token和kefuid
+		// 获取URL参数中的token和customerid
 		getTokenFromUrl() {
 			// #ifdef H5
 			const pages = getCurrentPages();
 			const currentPage = pages[pages.length - 1];
 			const options = currentPage.options || {};
-			
+
 			if (options.token) {
 				this.dataForm.uniqueToken = options.token;
 			}
-			
+
-			if (options.kefuid) {
+			if (options.customerid) {
-				this.dataForm.kefuid = options.kefuid;
+				this.dataForm.customerid = options.customerid;
 			}
-			
+
 			const urlParams = new URLSearchParams(window.location.search);
 			const token = urlParams.get('token');
-			const kefuid = urlParams.get('kefuid');
+			const customerid = urlParams.get('customerid');
-			
+
 			if (token) {
 				this.dataForm.uniqueToken = token;
 			}
-			
+
-			if (kefuid) {
+			if (customerid) {
-				this.dataForm.kefuid = kefuid;
+				this.dataForm.customerid = customerid;
 			}
 			// #endif
-			
+
 			// #ifdef APP-PLUS
 			// App端获取参数
 			const pages = getCurrentPages();
@@ -96,11 +96,11 @@ export default {
 			if (options.token) {
 				this.dataForm.uniqueToken = options.token;
 			}
-			if (options.kefuid) {
+			if (options.customerid) {
-				this.dataForm.kefuid = options.kefuid;
+				this.dataForm.customerid = options.customerid;
 			}
 			// #endif
-			
+
 			// #ifdef MP-WEIXIN
 			// 小程序端获取参数
 			const pages = getCurrentPages();
@@ -110,41 +110,40 @@ export default {
 				this.dataForm.uniqueToken = options.token;
 			}
 			console.log(options);
-			if (options.kefuid) {
+			if (options.customerid) {
-				this.dataForm.kefuid = options.kefuid;
+				this.dataForm.customerid = options.customerid;
 			}
 			// #endif
 		},
-		
+
 		async autoLogin() {
 			if (GLOBAL_AUTO_LOGIN_LOCK) return;
 			GLOBAL_AUTO_LOGIN_LOCK = true;
-		
+
 			// 获取token（优先使用URL中的token）
 			this.getTokenFromUrl();
-			
+
 			// 判断是否有 token，没有则跳转 404
 			if (!this.dataForm.uniqueToken) {
 				console.log("未携带token，跳转到404页面");
 				// #ifdef H5
-				// 考虑基础路径 /h5/
 				window.location.href = '/h5/#/pages/login/404';
 				// #endif
-				
+
 				// #ifndef H5
 				uni.redirectTo({
 					url: '/pages/login/404'
 				});
 				// #endif
-				
+
 				GLOBAL_AUTO_LOGIN_LOCK = false;
 				return;
 			}
-			
+
 			// 获取来源网址
 			this.getSourceUrl();
 			await this.getIp();
-			
+
 			// 准备登录数据
 			const loginData = {
 				terminal: this.dataForm.terminal,
@@ -153,9 +152,9 @@ export default {
 				ip: this.dataForm.ip,
 				sourceUrl: this.dataForm.sourceUrl,
 				uniqueToken: this.dataForm.uniqueToken,
-				keFuId: this.dataForm.kefuid,  // 添加kefuid参数
+				customerId: this.dataForm.customerid,
 			};
-			
+
 			this.$http({
 				url: '/login',
 				data: loginData,
@@ -163,56 +162,61 @@ export default {
 			}).then(loginInfo => {
 				uni.setStorageSync("isAgree", this.isAgree);
 				uni.setStorageSync("loginInfo", loginInfo);
-				
+
 				getApp().$vm.init()
 				getApp().$vm.unloadStore();
 				this.$http({
-				    url: "/friend/add?friendId=" + loginInfo.customerServiceId,
+					url: "/friend/add?friendId=" + loginInfo.customerServiceId,
-				    method: "POST"
+					method: "POST"
 				}).then((data) => {
-				    let friend = {
+					let friend = {
-				        id: loginInfo.user.id,
+						id: loginInfo.user.id,
-				        nickName: loginInfo.user.nickName,
+						nickName: loginInfo.user.nickName,
-				        headImage: loginInfo.user.headImageThumb,
+						headImage: loginInfo.user.headImageThumb,
-				        online: loginInfo.user.online,
+						online: loginInfo.user.online,
-				        delete: false
+						delete: false
-				    }
+					}
-				    this.friendStore.addFriend(friend);
+					this.friendStore.addFriend(friend);
-				    
+
-				    // 清除 URL 中的 token 参数，跳转到聊天页面
+					this.clearUrlParams();
-				    // #ifdef H5
+
-				    const cleanUrl = window.location.origin + '/h5/' + '#/pages/chat/chat-box?targetId=' + loginInfo.customerServiceId + '&type=PRIVATE';
-				    window.location.href = cleanUrl;
-				    // #endif
-				    
-				    // #ifndef H5
-				    uni.reLaunch({
-				        url: `/pages/chat/chat-box?targetId=${loginInfo.customerServiceId}&type=PRIVATE`
-				    });
-					// #endif
-				})
-				
-			}).catch(err => {
-				console.log("自动登录失败", err);
-				GLOBAL_AUTO_LOGIN_LOCK = false;
-				
-				// 如果是认证失败（如token无效），也可以跳转404
-				if (err && (err.code === 401 || err.statusCode === 401)) {
 					// #ifdef H5
-					window.location.href = '/h5/pages/login/404';
+					const cleanUrl = window.location.origin + '/h5/#/pages/chat/chat-box?targetId=' + loginInfo.customerServiceId + '&type=PRIVATE';
+					window.location.href = cleanUrl;
 					// #endif
-					
+
 					// #ifndef H5
-					uni.redirectTo({
+					uni.reLaunch({
-						url: '/pages/login/404'
+						url: `/pages/chat/chat-box?targetId=${loginInfo.customerServiceId}&type=PRIVATE`
 					});
 					// #endif
-				}
+				})
+
+			}).catch(err => {
+				console.log("自动登录失败", err);
+				GLOBAL_AUTO_LOGIN_LOCK = false;
+				this.clearUrlParams();
+
+				// #ifdef H5
+				window.location.href = '/h5/#/pages/login/404';
+				// #endif
+
+				// #ifndef H5
+				uni.redirectTo({ url: '/pages/login/404' });
+				// #endif
 			});
 		},
-		
+
+		clearUrlParams() {
+			// #ifdef H5
+			const url = new URL(window.location.href);
+			url.searchParams.delete('token');
+			url.searchParams.delete('customerid');
+			window.history.replaceState(null, '', url.pathname + url.search + url.hash);
+			// #endif
+		},
+
 		getIp() {
-			// 获取本机ip
 			return new Promise((resolve, reject) => {
 				uni.request({
 					url: 'https://api.ipify.org?format=json',
@@ -235,16 +239,14 @@ export default {
 	},
 
 	onLoad(options) {
-		// 在onLoad中直接获取options中的token
 		if (options.token) {
 			this.dataForm.uniqueToken = options.token;
 			console.log("onLoad获取到token：", this.dataForm.uniqueToken);
 		}
-		if (options.kefuid) {
+		if (options.customerid) {
-				this.dataForm.kefuid = options.kefuid;
+			this.dataForm.customerid = options.customerid;
-				console.log("onLoad获取到kefuid：", this.dataForm.kefuid);
+			console.log("onLoad获取到customerid：", this.dataForm.customerid);
-			}
+		}
-		// 延迟执行，彻底避开双加载
 		setTimeout(() => {
 			this.autoLogin();
 		}, 50);
@@ -254,4 +256,4 @@ export default {
 
 	}
 }
-</script>
+</script>