hejianhao
2026-09-01 a67bed7c530e546392f9f84c1e64b124765513a4
fix0901: 修复问题3
1个文件已删除
5个文件已修改
44 ■■■■■ 已修改文件
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/home/controller/AppLiveRoomSettingController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/home/dto/CreateLiveRoomEntryRequest.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/home/service/AppVzanLiveEntryService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/test/java/com/tcm/training/admin/app/home/service/AppVzanLiveEntryServiceTest.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
traditionalApp/pages/home/home.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
traditionalApp/pages/home/service.js 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/home/controller/AppLiveRoomSettingController.java
@@ -1,6 +1,5 @@
package com.tcm.training.admin.app.home.controller;
import com.tcm.training.admin.app.home.dto.CreateLiveRoomEntryRequest;
import com.tcm.training.admin.app.home.service.AppVzanLiveEntryService;
import com.tcm.training.admin.app.home.vo.AppVzanLiveEntryVO;
import com.tcm.training.admin.common.ApiResponse;
@@ -8,11 +7,9 @@
import com.tcm.training.admin.live.vo.LiveRoomSettingVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@RestController
@RequestMapping({"/api/app/home", "/api/v1/app/home"})
@@ -32,7 +29,7 @@
    }
    @PostMapping("/live-room-entry")
    public ApiResponse<AppVzanLiveEntryVO> createEntry(@Valid @RequestBody CreateLiveRoomEntryRequest request) {
        return ApiResponse.ok(vzanLiveEntryService.createEntry(request.getUserId()));
    public ApiResponse<AppVzanLiveEntryVO> createEntry() {
        return ApiResponse.ok(vzanLiveEntryService.createEntry());
    }
}
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/home/dto/CreateLiveRoomEntryRequest.java
File was deleted
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/home/service/AppVzanLiveEntryService.java
@@ -49,15 +49,8 @@
        this.appAuthSessionService = appAuthSessionService;
    }
    public AppVzanLiveEntryVO createEntry(Long userId) {
        Long sessionUserId = null;
        try {
            sessionUserId = appAuthSessionService.getLoginUserId();
        } catch (RuntimeException ex) {
            log.warn("微赞直播入口会话userId获取失败,请检查APP Token格式,前端userId={}", userId, ex);
        }
        log.info("微赞直播入口userId对比,请求体userId={},会话userId={},是否一致={}",
                userId, sessionUserId, java.util.Objects.equals(userId, sessionUserId));
    public AppVzanLiveEntryVO createEntry() {
        Long userId = appAuthSessionService.getLoginUserId();
        LiveRoomSettingVO setting = liveRoomSettingService.current();
        String liveRoomUrl = setting == null ? null : StrUtil.trim(setting.getLiveRoomUrl());
        validateLiveRoomUrl(liveRoomUrl);
tcm-training-admin-backend/src/test/java/com/tcm/training/admin/app/home/service/AppVzanLiveEntryServiceTest.java
@@ -60,7 +60,8 @@
        clinic.setContactPhone("13800000000");
        when(clinicMapper.selectById(34L)).thenReturn(clinic);
        AppVzanLiveEntryVO result = service.createEntry(12L);
        when(appAuthSessionService.getLoginUserId()).thenReturn(12L);
        AppVzanLiveEntryVO result = service.createEntry();
        assertTrue(result.getUrl().startsWith("https://example.com/live?old=1&data="));
        assertEquals("webchatPay/wx074c1f0cf5a0ecf4 InAppPay", result.getUa());
traditionalApp/pages/home/home.vue
@@ -468,7 +468,7 @@
        try {
            console.log('[goWeiZanLive] 当前用户ID:', userId);
            console.log('[goWeiZanLive] 开始调用 createLiveRoomEntry 接口');
            const res = await createLiveRoomEntry(userId);
            const res = await createLiveRoomEntry();
            console.log('[goWeiZanLive] createLiveRoomEntry 返回:', JSON.stringify(res));
            const targetUrl = res?.data?.url?.trim();
traditionalApp/pages/home/service.js
@@ -52,6 +52,6 @@
/**
 * 根据当前登录用户生成短时有效的微赞直播入口。
 */
export const createLiveRoomEntry = (userId) => {
    return request.post('/api/app/home/live-room-entry', { userId }, false, false)
export const createLiveRoomEntry = () => {
    return request.post('/api/app/home/live-room-entry', {}, false, false)
}