[fix]修改配置文件

ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java

@@ -102,13 +102,7 @@ public class AppVlogController {
      */
     @PostMapping("publish")
     public R<Void> publish(@RequestBody VlogBO vlogBO) throws Exception {
-
-
-
         vlogService.createVlog(vlogBO);
-
-
-
         return R.ok();
     }
 
@@ -154,6 +148,27 @@ public class AppVlogController {
           vlogService.readVlog(loginUser.getUserId(), vlogBO.getId());
         return R.ok();
     }
+    @DeleteMapping("/delete/{id}")
+    public R<Void> delete(@PathVariable String id) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        vlogService.removeById(id);
+        return R.ok();
+    }
+    @PostMapping("/page")
+    public R<Page<IndexVlogVO>> page(@RequestBody VlogBO vlogBO) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        if(vlogBO.getMemberId()==null){
+            throw new ServiceException("用户id不能为空");
+        }
+        return R.ok(vlogService.getIndexVlogList(vlogBO,vlogBO.getPage()));
+    }
+
 
     @Tag(name = "手动触发缓存点赞最多视频")
     @PostMapping("/cacheTopLikedVlogs")

ruoyi-admin/src/main/resources/application-dev.yml

@@ -149,7 +149,6 @@ rocketmq:
     retry-times-when-send-failed: 3
     # 异步消息发送失败重试次数
     retry-times-when-send-async-failed: 3
-    namespace: dev
   # 消费者配置
   consumer:
     # 拉取消息最大数量
@@ -158,7 +157,6 @@ rocketmq:
     group: wzj_dev
     # 是否启动消费者
     enabled: true
-    namespace: dev
 --- # mail 邮件发送
 mail:
   enabled: false

ruoyi-admin/src/main/resources/application.yml

@@ -121,7 +121,7 @@ security:
     - /app/**
     - /resource/oss/**
     - /callback/api
-
+    - /cms/vlog/vodCallBack
 
 # 多租户配置
 tenant:

ruoyi-modules/pom.xml

@@ -16,13 +16,17 @@
         <module>ruoyi-system</module>
         <module>ruoyi-workflow</module>
         <module>ruoyi-order</module>
+
+
+
+
         <module>ruoyi-goods</module>
         <module>ruoyi-member</module>
         <module>ruoyi-content</module>
         <module>ruoyi-im</module>
         <module>ruoyi-auth</module>
         <module>ruoyi-transaction</module>
-        <module>ruoyi-statistics</module>
+<!--        <module>ruoyi-statistics</module>-->
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/consumer/VlogUploadMessageConsumer.java

@@ -36,7 +36,7 @@ import java.nio.file.Path;
 @RequiredArgsConstructor
 @RocketMQMessageListener(
     topic = RocketMQConfig.VLOG_UPLOAD_TOPIC,
-    consumerGroup = RocketMQConfig.VLOG_UPLOAD_GROUP,
+    consumerGroup = "VLOG_UPLOAD_GROUP_LOCAL",
     selectorExpression =  RocketMQConfig.VLOG_UPLOAD_TAG
 )
 public class VlogUploadMessageConsumer implements RocketMQListener<MessageExt> {
@@ -89,7 +89,7 @@ public class VlogUploadMessageConsumer implements RocketMQListener<MessageExt> {
         }
         String fileId = vlog.getFileId();
         //检查该文件是否为oss文件，如果不是说明已经上传过了
-        if (!vlog.getUrl().contains("#")) {
+        if (vlog.getUrl().contains("qcloud")) {
             return true;
         }
         //从oss下载文件

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java

@@ -25,7 +25,7 @@ public class VlogBO extends BaseBO {
     private String id;
 
     @ApiModelProperty(value = "作者id", hidden = true)
-    private String vlogerId;
+    private String memberId;
     private String url;
     private String cover;
     private String title;

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Vlog.java

@@ -1,10 +1,9 @@
 package com.wzj.soopin.content.domain.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 import org.dromara.common.core.domain.model.BaseAudit;
 
 @TableName(value = "cont_vlog", autoResultMap = true)
@@ -85,4 +84,8 @@ public class Vlog extends BaseAudit {
      * 首帧图
      */
     private String firstFrameImg;
+
+    @TableLogic(value ="0", delval = "1")
+    @TableField(value ="del_flag",fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR)
+    private String delFlag;
 }

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java

@@ -145,7 +145,7 @@ public class VlogServiceImpl extends ServiceImpl<VlogMapper, Vlog> implements Vl
         if (loginUser == null) {
             throw new ServiceException("用户未登录");
         }
-        vlogBO.setVlogerId(String.valueOf(loginUser.getUserId()));
+        vlogBO.setMemberId(String.valueOf(loginUser.getUserId()));
 
         String vid = sid.nextShort();
         Vlog vlog = vlogConvert.toPo(vlogBO);
@@ -156,7 +156,7 @@ public class VlogServiceImpl extends ServiceImpl<VlogMapper, Vlog> implements Vl
         vlog.setIsPrivate(YesOrNo.NO.type);
 
         vlog.setMemberId(loginUser.getUserId()+"");
-        vlog.setUrl(vlogBO.getUrl()==null?"#":vlogBO.getUrl());
+        vlog.setUrl("#");
         vlogMapper.insert(vlog);
 
 

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml

@@ -44,6 +44,9 @@
         <if test="bo.cityCode != null and bo.cityCode != ''">
           AND v.city_code = #{bo.cityCode}
         </if>
+      <if test="bo.memberId != null and bo.memberId != ''">
+          AND v.member_id = #{bo.memberId}
+      </if>
         <if test="bo.title != null and bo.title != ''">
           AND v.title like '%${bo.title}%'
         </if>

ruoyi-modules/ruoyi-statistics/src/main/resources/META-INF/maven/archetype.xml

@@ -0,0 +1,9 @@
+<archetype>
+  <id>ruoyi-statistics</id>
+  <sources>
+    <source>src/main/java/App.java</source>
+  </sources>
+  <testSources>
+    <source>src/test/java/AppTest.java</source>
+  </testSources>
+</archetype>

ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>$org.dromara</groupId>
+  <artifactId>$ruoyi-statistics</artifactId>
+  <version>$5.3.1</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/main/java/App.java

@@ -0,0 +1,13 @@
+package $org.dromara;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/test/java/AppTest.java

@@ -0,0 +1,38 @@
+package $org.dromara;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -165,7 +165,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         tenant.setDomain(bo.getDomain());
         tenant.setIntro(bo.getIntro());
         tenant.setPackageId(bo.getPackageId());
-        tenant.setAccountCount(bo.getAccountCount());
+        tenant.setAccountCount(10l);
         tenant.setStatus(bo.getStatus());
         tenant.setDelFlag(bo.getDelFlag());
         tenant.setBusinessLicense(bo.getBusinessLicense());

script/docker/nginx/conf/nginx.conf

@@ -50,8 +50,8 @@ http {
             index  index.html index.htm;
             try_files $uri $uri/ /index.html;
         }
-        location /dev-api/  {
+        location /prod-api/  {
-            proxy_pass   http://192.168.1.65:8880/;
+            proxy_pass   http://43.143.227.203:8880/;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;