From 910da9cdff8f4bfeabf800940cf6f7e722da2344 Mon Sep 17 00:00:00 2001 From: wangqx Date: Mon, 15 Sep 2025 17:29:57 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/app/AppVlogController.java | 27 ++++++++++--- .../src/main/resources/application-dev.yml | 2 - .../src/main/resources/application.yml | 2 +- ruoyi-modules/pom.xml | 6 ++- .../consumer/VlogUploadMessageConsumer.java | 4 +- .../wzj/soopin/content/domain/bo/VlogBO.java | 2 +- .../wzj/soopin/content/domain/po/Vlog.java | 9 +++-- .../content/service/impl/VlogServiceImpl.java | 4 +- .../mapper/content/VlogMapperCustom.xml | 3 ++ .../resources/META-INF/maven/archetype.xml | 9 +++++ .../resources/archetype-resources/pom.xml | 15 ++++++++ .../src/main/java/App.java | 13 +++++++ .../src/test/java/AppTest.java | 38 +++++++++++++++++++ .../service/impl/SysTenantServiceImpl.java | 2 +- script/docker/nginx/conf/nginx.conf | 4 +- 15 files changed, 119 insertions(+), 21 deletions(-) create mode 100644 ruoyi-modules/ruoyi-statistics/src/main/resources/META-INF/maven/archetype.xml create mode 100644 ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/pom.xml create mode 100644 ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/main/java/App.java create mode 100644 ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/test/java/AppTest.java diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java index f057bb536..3d88bff16 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java @@ -102,13 +102,7 @@ public class AppVlogController { */ @PostMapping("publish") public R 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 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(@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") diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 35a8b07d7..48c307b5e 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/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 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0880d439e..0ed42cd87 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -121,7 +121,7 @@ security: - /app/** - /resource/oss/** - /callback/api - + - /cms/vlog/vodCallBack # 多租户配置 tenant: diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index e038cbff7..9375ff8f2 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -16,13 +16,17 @@ ruoyi-system ruoyi-workflow ruoyi-order + + + + ruoyi-goods ruoyi-member ruoyi-content ruoyi-im ruoyi-auth ruoyi-transaction - ruoyi-statistics + ruoyi-modules diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/consumer/VlogUploadMessageConsumer.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/consumer/VlogUploadMessageConsumer.java index 6198f1522..73f37ed6e 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/consumer/VlogUploadMessageConsumer.java +++ b/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 { @@ -89,7 +89,7 @@ public class VlogUploadMessageConsumer implements RocketMQListener { } String fileId = vlog.getFileId(); //检查该文件是否为oss文件，如果不是说明已经上传过了 - if (!vlog.getUrl().contains("#")) { + if (vlog.getUrl().contains("qcloud")) { return true; } //从oss下载文件 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java index a1f3391bd..dc40ceeac 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Vlog.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Vlog.java index 892320879..fe388af97 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Vlog.java +++ b/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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; 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; } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index 682d5634b..0d23e6d40 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -145,7 +145,7 @@ public class VlogServiceImpl extends ServiceImpl 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 implements Vl vlog.setIsPrivate(YesOrNo.NO.type); vlog.setMemberId(loginUser.getUserId()+""); - vlog.setUrl(vlogBO.getUrl()==null?"#":vlogBO.getUrl()); + vlog.setUrl("#"); vlogMapper.insert(vlog); diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml index 4903f09a9..7febc888c 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml @@ -44,6 +44,9 @@ AND v.city_code = #{bo.cityCode} + + AND v.member_id = #{bo.memberId} + AND v.title like '%${bo.title}%' diff --git a/ruoyi-modules/ruoyi-statistics/src/main/resources/META-INF/maven/archetype.xml b/ruoyi-modules/ruoyi-statistics/src/main/resources/META-INF/maven/archetype.xml new file mode 100644 index 000000000..8d8f47604 --- /dev/null +++ b/ruoyi-modules/ruoyi-statistics/src/main/resources/META-INF/maven/archetype.xml @@ -0,0 +1,9 @@ + + ruoyi-statistics + + src/main/java/App.java + + + src/test/java/AppTest.java + + diff --git a/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/pom.xml b/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 000000000..dc71cdc6a --- /dev/null +++ b/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + $org.dromara + $ruoyi-statistics + $5.3.1 + + + junit + junit + 3.8.1 + test + + + diff --git a/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/main/java/App.java b/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/main/java/App.java new file mode 100644 index 000000000..1f568b3c4 --- /dev/null +++ b/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!" ); + } +} diff --git a/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/test/java/AppTest.java b/ruoyi-modules/ruoyi-statistics/src/main/resources/archetype-resources/src/test/java/AppTest.java new file mode 100644 index 000000000..a164754a6 --- /dev/null +++ b/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 ); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 0c898828e..c7d09fdb0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/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()); diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf index 78e3a9494..ab7f640f4 100644 --- a/script/docker/nginx/conf/nginx.conf +++ b/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/ { - proxy_pass http://192.168.1.65:8880/; + location /prod-api/ { + 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;