From caf56217dc2bf898b63b0e1f31a7098202c32825 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 15 十一月 2025 16:50:17 +0800
Subject: [PATCH] Merge branch 'feature_gps'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index de6196c..4680343 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -37,11 +37,19 @@
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
{
- // 灏濊瘯鍒ゆ柇鏄墜鏈哄彿杩樻槸鐢ㄦ埛鍚�
+
+ // 灏濊瘯鍒ゆ柇鏄墜鏈哄彿銆乷penId杩樻槸鐢ㄦ埛鍚�
SysUser user = null;
+ // 鍒ゆ柇鏄惁涓哄井淇penID锛堥�氬父浠�"o"寮�澶达紝28浣嶅瓧绗︼級
+ if (username.startsWith("o") && username.length() == 28)
+ {
+ // 寰俊OpenID鐧诲綍
+ log.info("灏濊瘯浣跨敤寰俊OpenID鐧诲綍锛歿}", username);
+ user = userService.selectUserByOpenId(username);
+ }
// 鍒ゆ柇鏄惁涓烘墜鏈哄彿锛堢畝鍗曞垽鏂細鍏ㄦ槸鏁板瓧涓�11浣嶏級
- if (username.matches("^1[3-9]\\d{9}$"))
+ else if (username.matches("^1[3-9]\\d{9}$"))
{
// 鎵嬫満鍙风櫥褰�
log.info("灏濊瘯浣跨敤鎵嬫満鍙风櫥褰曪細{}", username);
--
Gitblit v1.9.1