diff --git a/conf/srs.conf b/conf/srs.conf
deleted file mode 100644
index 1311672..0000000
--- a/conf/srs.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-listen 1935;
-max_connections 1000;
-daemon off;
-http_api {
- enabled on;
- listen 1985;
-}
-http_server {
- enabled on;
- listen 8080;
-}
-vhost __defaultVhost__ {
- hls {
- enabled on;
- hls_path ./objs/nginx/html;
- hls_fragment 10;
- hls_window 60;
- }
- http_remux {
- enabled on;
- mount [vhost]/[app]/[stream].flv;
- }
- dvr {
- enabled on;
- dvr_path ./recordings/[app]/[stream].flv;
- dvr_plan session;
- }
-}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 12f22de..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '3'
-services:
- srs:
- image: ossrs/srs:4
- ports:
- - "1935:1935" # RTMP
- - "8080:8080" # HTTP-FLV
- - "8088:8088" # HLS
- volumes:
- - ./conf/srs.conf:/usr/local/srs/conf/srs.conf
- - ./recordings:/usr/local/srs/recordings
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 141e4ea..3b6e392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,7 +304,11 @@
3.0.9
-
+
+
+ org.codehaus.janino
+ janino
+
diff --git a/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java b/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java
index 8fb43b7..7eabe1b 100644
--- a/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java
+++ b/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java
@@ -49,23 +49,15 @@ public class OperationLogAspect {
SysLog sysLog = new SysLog();
try {
- // 执行方法
Object result = point.proceed();
- // 设置状态为成功
sysLog.setStatus(1);
return result;
} catch (Exception e) {
- // 记录异常信息
sysLog.setStatus(0);
sysLog.setErrorMsg(e.getMessage());
throw e;
} finally {
- try {
- // 记录日志
- saveLog(point, operationLog, beginTime, sysLog);
- } catch (Exception e) {
- log.error("记录操作日志失败", e);
- }
+ saveLog(point, operationLog, beginTime, sysLog);
}
}
diff --git a/src/main/java/com/guwan/backend/controller/CommonController.java b/src/main/java/com/guwan/backend/controller/CommonController.java
index 45bd7a8..1e968eb 100644
--- a/src/main/java/com/guwan/backend/controller/CommonController.java
+++ b/src/main/java/com/guwan/backend/controller/CommonController.java
@@ -1,5 +1,6 @@
package com.guwan.backend.controller;
+import com.guwan.backend.annotation.OperationLog;
import com.guwan.backend.common.Result;
import com.guwan.backend.entity.BookContent;
import com.guwan.backend.mongodb.EveryReadDetailOfMongodb;
@@ -8,6 +9,7 @@ import com.guwan.backend.mongodb.User;
import com.guwan.backend.mongodb.MongodbUserService;
import com.guwan.backend.service.BookContentService;
import com.guwan.backend.util.MinioUtil;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
@@ -239,6 +241,7 @@ public class CommonController {
}
@GetMapping("/getUserOneTotalTime")
+ @OperationLog(description = "统计用户某本书的读书时间")
public Result getUserOneTotalTime(@RequestParam Long userId){
diff --git a/src/main/java/com/guwan/backend/mongodb/EveryReadDetailOfMongodbServiceImpl.java b/src/main/java/com/guwan/backend/mongodb/EveryReadDetailOfMongodbServiceImpl.java
index e5e8983..5f6b0c4 100644
--- a/src/main/java/com/guwan/backend/mongodb/EveryReadDetailOfMongodbServiceImpl.java
+++ b/src/main/java/com/guwan/backend/mongodb/EveryReadDetailOfMongodbServiceImpl.java
@@ -9,6 +9,8 @@ import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
+
+
@Slf4j
@Service
public class EveryReadDetailOfMongodbServiceImpl extends ServiceImpl implements EveryReadDetailOfMongodbService {
@@ -18,7 +20,7 @@ public class EveryReadDetailOfMongodbServiceImpl extends ServiceImpl list = this.list(new LambdaQueryChainWrapper<>(this.getBaseMapper(), EveryReadDetailOfMongodb.class)
.eq(EveryReadDetailOfMongodb::getUserId, userId));
- log.debug("list: {}", list);
+ log.info("list: {}", list);
Long total = 0L;
for (EveryReadDetailOfMongodb everyReadDetailOfMongodb : list) {
@@ -31,4 +33,5 @@ public class EveryReadDetailOfMongodbServiceImpl extends ServiceImpl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+
+ ${LOG_FILE}
+
+ ${LOG_PATH}/backend.%d{yyyy-MM-dd}.log
+ 30
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+
+ 0
+ 512
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file