Merge remote-tracking branch 'origin/master_exclusive_shop_20250718' into master_exclusive_shop_20250718

# Conflicts:
#	fs-user-app/src/main/java/com/fs/app/controller/LiveController.java

fs-service-system/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java

@@ -771,7 +771,7 @@ public class LiveServiceImpl implements ILiveService
                 liveId +
                 "?" +
                 "txSecret=" +
-                DigestUtils.md5("a61df75ae15271d7ef922f308e61e92e" + liveId + to16Hex(now)) +
+                Md5Utils.hash("a61df75ae15271d7ef922f308e61e92e" + liveId + to16Hex(now)) +
                 "&" +
                 "txTime=" +
                 to16Hex(now);
@@ -791,7 +791,7 @@ public class LiveServiceImpl implements ILiveService
                 liveId +
                 ".flv?" +
                 "txSecret=" +
-                DigestUtils.md5("NiMfMYG5HQxZQ5bk88ri" + liveId + to16Hex(now)) +
+                Md5Utils.hash("NiMfMYG5HQxZQ5bk88ri" + liveId + to16Hex(now)) +
                 "&" +
                 "txTime=" +
                 to16Hex(now);

fs-user-app/src/main/java/com/fs/app/controller/LiveController.java

@@ -2,7 +2,6 @@ package com.fs.app.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fs.app.annotation.Login;
-import com.fs.app.facade.LiveFacadeService;
 import com.fs.app.vo.LiveInfoVo;
 import com.fs.app.vo.LiveVo;
 import com.fs.app.websocket.bean.SendMsgVo;
@@ -107,7 +106,7 @@ public class LiveController extends AppBaseController {
 		return liveFacadeService.liveDetail(id);
 	}
 
-	// @Login
+	@Login
 	@ApiOperation("直播间列表")
 	@GetMapping("/liveList")
 	@ApiResponse(code = 200, message = "", response = LiveInfoVo.class)