diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java index 63d3b96..a91f654 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.*; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -106,7 +107,7 @@ public class MesMediaFileCfgController extends BaseMesController buckets=new ArrayList<>(); + try { + ObsClient obsClient = obsConfig.getObsClient(); + // 列举桶 + ListBucketsRequest request = new ListBucketsRequest(); + request.setQueryLocation(true); + buckets = obsClient.listBuckets(request); + } catch (ObsException e) { + LOGGER.error("Error Message:{}", e.getErrorMessage()); + } catch (Exception e) { + e.printStackTrace(); + } + return ResultBean.success("创建成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(buckets); + + } @PostMapping(value = "/media-file/insert") @ApiOperation(value = "上传媒体文件") diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties index 556ec19..a08c0d8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties @@ -66,7 +66,7 @@ redis.mes.db=4 #OBS服务所在地址 huaweiobs.endPoint=obs.cn-east-3.myhuaweicloud.com #存储桶名称 -huaweiobs.bucketName=mesbucket +huaweiobs.bucketName=mes-wms-obs #访问的key huaweiobs.ak=TPNXQ2LUMRHNYYOBO8QO #访问的秘钥 diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java index 5c8ab34..3c455ce 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java @@ -37,6 +37,6 @@ public class MesCommonConstant { public static final String OBS_AK = "TPNXQ2LUMRHNYYOBO8QO"; public static final String OBS_SK = "ppTtbisjdBxQsU124mFnubSojUsB6Wvp9KSaUAeb"; public static final String OBS_END_POINT = "obs.cn-east-3.myhuaweicloud.com"; - public static final String OBS_BUCKET_NAME = "mesbucket"; + public static final String OBS_BUCKET_NAME = "mes-wms-obs"; public static final String OBS_LOCATION = "cn-east-3"; }