feature-nxdev #42

Merged
nanxun merged 3 commits from feature-nxdev into main 2026-01-13 22:08:35 +08:00
6 changed files with 89 additions and 38 deletions
@@ -53,6 +53,7 @@ namespace IM_API.Controllers
return Ok(res); return Ok(res);
} }
[HttpPost] [HttpPost]
[ProducesResponseType(typeof(BaseResponse<LoginDto>),StatusCodes.Status200OK)]
public async Task<IActionResult> Refresh(RefreshDto dto) public async Task<IActionResult> Refresh(RefreshDto dto)
{ {
(bool ok,int userId) = await _refreshTokenService.ValidateRefreshTokenAsync(dto.refreshToken); (bool ok,int userId) = await _refreshTokenService.ValidateRefreshTokenAsync(dto.refreshToken);
@@ -53,8 +53,8 @@ namespace IM_API.Services
if (json.IsNullOrEmpty) return (false,-1); if (json.IsNullOrEmpty) return (false,-1);
try try
{ {
var doc = JsonConvert.DeserializeObject<JsonElement>(json); using var doc = JsonDocument.Parse(json.ToString());
var userId = doc.GetProperty("UserId").GetInt32(); var userId = doc.RootElement.GetProperty("UserId").GetInt32();
return (true,userId); return (true,userId);
} }
catch catch
+44 -5
View File
@@ -2,10 +2,15 @@ import axios from 'axios'
import { useMessage } from '@/components/messages/useAlert'; import { useMessage } from '@/components/messages/useAlert';
import router from '@/router'; import router from '@/router';
import { useAuthStore } from '@/stores/auth'; import { useAuthStore } from '@/stores/auth';
import { authService } from './auth';
const message = useMessage(); const message = useMessage();
const authStore = useAuthStore(); const authStore = useAuthStore();
let waitqueue = [];
let isRefreshing = false;
const authURL = ['/auth/login', '/auth/register', '/auth/refresh'];
const api = axios.create({ const api = axios.create({
baseURL: import.meta.env.VITE_API_BASE_URL || 'http://localhost:3000/api', // 从环境变量中读取基础 URL baseURL: import.meta.env.VITE_API_BASE_URL || 'http://localhost:3000/api', // 从环境变量中读取基础 URL
timeout: 10000, timeout: 10000,
@@ -31,16 +36,50 @@ api.interceptors.response.use(
response => { response => {
return response.data; return response.data;
}, },
err => { async err => {
if (err.response) { const { config, response } = err;
switch (err.response.status) { if (response) {
switch (response.status) {
case 401: case 401:
if (authURL.some(x => config.url.includes(x))) {
authStore.logout();
message.error('未登录,请登录后操作。');
router.push('/auth/login')
break;
}
if (config._retry) {
break;
}
config._retry = true;
// 已经在刷新 → 排队
if (isRefreshing) {
return new Promise(resolve => {
waitqueue.push(token => {
config.headers.Authorization = `Bearer ${token}`
resolve(api(config))
})
})
}
isRefreshing = true;
const refreshToken = authStore.refreshToken;
console.log(authStore)
if (refreshToken != null && refreshToken != '') {
const res = await authService.refresh(refreshToken)
authStore.setLoginInfo(res.data.token, res.data.refreshToken, res.data.userInfo)
waitqueue.forEach(cb => cb(authStore.token));
waitqueue = [];
config.headers.Authorization = `Bearer ${authStore.token}`
return api(config)
}
authStore.logout();
message.error('未登录,请登录后操作。'); message.error('未登录,请登录后操作。');
router.push('/auth/login') router.push('/auth/login')
break; break;
case 400: case 400:
if (err.response.data && err.response.data.code == 1003) { if (response.data && response.data.code == 1003) {
message.error(err.response.data.message); message.error(response.data.message);
break; break;
} }
default: default:
+7 -1
View File
@@ -13,5 +13,11 @@ export const authService = {
* @param {*} data * @param {*} data
* @returns * @returns
*/ */
register: (data) => request.post('/auth/register', data) register: (data) => request.post('/auth/register', data),
/**
* 刷新用户凭证
* @param {*} data
* @returns
*/
refresh: (refreshToken) => request.post('/auth/refresh', { refreshToken })
} }
+7 -5
View File
@@ -4,10 +4,10 @@ import { defineStore } from 'pinia'
export const useAuthStore = defineStore('auth', () => { export const useAuthStore = defineStore('auth', () => {
const token = ref(localStorage.getItem('user_token') || ''); const token = ref(localStorage.getItem('user_token') || '');
const refreshToken = ref(localStorage.getItem('refresh_token') || ''); const refreshToken = ref(localStorage.getItem('refresh_token') || '');
const userInfo = ref(localStorage.getItem('user_info') || ''); const userInfo = ref(JSON.parse(localStorage.getItem('user_info')) || {});
//判断是否已登录 //判断是否已登录
const isLoggedIn = computed(() => !!token.value); const isLoggedIn = computed(() => !!refreshToken.value);
/** /**
* 登录成功保存状态 * 登录成功保存状态
@@ -15,12 +15,13 @@ export const useAuthStore = defineStore('auth', () => {
* @param {*} user 用户信息 * @param {*} user 用户信息
*/ */
function setLoginInfo(newToken, newRefreshToken, user) { function setLoginInfo(newToken, newRefreshToken, user) {
console.log(`设置凭证:\ntoken${newToken}\nrefreshToken:${newRefreshToken}`)
token.value = newToken; token.value = newToken;
refreshToken.value = newRefreshToken refreshToken.value = newRefreshToken
userInfo.value = user; userInfo.value = user;
localStorage.setItem('user_token', newToken); localStorage.setItem('user_token', newToken);
localStorage.setItem('refresh_token', refreshToken) localStorage.setItem('refresh_token', newRefreshToken)
localStorage.setItem('user_info', user) localStorage.setItem('user_info', JSON.stringify(user))
} }
/** /**
@@ -29,10 +30,11 @@ export const useAuthStore = defineStore('auth', () => {
function logout() { function logout() {
token.value = ''; token.value = '';
userInfo.value = null; userInfo.value = null;
refreshToken.value = ''
localStorage.removeItem('user_token'); localStorage.removeItem('user_token');
localStorage.removeItem('refresh_token') localStorage.removeItem('refresh_token')
localStorage.removeItem('user_info') localStorage.removeItem('user_info')
} }
return { token, userInfo, isLoggedIn, setLoginInfo, logout }; return { token, refreshToken, userInfo, isLoggedIn, setLoginInfo, logout };
}) })
+28 -25
View File
@@ -30,9 +30,9 @@
class="list-item" class="list-item"
:class="{active: activeContactId === c.id}" :class="{active: activeContactId === c.id}"
@click="activeContactId = c.id"> @click="activeContactId = c.id">
<img :src="c.avatar" class="avatar-std" /> <img :src="c.userInfo.avatar" class="avatar-std" />
<div class="info"> <div class="info">
<div class="name">{{ c.name }}</div> <div class="name">{{ c.remarkName }}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -43,21 +43,21 @@
<header class="profile-header"> <header class="profile-header">
<div class="text-info"> <div class="text-info">
<h2 class="display-name"> <h2 class="display-name">
{{ currentContact.name }} {{ currentContact.remarkName }}
<span :class="['gender-tag', currentContact.gender]"> <span :class="['gender-tag', 'm']">
{{ currentContact.gender === 'm' ? '♂' : '♀' }} {{ '♂' }}
</span> </span>
</h2> </h2>
<p class="sub-text">微信{{ currentContact.wxid }}</p> <p class="sub-text">{{ currentContact.userInfo.username }}</p>
<p class="sub-text">地区{{ currentContact.region }}</p> <p class="sub-text">地区{{ '未知' }}</p>
</div> </div>
<img :src="currentContact.avatar" class="big-avatar" /> <img :src="currentContact.userInfo.avatar" class="big-avatar" />
</header> </header>
<div class="profile-body"> <div class="profile-body">
<div class="info-row"> <div class="info-row">
<span class="label">备注名</span> <span class="label">昵称</span>
<span class="value">{{ currentContact.alias || '未设置' }}</span> <span class="value">{{ currentContact.userInfo.nickName }}</span>
</div> </div>
<div class="info-row"> <div class="info-row">
<span class="label">个性签名</span> <span class="label">个性签名</span>
@@ -65,7 +65,7 @@
</div> </div>
<div class="info-row"> <div class="info-row">
<span class="label">来源</span> <span class="label">来源</span>
<span class="value">通过搜索微信号添加</span> <span class="value">通过搜索号添加</span>
</div> </div>
</div> </div>
@@ -91,20 +91,24 @@ import { friendService } from '@/services/friend'
const searchQuery = ref('') const searchQuery = ref('')
const activeContactId = ref(null) const activeContactId = ref(null)
const contacts1 = ref([]); const contacts = ref([]);
// 模拟联系人数据
const contacts = ref([
{ id: 1, name: '南浔', wxid: 'nan_xun_99', region: '浙江 杭州', avatar: 'https://i.pravatar.cc/40?1', gender: 'f', signature: '山有木兮木有枝', alias: '南酱' },
{ id: 102, name: '老张', wxid: 'zhang_boss', region: '广东 深圳', avatar: 'https://i.pravatar.cc/40?10', gender: 'm', signature: '搞钱要紧', alias: '张总' },
{ id: 103, name: 'UI小王', wxid: 'wang_design', region: '上海 黄浦', avatar: 'https://i.pravatar.cc/40?5', gender: 'f', signature: '不改了,真的不改了', alias: '' },
{ id: 104, name: '测试组长', wxid: 'test_pro', region: '北京', avatar: 'https://i.pravatar.cc/40?8', gender: 'm', signature: 'Bug 哪里跑', alias: '铁面人' }
])
const filteredContacts = computed(() => { const filteredContacts = computed(() => {
return contacts.value.filter(c => const searchKey = searchQuery.value.toString().trim();
c.name.includes(searchQuery.value) || c.wxid.includes(searchQuery.value) if(!searchKey){
) return contacts.value;
}
return contacts.value.filter(c => {
if (!c) return false
const remark = c.remarkName || ''
const username = c.userInfo.username || ''
return remark.includes(searchKey) || username.includes(searchKey)
})
}) })
const currentContact = computed(() => { const currentContact = computed(() => {
@@ -121,15 +125,14 @@ function handleGoToChat() {
const loadContactList = async (page = 1,limit = 100) => { const loadContactList = async (page = 1,limit = 100) => {
const res = await friendService.getFriendList(page,limit); const res = await friendService.getFriendList(page,limit);
contacts1.value = res.data; contacts.value = res.data;
console.log(contacts.value)
} }
onMounted(async () => { onMounted(async () => {
await loadContactList(); await loadContactList();
const contacts = await friendService.getFriendList();
console.log(contacts)
}) })
</script> </script>