|
|
@@ -1,19 +1,20 @@
|
|
|
package cn.reghao.tnb.file.app.rpc;
|
|
|
|
|
|
import cn.reghao.file.api.iface.OssService;
|
|
|
-import cn.reghao.tnb.file.app.zoss.rpc.StoreServiceWrapper;
|
|
|
-import cn.reghao.tnb.oss.api.iface.ConsoleService;
|
|
|
-import cn.reghao.tnb.oss.api.constant.ObjectScope;
|
|
|
-import cn.reghao.tnb.oss.api.dto.ObjectInfo;
|
|
|
-import cn.reghao.tnb.oss.api.dto.ServerInfo;
|
|
|
-import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
|
|
|
-import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
|
|
|
-import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
|
|
|
-import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
|
|
|
-import cn.reghao.tnb.file.app.zoss.db.repository.StoreRepository;
|
|
|
+import cn.reghao.oss.api.constant.ObjectAction;
|
|
|
+import cn.reghao.oss.sdk.OssClient;
|
|
|
+import cn.reghao.oss.api.constant.ObjectScope;
|
|
|
+import cn.reghao.oss.api.dto.ObjectInfo;
|
|
|
+import cn.reghao.oss.api.dto.ServerInfo;
|
|
|
+import cn.reghao.oss.api.dto.media.AudioInfo;
|
|
|
+import cn.reghao.oss.api.dto.media.ConvertedImageInfo;
|
|
|
+import cn.reghao.oss.api.dto.media.ImageInfo;
|
|
|
+import cn.reghao.oss.api.dto.media.VideoInfo;
|
|
|
+import cn.reghao.tnb.file.app.db.mapper.OssConfigMapper;
|
|
|
import cn.reghao.tnb.file.app.model.constant.OssType;
|
|
|
-import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
|
|
|
+import cn.reghao.tnb.file.app.model.po.OssConfig;
|
|
|
import cn.reghao.tnb.file.app.service.StoreConfigService;
|
|
|
+import jakarta.annotation.PostConstruct;
|
|
|
import org.apache.dubbo.config.annotation.DubboService;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -25,25 +26,30 @@ import org.springframework.stereotype.Service;
|
|
|
@Service
|
|
|
public class StoreServiceWrapperRouter implements OssService {
|
|
|
private final int ossType = 1;
|
|
|
- private final ConsoleService consoleService;
|
|
|
- private final StoreServiceWrapper storeServiceWrapper;
|
|
|
private final StoreConfigService storeConfigService;
|
|
|
- private final StoreRepository storeRepository;
|
|
|
+ private final OssConfigMapper ossConfigMapper;
|
|
|
+ private OssClient ossClient;
|
|
|
|
|
|
- public StoreServiceWrapperRouter(ConsoleService consoleService, StoreServiceWrapper storeServiceWrapper,
|
|
|
- StoreConfigService storeConfigService, StoreRepository storeRepository) {
|
|
|
- this.consoleService = consoleService;
|
|
|
- this.storeServiceWrapper = storeServiceWrapper;
|
|
|
+ public StoreServiceWrapperRouter(StoreConfigService storeConfigService, OssConfigMapper ossConfigMapper) {
|
|
|
this.storeConfigService = storeConfigService;
|
|
|
- this.storeRepository = storeRepository;
|
|
|
+ this.ossConfigMapper = ossConfigMapper;
|
|
|
+ }
|
|
|
+
|
|
|
+ @PostConstruct
|
|
|
+ public void init() {
|
|
|
+ OssConfig ossConfig = ossConfigMapper.findByOssType(ossType);
|
|
|
+ String endpoint = ossConfig.getEndpoint();
|
|
|
+ String ak = ossConfig.getAccessKeyId();
|
|
|
+ String sk = ossConfig.getAccessKeySecret();
|
|
|
+ this.ossClient = new OssClient(endpoint, ak, sk);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public ServerInfo getUploadStore(String channelName) throws Exception {
|
|
|
- int ossUser = storeConfigService.getLocalOssUser();
|
|
|
- UploadChannel uploadChannel = storeRepository.getUploadChannel(ossUser, channelName);
|
|
|
- int channelCode = uploadChannel.getChannelCode();
|
|
|
- return consoleService.getUploadStore(channelCode);
|
|
|
+ /*int ossUser = storeConfigService.getLocalOssUser();
|
|
|
+ UploadChannel uploadChannel = storeRepository.getUploadChannel(ossUser, channelName);*/
|
|
|
+ int channelCode = 101;
|
|
|
+ return ossClient.getServerInfo();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -64,7 +70,7 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public void setObjectUpload(int channelCode, String objectId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- storeServiceWrapper.setObjectUpload(channelCode, objectId, ossUser);
|
|
|
+ //storeServiceWrapper.setObjectUpload(channelCode, objectId, ossUser);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
}
|
|
|
@@ -73,7 +79,8 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public void setObjectScope(int channelCode, String objectId, int scope) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- storeServiceWrapper.setObjectScope(channelCode, objectId, scope, ossUser);
|
|
|
+ //storeServiceWrapper.setObjectScope(channelCode, objectId, scope, ossUser);
|
|
|
+ ossClient.setObjectScope(objectId);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
}
|
|
|
@@ -82,7 +89,8 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public void deleteByObjectId(int channelCode, String objectId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- storeServiceWrapper.deleteByObjectId(channelCode, objectId, ossUser);
|
|
|
+ //storeServiceWrapper.deleteByObjectId(channelCode, objectId, ossUser);
|
|
|
+ ossClient.deleteObject(objectId);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
}
|
|
|
@@ -91,7 +99,7 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public void deleteByObjectUrl(String objectUrl) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- storeServiceWrapper.deleteByObjectUrl(objectUrl, ossUser);
|
|
|
+ //storeServiceWrapper.deleteByObjectUrl(objectUrl, ossUser);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
}
|
|
|
@@ -100,7 +108,8 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public ObjectInfo getObjectInfo(int channelCode, String objectId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- return storeServiceWrapper.getObjectInfo(channelCode, objectId, ossUser);
|
|
|
+ //storeServiceWrapper.getObjectInfo(channelCode, objectId, ossUser);
|
|
|
+ return ossClient.getObjectInfo(objectId);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
|
|
|
@@ -111,7 +120,8 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public String getSignedUrl(int channelCode, String objectId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- return storeServiceWrapper.getSignedUrl(channelCode, objectId, ossUser);
|
|
|
+ //return storeServiceWrapper.getSignedUrl(channelCode, objectId, ossUser);
|
|
|
+ return ossClient.getSignedUrl(objectId, ObjectAction.access.getName());
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
|
|
|
@@ -122,7 +132,7 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public String getSignedUrlByUrl(int channelCode, String objectUrl) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- return storeServiceWrapper.getSignedUrlByUrl(channelCode, objectUrl, ossUser);
|
|
|
+ //return storeServiceWrapper.getSignedUrlByUrl(channelCode, objectUrl, ossUser);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
|
|
|
@@ -132,14 +142,16 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
@Override
|
|
|
public VideoInfo getVideoInfo(int channelCode, String videoFileId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
- return storeServiceWrapper.getVideoInfo(channelCode, videoFileId, ossUser);
|
|
|
+ //storeServiceWrapper.getVideoInfo(channelCode, videoFileId, ossUser);
|
|
|
+ return ossClient.getVideoInfo(videoFileId);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public ImageInfo getImageInfo(int channelCode, String imageFileId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- return storeServiceWrapper.getImageInfo(channelCode, imageFileId, ossUser);
|
|
|
+ //return storeServiceWrapper.getImageInfo(channelCode, imageFileId, ossUser);
|
|
|
+ return ossClient.getImageInfo(imageFileId);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
|
|
|
@@ -150,7 +162,7 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public ConvertedImageInfo getWebpInfo(int channelCode, String imageFileId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- return storeServiceWrapper.getWebpInfo(channelCode, imageFileId, ossUser);
|
|
|
+ //return storeServiceWrapper.getWebpInfo(channelCode, imageFileId, ossUser);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
throw new Exception("OSSType not found");
|
|
|
@@ -160,7 +172,7 @@ public class StoreServiceWrapperRouter implements OssService {
|
|
|
public AudioInfo getAudioInfo(int channelCode, String audioFileId) throws Exception {
|
|
|
int ossUser = storeConfigService.getLocalOssUser();
|
|
|
if (ossType == OssType.localOss.getCode()) {
|
|
|
- return storeServiceWrapper.getAudioInfo(channelCode, audioFileId, ossUser);
|
|
|
+ //return storeServiceWrapper.getAudioInfo(channelCode, audioFileId, ossUser);
|
|
|
} else if (ossType == OssType.aliyunOss.getCode()) {
|
|
|
}
|
|
|
|