diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/api/GetNftDataController.java b/conflux-admin/src/main/java/com/conflux/web/controller/api/GetNftDataController.java index 3f795d4..b15723c 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/api/GetNftDataController.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/api/GetNftDataController.java @@ -26,10 +26,10 @@ public class GetNftDataController { * */ @ApiOperation("获取元数据") - @GetMapping("/{path}") - public void getData(HttpServletResponse response, HttpServletRequest request,@PathVariable("path") String path) { + @GetMapping("/{year}/{path}") + public void getData(HttpServletResponse response, HttpServletRequest request,@PathVariable("year")String year,@PathVariable("path") String path) { try { - confluxService.getNftData(response,request,path); + confluxService.getNftData(response,request,year,path); } catch (Exception e) { log.error("获取json文件失败!", e); } diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/ConfluxService.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/ConfluxService.java index 0682721..2c07688 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/ConfluxService.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/ConfluxService.java @@ -46,7 +46,7 @@ public interface ConfluxService { * @param response * @return */ - void getNftData(HttpServletResponse response, HttpServletRequest request,String filePath); + void getNftData(HttpServletResponse response, HttpServletRequest request,String year,String filePath); /** * 创建元数据 * @param checkArgs diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java index 2a8b9be..d33311e 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java @@ -574,8 +574,8 @@ public class ConfluxServiceImpl implements ConfluxService { */ @Override @SneakyThrows - public void getNftData(HttpServletResponse response, HttpServletRequest request, String filePath) { - String path=nftConfig.getDirectoryPath()+DateUtils.dateToDir(new Date())+"\\"+filePath; + public void getNftData(HttpServletResponse response, HttpServletRequest request,String year, String filePath) { + String path=nftConfig.getDirectoryPath()+year+"\\"+filePath; File file = new File(path); // 3.拼接响应头,返回文件名字等信息 response.setHeader("content-type", "application/json"); @@ -594,7 +594,8 @@ public class ConfluxServiceImpl implements ConfluxService { try { //元数据地址 String directoryPath = nftConfig.getDirectoryPath(); - String strDir = directoryPath + DateUtils.dateToDir(new Date()); + String year=DateUtils.dateToDir(new Date()); + String strDir = directoryPath + year; File file = new File(strDir); if (!file.exists()) { //创建文件夹 @@ -615,7 +616,7 @@ public class ConfluxServiceImpl implements ConfluxService { log.info("文件创建成功"); //写入内容 BufferedWriter writer = new BufferedWriter(new FileWriter(filePath)); - String fileUri = ConfluxArt.NFT_NAME + checkArgs.getStrName() + ConfluxArt.NFT_DESCRIPTION + checkArgs.getDescription() + ConfluxArt.NFT_IMAGE + checkArgs.getStrUri() + "\"\n}"; + String fileUri = ConfluxArt.NFT_NAME + checkArgs.getStrName() + ConfluxArt.NFT_DESCRIPTION + checkArgs.getStrDescription()+ ConfluxArt.NFT_IMAGE + checkArgs.getStrUri() + "\"\n}"; writer.write(fileUri); writer.flush(); writer.close(); @@ -623,7 +624,8 @@ public class ConfluxServiceImpl implements ConfluxService { log.info("文件创建失败"); } } - return AjaxResult.success("创建元数据成功!", fileName); + String tokenUri=nftConfig.getNftDataUrL()+year+"/"+fileName; + return AjaxResult.success("创建元数据成功!", tokenUri); } catch (Exception e) { log.error("元数据创建失败!{}", e); return AjaxResult.error(); diff --git a/conflux-admin/src/main/resources/application-druid.yml b/conflux-admin/src/main/resources/application-druid.yml index 7c1b4ce..295e093 100644 --- a/conflux-admin/src/main/resources/application-druid.yml +++ b/conflux-admin/src/main/resources/application-druid.yml @@ -69,7 +69,7 @@ conflux: # 执行地址 owner: cfxtest:aarr1hw0tab9sb4jxyu3g2v7xzknbkpn72p1uxp3uz ###元数据地址 - nftDataUrL: http://localhost:8080/api/data + nftDataUrL: http://localhost:8080/api/ #元数据存放地址 directoryPath: C:\nftData\ #腾讯云oss上传 diff --git a/conflux-admin/src/main/resources/application-prod.yml b/conflux-admin/src/main/resources/application-prod.yml index 552e529..eb0d15f 100644 --- a/conflux-admin/src/main/resources/application-prod.yml +++ b/conflux-admin/src/main/resources/application-prod.yml @@ -68,7 +68,9 @@ conflux: # 执行地址 owner: cfxtest:aarr1hw0tab9sb4jxyu3g2v7xzknbkpn72p1uxp3uz ###私钥位置 - nftDataUrL: http://m.scyp.ink/m/api/data + #nftDataUrL: http://m.scyp.ink/m/api/ + nftDataUrL: http://superapi.scyipang.com/m/api/ + #元数据地址 directoryPath: /nftData/ tencent: