reghao 4 месяцев назад
Родитель
Сommit
55429177e2

+ 0 - 9
account/account-api/pom.xml

@@ -12,13 +12,4 @@
     <groupId>cn.reghao.tnb.account</groupId>
     <artifactId>account-api</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.reghao.jutil</groupId>
-            <artifactId>web</artifactId>
-            <version>jdk17-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
 </project>

+ 11 - 0
common/pom.xml

@@ -19,6 +19,17 @@
             <version>jdk17-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.4.14</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.14</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoPostController.java

@@ -6,7 +6,7 @@ import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.api.dto.VideoFilePublish;
 import cn.reghao.tnb.content.api.dto.VideoFileUpdate;
-import cn.reghao.tnb.content.api.dto.VideoPublishSbt;
+import cn.reghao.tnb.content.app.vod.model.dto.VideoPublishSbt;
 import cn.reghao.tnb.content.app.vod.model.dto.*;
 import cn.reghao.tnb.content.api.dto.UserVideoPost;
 import cn.reghao.tnb.content.app.vod.service.VideoPostQuery;

+ 1 - 1
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoPublishSbt.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoPublishSbt.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.api.dto;
+package cn.reghao.tnb.content.app.vod.model.dto;
 
 import cn.reghao.jutil.web.validator.ValidEnum;
 import cn.reghao.tnb.content.api.constant.PostScope;

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.constant.VideoStatus;
-import cn.reghao.tnb.content.api.dto.VideoPublishSbt;
+import cn.reghao.tnb.content.app.vod.model.dto.VideoPublishSbt;
 import cn.reghao.tnb.content.api.dto.spider.CrawledVideo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoPostService.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.content.api.dto.VideoFilePublish;
-import cn.reghao.tnb.content.api.dto.VideoPublishSbt;
+import cn.reghao.tnb.content.app.vod.model.dto.VideoPublishSbt;
 import cn.reghao.tnb.content.api.dto.VideoFileUpdate;
 import cn.reghao.tnb.content.app.vod.model.dto.*;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostServiceImpl.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.VideoFilePublish;
 import cn.reghao.tnb.content.api.dto.VideoFileUpdate;
-import cn.reghao.tnb.content.api.dto.VideoPublishSbt;
+import cn.reghao.tnb.content.app.vod.model.dto.VideoPublishSbt;
 import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostMapper;
 import cn.reghao.tnb.content.app.vod.db.repository.VideoRepository;
 import cn.reghao.tnb.content.app.vod.model.dto.VideoCoverUpdate;

+ 0 - 10
pom.xml

@@ -79,16 +79,6 @@
             <optional>true</optional>
             <version>1.18.42</version>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.4.14</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.4.14</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>