DevTest(页面适配增强实体): 登录、注册、忘记密码、所有用户、关注、粉丝、编辑个人信息、设置背景、上传头像、更换头像、文章发布、消息中心删除/已读、留言、取消关注 测试ok

Author: yangrunkang

upupor-data/src/main/java/com/upupor/data/dao/entity/Content.java

@@ -112,6 +112,10 @@ public class Content extends BaseEntity {
      */
     private String keywords;
 
+    private Content() {
+    }
+
+
     public static Content init() {
         Content newContent = new Content();
         newContent.setTagIds(CcConstant.EMPTY_STR);
@@ -123,5 +127,5 @@ public static Content init() {
         newContent.setLatestCommentTime(CcDateUtil.getCurrentTime());
         return newContent;
     }
-    
+
 }

upupor-data/src/main/java/com/upupor/data/dao/entity/enhance/ContentEnhance.java

@@ -144,7 +144,7 @@ public ContentEnhance() {
     }
 
     public static Content empty() {
-        return new Content();
+        return Content.init();
     }
 
     private void init() {

upupor-data/src/main/java/com/upupor/data/dto/page/ad/ContentAd.java

@@ -53,7 +53,8 @@ protected Boolean exists() {
 
     @Override
     protected void insertAd(int adIndex) {
-        Content ad = new Content();
+        Content ad = Content.init();
+        ;
         ad.setContentId(CcConstant.GoogleAd.FEED_AD);
         getVoList().add(adIndex, Converter.contentEnhance(ad));
     }

upupor-service/pom.xml

@@ -64,8 +64,8 @@
             <version>8.4.1</version>
             <exclusions>
                 <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
                     <artifactId>okhttp</artifactId>
+                    <groupId>com.squareup.okhttp3</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -76,6 +76,7 @@
             <artifactId>okhttp</artifactId>
             <version>4.9.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

upupor-service/src/main/java/com/upupor/service/business/editor/Create.java

@@ -192,7 +192,7 @@ protected void publishContentEvent(Content content) {
     }
 
     public static ContentEnhance create(String contentId, CreateContentReq createContentReq) {
-        Content content = new Content();
+        Content content = Content.init();
         content.setContentId(contentId);
         content.setTitle(createContentReq.getTitle());
         content.setContentType(createContentReq.getContentType());

upupor-service/src/main/java/com/upupor/service/business/replay/ContentReply.java

@@ -41,10 +41,10 @@
 import com.upupor.service.business.message.MessageSend;
 import com.upupor.service.business.message.model.MessageModel;
 import com.upupor.service.listener.event.ReplayCommentEvent;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
 import static com.upupor.framework.CcConstant.MsgTemplate.*;

upupor-service/src/main/java/com/upupor/service/business/replay/MessageBoardReply.java

@@ -37,9 +37,9 @@
 import com.upupor.service.business.message.MessageSend;
 import com.upupor.service.business.message.model.MessageModel;
 import com.upupor.service.listener.event.ReplayCommentEvent;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
 import static com.upupor.framework.CcConstant.MsgTemplate.*;

upupor-service/src/main/java/com/upupor/service/business/replay/RadioReply.java

@@ -41,10 +41,10 @@
 import com.upupor.service.business.message.MessageSend;
 import com.upupor.service.business.message.model.MessageModel;
 import com.upupor.service.listener.event.ReplayCommentEvent;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
 import static com.upupor.framework.CcConstant.MsgTemplate.*;

upupor-service/src/main/java/com/upupor/service/listener/ContentListener.java

@@ -126,7 +126,7 @@ public void createContent(PublishContentEvent createContentEvent) {
 
         ContentEnhance contentEnhance = contentService.getContentByContentIdNoStatus(contentId);
         Content content = contentEnhance.getContent();
-        if (Objects.isNull(content) || !content.getStatus().equals(ContentStatus.NORMAL)) {
+        if (Objects.isNull(content) || !ContentStatus.NORMAL.equals(content.getStatus())) {
             log.warn("文章不存在或者状态不正常,不执行后续事件");
             return;
         }

upupor-web/pom.xml

@@ -44,6 +44,17 @@
             <groupId>com.upupor.service</groupId>
             <artifactId>upupor-service</artifactId>
             <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>okhttp</artifactId>
+                    <groupId>com.squareup.okhttp3</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.0</version>
         </dependency>
         <!--添加定时任务模块-->
         <dependency>