Merge branch 'refs/heads/feature/community-center' into preview

修改重复提交接口时间间隔为1秒
新增文件测试
2025-03-17 17:31:26 +08:00 · 2025-03-17 16:42:00 +08:00 · 2025-03-17 16:24:27 +08:00 · 2025-03-15 14:12:11 +08:00 · 2025-03-15 10:10:49 +08:00
10 changed files with 93 additions and 107 deletions
--- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java
+++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java
@ -7,6 +7,7 @@ import com.mcwl.resource.domain.request.RequestFile;
 import com.mcwl.resource.service.impl.FileServiceImpl;
 import com.mcwl.web.controller.common.OssUtil;
 import com.obs.services.ObsClient;
+import com.obs.services.exception.ObsException;
 import com.obs.services.model.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@ -285,48 +286,51 @@ public class FileController {
        return fileService.selectHash(hashCode,type);
    }

-//    @PostMapping("/test")
-//    public R test(@RequestParam File file){
-//
-//        // 创建上传请求
-//        ObjectMetadata metadata = new ObjectMetadata();
-//        metadata.setContentLength(file.length());
-//        InitiateMultipartUploadRequest initiateRequest = new InitiateMultipartUploadRequest(bucketName, file.getName(), metadata);
-//        InitiateMultipartUploadResult initiateResult = obsClient.initiateMultipartUpload(initiateRequest);
-//        String uploadId = initiateResult.getUploadId();
-//
-//        // 分片上传
-//        long partSize = 5 * 1024 * 1024; // 分片大小为5MB
-//        long filePosition = 0;
-//        int partNumber = 1;
-//        while (filePosition < file.length()) {
-//            long currentPartSize = Math.min(partSize, file.length() - filePosition);
-//            UploadPartRequest uploadRequest = new UploadPartRequest();
-//            uploadRequest.setBucketName(bucketName);
-//            uploadRequest.setObjectKey(file.getName());
-//            uploadRequest.setUploadId(uploadId);
-//            uploadRequest.setFile(file);
-//            uploadRequest.setPartSize(currentPartSize);
-//            uploadRequest.setPartNumber(partNumber);
-//            uploadRequest.setPosition(filePosition);
-//            UploadPartResult uploadResult = obsClient.uploadPart(uploadRequest);
-//            PartEtag partEtag = new PartEtag(uploadResult.getEtag(), uploadResult.getPartNumber());
-//            partNumber++;
-//            filePosition += currentPartSize;
-//        }
-//
-//        // 完成分片上传
-//        CompleteMultipartUploadRequest completeRequest = new CompleteMultipartUploadRequest(bucketName, file.getName(), uploadId);
-//        obsClient.completeMultipartUpload(completeRequest);
-//        String key = completeRequest.getObjectKey();
-//        return R.ok(key);
-//    }
-
-
    @PostMapping("/updateFileData")
    public R updateFileData(@RequestBody RequestFile requestFile){

        return fileService.updateFileData(requestFile);
    }

+
+    @GetMapping("/test")
+    public R test(@RequestParam String filePath,String objectkey){
+
+        try {
+
+            UploadFileRequest request = new UploadFileRequest(bucketName, objectkey);
+            // 设置待上传的本地文件，localfile为待上传的本地文件路径，需要指定到具体带文件后缀的文件名
+            request.setUploadFile(filePath);
+            // 设置分段上传时的最大并发数
+            request.setTaskNum(5);
+            // 设置分段大小为10MB
+            request.setPartSize(10 * 1024 * 1024);
+            // 开启断点续传模式
+            request.setEnableCheckpoint(true);
+            // 进行断点续传上传
+            CompleteMultipartUploadResult result = obsClient.uploadFile(request);
+
+            log.info("上传完成:{}",result);
+            System.out.println("UploadFile successfully");
+        } catch (ObsException e) {
+            // 发生异常时可再次调用断点续传上传接口进行重新上传
+            System.out.println("UploadFile failed");
+            // 请求失败,打印http状态码
+            System.out.println("HTTP Code:" + e.getResponseCode());
+            // 请求失败,打印服务端错误码
+            System.out.println("Error Code:" + e.getErrorCode());
+            // 请求失败,打印详细错误信息
+            System.out.println("Error Message:" + e.getErrorMessage());
+            // 请求失败,打印请求id
+            System.out.println("Request ID:" + e.getErrorRequestId());
+            System.out.println("Host ID:" + e.getErrorHostId());
+            e.printStackTrace();
+        } catch (Exception e) {
+            System.out.println("UploadFile failed");
+            // 其他异常信息打印
+            e.printStackTrace();
+        }
+
+        return R.ok();
+    }
 }
--- a/mcwl-admin/src/main/resources/application-dev.yml
+++ b/mcwl-admin/src/main/resources/application-dev.yml
@ -2,7 +2,7 @@
 spring:
  #mq
  rabbitmq:
-    host: 1.13.246.108
+    host: 113.45.190.154
    port: 5672
    username: guest
    password: guest
@ -23,7 +23,7 @@ spring:
    druid:
      # 主库数据源
      master:
-        url: jdbc:mysql://1.13.246.108:3306/mcwl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://113.45.190.154:3306/mcwl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: ybl123456@
      # 从库数据源
@ -156,11 +156,11 @@ mall:
 #      alipayCertPath: D:\workspace\mochuang\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayPublicCert.crt
 #      # 沙箱支付宝根证书路径
 #      alipayRootCertPath: D:\workspace\mochuang\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayRootCert.crt
-      notifyUrl: http://1.13.246.108:8080/ali/pay/notify
+      notifyUrl: http://113.45.190.154:8080/ali/pay/notify
      # 沙箱支付宝网关
      gatewayUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do
      # 绑定回调
-      bindUrl: http://1.13.246.108:8080/ali/pay/callback
+      bindUrl: http://113.45.190.154:8080/ali/pay/callback

 huawei:
  obs:
@ -171,7 +171,7 @@ huawei:
      endPoint: obs.cn-south-1.myhuaweicloud.com

 mqtt:
-  broker-url: tcp://192.168.136.128:1883
+  broker-url: tcp://113.45.190.154:1883
  client-id-prefix: emqx-client
  connection-timeout: 30
  keep-alive-interval: 60
--- a/mcwl-common/src/main/java/com/mcwl/common/annotation/RepeatSubmit.java
+++ b/mcwl-common/src/main/java/com/mcwl/common/annotation/RepeatSubmit.java
@ -22,7 +22,7 @@ public @interface RepeatSubmit
    /**
     * 间隔时间(ms)，小于此时间视为重复提交
     */
-    public int interval() default 5000;
+    public int interval() default 1000;

    /**
     * 提示消息
--- a/mcwl-pay/src/main/java/com/mcwl/pay/config/AliConfig.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/config/AliConfig.java
@ -3,7 +3,6 @@ package com.mcwl.pay.config;

 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;

--- a/mcwl-pay/src/main/java/com/mcwl/pay/service/AliPayService.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/AliPayService.java
@ -1,12 +1,10 @@
 package com.mcwl.pay.service;

 import com.alipay.api.AlipayApiException;
-import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.pay.domain.OrderTradeDto;
 import com.mcwl.pay.domain.vo.PayVo;

-import javax.validation.constraints.NotNull;
 import java.io.FileNotFoundException;

 public interface AliPayService {
--- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java
@ -2,7 +2,6 @@ package com.mcwl.pay.service.impl;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.extra.mail.MailUtil;
 import cn.hutool.json.JSONUtil;
@ -11,16 +10,12 @@ import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.AlipayConfig;
 import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.AlipayFundAccountQueryModel;
 import com.alipay.api.domain.AlipayFundTransUniTransferModel;
 import com.alipay.api.domain.AlipayTradeQueryModel;
 import com.alipay.api.domain.Participant;
-import com.alipay.api.internal.util.file.IOUtils;
-import com.alipay.api.request.AlipayFundAccountQueryRequest;
 import com.alipay.api.request.AlipayFundTransUniTransferRequest;
 import com.alipay.api.request.AlipaySystemOauthTokenRequest;
 import com.alipay.api.request.AlipayTradeQueryRequest;
-import com.alipay.api.response.AlipayFundAccountQueryResponse;
 import com.alipay.api.response.AlipayFundTransUniTransferResponse;
 import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
@ -28,10 +23,7 @@ import com.alipay.easysdk.factory.Factory;
 import com.alipay.easysdk.kernel.Config;
 import com.alipay.easysdk.payment.common.models.AlipayTradeCancelResponse;
 import com.alipay.easysdk.payment.facetoface.models.AlipayTradePrecreateResponse;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.mcwl.common.JSONUtils;
 import com.mcwl.common.constant.HttpStatus;
-import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.common.core.domain.entity.SysUser;
 import com.mcwl.common.core.redis.RedisCache;
@ -58,12 +50,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ResourceUtils;

 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;

--- a/mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java
@ -1,45 +1,40 @@
-//package com.mcwl.pay.task;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.mcwl.common.constant.QueueConstants;
-//import com.mcwl.memberCenter.domain.Member;
-//import com.mcwl.pay.domain.OrderTrade;
-//import com.mcwl.pay.service.AliPayService;
-//import com.mcwl.pay.service.OrderTradeService;
-//import lombok.RequiredArgsConstructor;
-//import org.joda.time.LocalDateTime;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Date;
-//import java.util.List;
-//import java.util.function.Consumer;
-//
-//@Component("payTask")
-//@RequiredArgsConstructor
-//public class PayTask {
-//
-//    private final OrderTradeService orderTradeService;
-//
-//
-//    /**
-//     * 删除失效订单 间隔1h检查 0 0 0/1 * * ?
-//     */
-//    public void deleteInvalidOrderTask() {
-//
-//        Date date = LocalDateTime.now().plusMinutes(-15).toDate();
-//
-//        List<OrderTrade> orderTradeList = orderTradeService.lambdaQuery()
-//                .le(OrderTrade::getCreateTime, date)
-//                .and(wrapper -> wrapper
-//                        .eq(OrderTrade::getOrderStatus, 4)
-//                        .or()
-//                        .eq(OrderTrade::getPayStatus, 1)
-//                )
-//                .list();
-//
-//        orderTradeService.removeBatchByIds(orderTradeList);
-//
-//    }
-//
-//
-//}
+package com.mcwl.pay.task;
+
+import com.mcwl.pay.domain.OrderTrade;
+import com.mcwl.pay.service.OrderTradeService;
+import lombok.RequiredArgsConstructor;
+import org.joda.time.LocalDateTime;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component("payTask")
+@RequiredArgsConstructor
+public class PayTask {
+
+    private final OrderTradeService orderTradeService;
+
+
+    /**
+     * 删除失效订单 间隔1h检查 0 0 0/1 * * ?
+     */
+    public void deleteInvalidOrderTask() {
+
+        Date date = LocalDateTime.now().plusMinutes(-15).toDate();
+
+        List<OrderTrade> orderTradeList = orderTradeService.lambdaQuery()
+                .le(OrderTrade::getCreateTime, date)
+                .and(wrapper -> wrapper
+                        .eq(OrderTrade::getOrderStatus, 4)
+                        .or()
+                        .eq(OrderTrade::getPayStatus, 1)
+                )
+                .list();
+
+        orderTradeService.removeBatchByIds(orderTradeList);
+
+    }
+
+
+}
--- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java
@ -52,4 +52,7 @@ public class ResponseCollect {
    @ApiModelProperty(value = "是否下载")
    private Integer isDownload;

+    @ApiModelProperty(value = "触发词")
+    private String triggerWords = "-";
+
 }
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java
@ -66,10 +66,7 @@ public class CollectServiceImpl implements CollectService {

            //查询工作流
            List<ResponseCollect> responseCollectList = collectMapper.selectCollectWorkFlow(userIdMax);
-            //校验是否下载
-            for (ResponseCollect collect : responseCollectList) {
-                collect.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,collect.getId(),1));
-            }
+


            return R.ok(responseCollectList);
--- a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml
+++ b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml
@ -26,7 +26,7 @@
    </select>

    <select id="selectCollectModel" resultType="com.mcwl.resource.domain.response.ResponseCollect">
-        SELECT 	c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type
+        SELECT 	c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type,v.trigger_words
        FROM collect as c
                 LEFT JOIN model_version as v on c.product_id = v.id
                 LEFT JOIN model as m on  v.model_id = m.id
Author	SHA1	Message	Date
yang	940b6b4125	Merge branch 'refs/heads/feature/community-center' into preview	2025-03-17 17:31:26 +08:00
Diyu0904	0dcf869ce3	修改重复提交接口时间间隔为1秒	2025-03-17 16:42:00 +08:00
Diyu0904	20b74ebdcd	新增文件测试	2025-03-17 16:24:27 +08:00
Diyu0904	00693ef802	修改查看收藏列表接口修改配置为新测试环境	2025-03-15 14:12:11 +08:00
Diyu0904	8ca5ff3290	恢复支付宝	2025-03-15 10:10:49 +08:00