434443333444
This commit is contained in:
parent
cc42d76bb6
commit
2939be7372
@ -7,7 +7,7 @@ import net.lab1024.sa.base.common.enumeration.BaseEnum;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
public enum OSSFileTypeEnum implements BaseEnum {
|
public enum OSSFileTypeEnum implements BaseEnum {
|
||||||
PUBLIC(1, "public"),
|
PUBLIC(1, "static/images"),
|
||||||
SIGN(2, "sign"),
|
SIGN(2, "sign"),
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@ -8,6 +8,8 @@ import com.aliyun.oss.model.PolicyConditions;
|
|||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
|
import net.lab1024.sa.admin.config.AppConfig;
|
||||||
|
import net.lab1024.sa.admin.config.EnvConfig;
|
||||||
import net.lab1024.sa.admin.config.OssConfig;
|
import net.lab1024.sa.admin.config.OssConfig;
|
||||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||||
import net.lab1024.sa.admin.module.business.file.constant.OSSFileTypeEnum;
|
import net.lab1024.sa.admin.module.business.file.constant.OSSFileTypeEnum;
|
||||||
@ -15,6 +17,7 @@ import net.lab1024.sa.admin.module.business.file.domain.vo.OSSPolicyVO;
|
|||||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
import net.lab1024.sa.base.common.domain.ResponseDTO;
|
||||||
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
import net.lab1024.sa.base.common.util.SmartRequestUtil;
|
||||||
import net.lab1024.sa.base.constant.SwaggerTagConst;
|
import net.lab1024.sa.base.constant.SwaggerTagConst;
|
||||||
|
import org.checkerframework.checker.units.qual.A;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
@ -23,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@Tag(name = SwaggerTagConst.Support.FILE)
|
@Tag(name = SwaggerTagConst.Support.FILE)
|
||||||
@ -31,13 +35,21 @@ public class OSSFileController {
|
|||||||
@Resource
|
@Resource
|
||||||
private OssConfig ossConfig;
|
private OssConfig ossConfig;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private EnvConfig envConfig;
|
||||||
|
|
||||||
@Operation(summary = "获取上传文件 Policy, notes=\"type==1 普通;type==2 签名图片\"")
|
@Operation(summary = "获取上传文件 Policy, notes=\"type==1 普通;type==2 签名图片\"")
|
||||||
@GetMapping("/file/getOSSPolicy/{type}")
|
@GetMapping("/file/getOSSPolicy/{type}")
|
||||||
@SaCheckPermission("ossFile:add")
|
@SaCheckPermission("ossFile:add")
|
||||||
public ResponseDTO<OSSPolicyVO> getOSSPolicy(@PathVariable int type){
|
public ResponseDTO<OSSPolicyVO> getOSSPolicy(@PathVariable int type){
|
||||||
OSSFileTypeEnum ossFileType = OSSFileTypeEnum.getByVal(type);
|
OSSFileTypeEnum ossFileType = OSSFileTypeEnum.getByVal(type);
|
||||||
Long requestUserId = SmartRequestUtil.getRequestUserId();
|
Long requestUserId = SmartRequestUtil.getRequestUserId();
|
||||||
String dir = ossFileType.getDesc() + File.separator + "images/";
|
|
||||||
|
String dir = "dev/static/images/images";
|
||||||
|
if (Objects.equals(envConfig.getActive(), "prod")){
|
||||||
|
dir = "prod/static/images/";
|
||||||
|
}
|
||||||
|
|
||||||
// String dir = ossFileType.getDesc() + File.separator + requestUserId + File.separator;
|
// String dir = ossFileType.getDesc() + File.separator + requestUserId + File.separator;
|
||||||
// callbackUrl为 上传回调服务器的URL,请将下面的IP和Port配置为您自己的真实信息。
|
// callbackUrl为 上传回调服务器的URL,请将下面的IP和Port配置为您自己的真实信息。
|
||||||
OSSClient client = new OSSClient(ossConfig.getEndpoint(), ossConfig.getAccessKey(), ossConfig.getAccessKeySecret());
|
OSSClient client = new OSSClient(ossConfig.getEndpoint(), ossConfig.getAccessKey(), ossConfig.getAccessKeySecret());
|
||||||
@ -70,7 +82,13 @@ public class OSSFileController {
|
|||||||
public ResponseDTO<OSSPolicyVO> getOSSPolicyAdmin(@PathVariable int type){
|
public ResponseDTO<OSSPolicyVO> getOSSPolicyAdmin(@PathVariable int type){
|
||||||
OSSFileTypeEnum ossFileType = OSSFileTypeEnum.getByVal(type);
|
OSSFileTypeEnum ossFileType = OSSFileTypeEnum.getByVal(type);
|
||||||
Long requestUserId = SmartRequestUtil.getRequestUserId();
|
Long requestUserId = SmartRequestUtil.getRequestUserId();
|
||||||
String dir = ossFileType.getDesc() + File.separator + "images/";
|
|
||||||
|
String dir = "dev/static/images/images";
|
||||||
|
if (Objects.equals(envConfig.getActive(), "prod")){
|
||||||
|
dir = "prod/static/images/";
|
||||||
|
}
|
||||||
|
|
||||||
|
// String dir = ossFileType.getDesc() + File.separator + "images/";
|
||||||
// String dir = ossFileType.getDesc() + File.separator + requestUserId + File.separator;
|
// String dir = ossFileType.getDesc() + File.separator + requestUserId + File.separator;
|
||||||
// callbackUrl为 上传回调服务器的URL,请将下面的IP和Port配置为您自己的真实信息。
|
// callbackUrl为 上传回调服务器的URL,请将下面的IP和Port配置为您自己的真实信息。
|
||||||
OSSClient client = new OSSClient(ossConfig.getEndpoint(), ossConfig.getAccessKey(), ossConfig.getAccessKeySecret());
|
OSSClient client = new OSSClient(ossConfig.getEndpoint(), ossConfig.getAccessKey(), ossConfig.getAccessKeySecret());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user