1.0.0
This commit is contained in:
abu
parent
02fed67671
commit
af5c762fa9
@ -33,7 +33,10 @@ public class FileController {
|
||||
@PostMapping("upload")
|
||||
public GraceJSONResult upload(MultipartFile file) throws Exception {
|
||||
// 获取 vlogdata 目录路径
|
||||
String storagePath = new File(System.getProperty("user.dir"), "vlogdata").getAbsolutePath();
|
||||
// String storagePath = new File(System.getProperty("user.dir"), "vlogdata").getAbsolutePath();
|
||||
String storagePath = "/data/vlogdata"; // 生产
|
||||
// String storagePath = "/Users/wuzhongjie/Desktop/vlog-1.0.0/vlogdata"; // 本地
|
||||
|
||||
log.info(storagePath);
|
||||
File storageDir = new File(storagePath);
|
||||
if (!storageDir.exists()) {
|
||||
|
||||
@ -4,9 +4,11 @@ package com.imooc.controller;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.imooc.base.BaseInfoProperties;
|
||||
import com.imooc.bo.VlogBO;
|
||||
import com.imooc.config.MinIOConfig;
|
||||
import com.imooc.enums.YesOrNo;
|
||||
import com.imooc.grace.result.GraceJSONResult;
|
||||
import com.imooc.service.VlogService;
|
||||
import com.imooc.utils.MinIOUtils;
|
||||
import com.imooc.utils.PagedGridResult;
|
||||
import com.qcloud.vod.model.VodUploadResponse;
|
||||
import io.swagger.annotations.Api;
|
||||
@ -32,7 +34,8 @@ public class VlogController extends BaseInfoProperties {
|
||||
private VlogService vlogService;
|
||||
@Autowired
|
||||
private QcCloud qcCloud;
|
||||
|
||||
@Autowired
|
||||
private MinIOConfig minIOConfig;
|
||||
|
||||
@PostMapping("vodCallBack")
|
||||
public GraceJSONResult vodCallBack(@RequestBody Map<String, Object> callbackData) {
|
||||
@ -79,8 +82,9 @@ public class VlogController extends BaseInfoProperties {
|
||||
}
|
||||
}
|
||||
log.info("任务流 [截取首帧，视频转码] 完成, FileId: {}, 封面图 URL: {},视频地址: {}", fileId, coverUrl,transVdUrl);
|
||||
// TODO: 更新数据库，存储首帧图,设置云端地址，删除本地视频文件
|
||||
// TODO: 更新数据库，存储首帧图,设置云端地址，删除minio视频文件
|
||||
vlogService.updateVlogFirstImg(fileId,coverUrl,transVdUrl);
|
||||
|
||||
} else {
|
||||
log.warn("MediaProcessResultSet 为空，回调数据: {}", callbackData);
|
||||
}
|
||||
@ -151,8 +155,10 @@ public class VlogController extends BaseInfoProperties {
|
||||
String fileId = qcCloud.uploadViaTempFile(fileName);
|
||||
log.info(fileId);
|
||||
vlogBO.setFileId(fileId);
|
||||
|
||||
// FIXME 作业，校验VlogBO
|
||||
// 删除minio文件
|
||||
MinIOUtils.removeFile(minIOConfig.getBucketName(),fileName);
|
||||
log.info("删除minio文件："+fileName);
|
||||
// FIXME 校验VlogBO
|
||||
vlogService.createVlog(vlogBO);
|
||||
|
||||
return GraceJSONResult.ok();
|
||||
|
||||
@ -5,7 +5,8 @@ spring:
|
||||
datasource: # 数据源的相关配置
|
||||
type: com.zaxxer.hikari.HikariDataSource # 数据源的类型，可以更改为其他的数据源配置，比如druid
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver # mysql/MariaDB 的数据库驱动类名称
|
||||
url: jdbc:mysql://82.156.121.2:23306/shop_dev?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
|
||||
# url: jdbc:mysql://82.156.121.2:23306/shop_dev?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
|
||||
url: jdbc:mysql://43.143.227.203:23306/wzj_shop?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
|
||||
username: wzj
|
||||
password: A085F27A43B0
|
||||
hikari:
|
||||
@ -35,7 +36,7 @@ spring:
|
||||
mongodb:
|
||||
# uri: mongodb://root:root@192.168.1.202:27017
|
||||
# database: imooc-red-book
|
||||
uri: mongodb://admin:A1969bf8@82.156.121.2:37017/admin
|
||||
uri: mongodb://admin:A1969bf8@43.143.227.203:37017/admin
|
||||
rabbitmq:
|
||||
host: 182.92.182.217
|
||||
port: 5672
|
||||
@ -47,7 +48,8 @@ spring:
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
server-addr: 182.92.182.217:8848 # nacos 所在的地址
|
||||
# server-addr: 182.92.182.217:8848 # nacos 所在的地址
|
||||
server-addr: 82.156.121.2:28848 # nacos 所在的地址
|
||||
|
||||
# 打开监控
|
||||
management:
|
||||
@ -58,10 +60,10 @@ management:
|
||||
|
||||
# MinIO 配置
|
||||
minio:
|
||||
endpoint: http://82.156.121.2:29000 # MinIO服务地址
|
||||
fileHost: http://82.156.121.2:29000 # 文件地址host
|
||||
endpoint: http://43.143.227.203:29000 # MinIO服务地址
|
||||
fileHost: http://43.143.227.203:29000 # 文件地址host
|
||||
bucketName: bucket # 存储桶bucket名称
|
||||
accessKey: NJ2GN2wLVkMnyrznbE9t # 用户名
|
||||
secretKey: nrT3e3pRWF5HXQRiIxxDhq20eJ0YrN8lvx5p8bK6 # 密码
|
||||
accessKey: 5Zo50S9AHlszNjIqnHI1 # 用户名
|
||||
secretKey: 6QOoW0QL7WR2tYId5b3WcajJVmNnnMaFl8CGjKsD # 密码
|
||||
imgSize: 1024 # 图片大小限制，单位：m
|
||||
fileSize: 1024 # 文件大小限制，单位：m
|
||||
|
||||
@ -5,9 +5,10 @@ spring:
|
||||
datasource: # 数据源的相关配置
|
||||
type: com.zaxxer.hikari.HikariDataSource # 数据源的类型，可以更改为其他的数据源配置，比如druid
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver # mysql/MariaDB 的数据库驱动类名称
|
||||
url: jdbc:mysql://182.92.182.217/tiktok?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
|
||||
username: tiktok
|
||||
password: Bc3T5AA2pBdt2FBk
|
||||
# url: jdbc:mysql://182.92.182.217/tiktok?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
|
||||
url: jdbc:mysql://43.143.227.203:23306/wzj_shop?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
|
||||
username: wzj
|
||||
password: A085F27A43B0
|
||||
hikari:
|
||||
connection-timeout: 30000 # 等待连接池分配连接的最大时间（毫秒），超过这个时长还没有可用的连接，则会抛出SQLException
|
||||
minimum-idle: 5 # 最小连接数
|
||||
@ -31,7 +32,8 @@ spring:
|
||||
timeout: 50000
|
||||
data:
|
||||
mongodb:
|
||||
uri: mongodb://admin:A1969bf8@82.156.121.2:37017/admin
|
||||
# uri: mongodb://admin:A1969bf8@82.156.121.2:37017/admin
|
||||
uri: mongodb://admin:A1969bf8@43.143.227.203:37017/admin
|
||||
rabbitmq:
|
||||
host: 182.92.182.217
|
||||
port: 5672
|
||||
@ -43,7 +45,7 @@ spring:
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
server-addr: 182.92.182.217:8848 # nacos 所在的地址
|
||||
server-addr: 82.156.121.2:28848 # nacos 所在的地址
|
||||
|
||||
|
||||
# 打开监控
|
||||
@ -54,12 +56,13 @@ management:
|
||||
include: '*'
|
||||
|
||||
|
||||
|
||||
# MinIO 配置
|
||||
minio:
|
||||
endpoint: http://82.156.121.2:29000 # MinIO服务地址
|
||||
fileHost: http://82.156.121.2:29000 # 文件地址host
|
||||
endpoint: http://43.143.227.203:29000 # MinIO服务地址
|
||||
fileHost: http://43.143.227.203:29000 # 文件地址host
|
||||
bucketName: bucket # 存储桶bucket名称
|
||||
accessKey: NJ2GN2wLVkMnyrznbE9t # 用户名
|
||||
secretKey: nrT3e3pRWF5HXQRiIxxDhq20eJ0YrN8lvx5p8bK6 # 密码
|
||||
accessKey: 5Zo50S9AHlszNjIqnHI1 # 用户名
|
||||
secretKey: 6QOoW0QL7WR2tYId5b3WcajJVmNnnMaFl8CGjKsD # 密码
|
||||
imgSize: 1024 # 图片大小限制，单位：m
|
||||
fileSize: 1024 # 文件大小限制，单位：m
|
||||
@ -32,7 +32,10 @@ public class QcCloud {
|
||||
|
||||
public String uploadViaTempFile(String fileName) throws Exception {
|
||||
//确保 vlogdata 目录存在
|
||||
String storagePath = new File(System.getProperty("user.dir"), "vlogdata").getAbsolutePath();
|
||||
// String storagePath = new File(System.getProperty("user.dir"), "vlogdata").getAbsolutePath();
|
||||
// String storagePath = "/Users/wuzhongjie/Desktop/vlog-1.0.0/vlogdata"; // 本地
|
||||
String storagePath = "/data/vlogdata"; // 生产
|
||||
|
||||
System.out.println("绝对路径: " + storagePath);
|
||||
File storageDir = new File(storagePath);
|
||||
// 组装完整的文件路径
|
||||
@ -47,12 +50,12 @@ public class QcCloud {
|
||||
VodUploadRequest request = new VodUploadRequest();
|
||||
request.setMediaFilePath(sourceFile.getAbsolutePath());// 指定本地文件路径
|
||||
request.setProcedure("视频处理"); // 智能审核+水印
|
||||
// 4. 上传文件
|
||||
// 上传文件
|
||||
VodUploadResponse response = client.upload(getRegion(), request);
|
||||
// return response;
|
||||
return response.getFileId();
|
||||
} finally {
|
||||
// 5. 删除文件
|
||||
// 删除本地文件
|
||||
Files.deleteIfExists(sourceFile.toPath());
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ public class UserServiceImpl implements UserService {
|
||||
|
||||
@Autowired
|
||||
private Sid sid;
|
||||
private static final String USER_FACE1 = "http://122.152.205.72:88/group1/M00/00/05/CpoxxF6ZUySASMbOAABBAXhjY0Y649.png";
|
||||
private static final String USER_FACE1 = "http://43.143.227.203:29000/bucket/logo.png";
|
||||
|
||||
@Override
|
||||
public Users queryMobileIsExist(String mobile) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user