From 8d66f53be51a6378e706235a4dab256662bc84f4 Mon Sep 17 00:00:00 2001 From: sj <1304317391@qq.com> Date: Fri, 9 Sep 2022 18:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.package_versions.json | 1 + package-lock.json | 6 ++++++ yudao-server/src/main/resources/application-local.yaml | 8 ++++---- .../java/co/yixiang/modules/mp/config/BxgConstans.java | 1 + .../main/java/co/yixiang/tools/rest/UploadController.java | 2 ++ .../co/yixiang/tools/service/impl/QiNiuServiceImpl.java | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 node_modules/.package_versions.json create mode 100644 package-lock.json diff --git a/node_modules/.package_versions.json b/node_modules/.package_versions.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/node_modules/.package_versions.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..85bd6f7c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "zsw-farm", + "lockfileVersion": 2, + "requires": true, + "packages": {} +} diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 3066b3cc..1c92f2e8 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -243,7 +243,7 @@ dubbo: bxg: shop: - API_URL: http://192.168.10.129:48080/bxgApp - SITE_URL: http://192.168.10.129:48080/bxgApp - UNI_SITE_URL: http://192.168.10.129:48080/bxgApp - ADMIN_API_URL: http://192.168.10.129:48080/bxg \ No newline at end of file + API_URL: http://192.168.10.113:48080/bxgApp + SITE_URL: http://192.168.10.113:48080/bxgApp + UNI_SITE_URL: http://192.168.10.113:48080/bxgApp + ADMIN_API_URL: http://192.168.10.113:48080/bxg \ No newline at end of file diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/mp/config/BxgConstans.java b/zsw-bxg/src/main/java/co/yixiang/modules/mp/config/BxgConstans.java index 58a802fe..2c84ea97 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/mp/config/BxgConstans.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/mp/config/BxgConstans.java @@ -22,6 +22,7 @@ public class BxgConstans { @Value("${bxg.shop.ADMIN_API_URL}") public void setAdminApiUrl(String adminApiUrl) { +// System.out.println(adminApiUrl); ADMIN_API_URL = adminApiUrl; } } diff --git a/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java b/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java index 5755e41d..56098392 100644 --- a/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java +++ b/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java @@ -80,6 +80,7 @@ public class UploadController { QiniuContent qiniuContent = qiNiuService.upload(file, qiNiuService.find()); if ("".equals(url.toString())) { url = url.append(qiniuContent.getUrl()); + System.out.println("".equals(url.toString())); }else{ url = url.append(","+qiniuContent.getUrl()); } @@ -89,6 +90,7 @@ public class UploadController { Map map = new HashMap<>(2); map.put("errno", 0); map.put("link", url); + System.out.println(); return new ResponseEntity(map, HttpStatus.CREATED); } diff --git a/zsw-bxg/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java index e5845442..7075bae1 100644 --- a/zsw-bxg/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java @@ -94,6 +94,7 @@ public class QiNiuServiceImpl implements QiNiuService { // @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) public QiniuContent upload(MultipartFile file, QiniuConfig qiniuConfig) { + System.out.println("走到了这里"); if(qiniuConfig.getId() == null){ throw new BadRequestException("请先添加相应配置，再操作"); } @@ -109,7 +110,6 @@ public class QiNiuServiceImpl implements QiNiuService { } Response response = uploadManager.put(file.getBytes(), key, upToken); //解析上传成功的结果 - DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class); QiniuContent content = qiniuContentService.getOne(new LambdaQueryWrapper().eq(QiniuContent::getName,FileUtil.getFileNameNoEx(putRet.key)));