From a460b6099561c664bb99c75533bf27837e57be22 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Sat, 14 May 2022 18:31:40 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0=EF=BC=9A=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=8E=AF=E5=A2=83=E6=B3=A8=E5=86=8C=E5=88=B0?= =?UTF-8?q?nacos=20ip=E5=9C=B0=E5=9D=80=E4=B8=8D=E6=98=AF=E5=A4=96?= =?UTF-8?q?=E7=BD=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bnyer-auth/src/main/resources/bootstrap-grey.yml | 4 ++++ bnyer-auth/src/main/resources/bootstrap-prod.yml | 4 ++++ .../src/main/resources/bootstrap-grey.yml | 4 ++++ .../src/main/resources/bootstrap-prod.yml | 4 ++++ .../bnyer/file/controller/SysFileController.java | 15 ++++----------- .../src/main/resources/bootstrap-grey.yml | 4 ++++ .../src/main/resources/bootstrap-prod.yml | 4 ++++ .../java/com/bnyer/img/task/DownloadSyncTask.java | 2 +- .../src/main/resources/bootstrap-grey.yml | 4 ++++ .../src/main/resources/bootstrap-prod.yml | 4 ++++ .../src/main/resources/bootstrap-grey.yml | 4 ++++ .../src/main/resources/bootstrap-prod.yml | 4 ++++ 12 files changed, 45 insertions(+), 12 deletions(-) diff --git a/bnyer-auth/src/main/resources/bootstrap-grey.yml b/bnyer-auth/src/main/resources/bootstrap-grey.yml index e8342bf..2504b18 100644 --- a/bnyer-auth/src/main/resources/bootstrap-grey.yml +++ b/bnyer-auth/src/main/resources/bootstrap-grey.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 8010 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-auth/src/main/resources/bootstrap-prod.yml b/bnyer-auth/src/main/resources/bootstrap-prod.yml index d8c9f80..64ea135 100644 --- a/bnyer-auth/src/main/resources/bootstrap-prod.yml +++ b/bnyer-auth/src/main/resources/bootstrap-prod.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 8010 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-gateway/src/main/resources/bootstrap-grey.yml b/bnyer-gateway/src/main/resources/bootstrap-grey.yml index 5613979..597e12d 100644 --- a/bnyer-gateway/src/main/resources/bootstrap-grey.yml +++ b/bnyer-gateway/src/main/resources/bootstrap-grey.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 7010 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-gateway/src/main/resources/bootstrap-prod.yml b/bnyer-gateway/src/main/resources/bootstrap-prod.yml index 88c88c3..b5bd9cf 100644 --- a/bnyer-gateway/src/main/resources/bootstrap-prod.yml +++ b/bnyer-gateway/src/main/resources/bootstrap-prod.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 7010 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java index 995d015..efaf070 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java @@ -1,15 +1,8 @@ package com.bnyer.file.controller; import com.bnyer.common.core.domain.R; -import com.bnyer.common.core.utils.file.FileUtils; -import com.bnyer.common.core.web.domain.AjaxResult; -import com.bnyer.file.service.ISysFileService; import com.bnyer.file.service.MinioService; -import com.bnyer.file.utils.FileUploadUtils; -import com.bnyer.system.api.domain.SysFile; -import org.apache.tomcat.jni.FileInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -18,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -28,10 +20,9 @@ import java.util.List; * @author ruoyi */ @RestController +@Slf4j public class SysFileController { - private static final Logger log = LoggerFactory.getLogger(SysFileController.class); - @Autowired private MinioService minioService; @@ -65,6 +56,7 @@ public class SysFileController try{ url = minioService.uploadFile(file); }catch (Exception e){ + log.error("文件上传失败,原因为:【{}】",e.getMessage()); return R.fail("文件上传失败!"); } return R.ok(url); @@ -84,6 +76,7 @@ public class SysFileController try{ url = minioService.uploadBanner(file); }catch (Exception e){ + log.error("文件上传失败,原因为:【{}】",e.getMessage()); return R.fail("banner上传失败!"); } return R.ok(url); diff --git a/bnyer-services/bnyer-file/src/main/resources/bootstrap-grey.yml b/bnyer-services/bnyer-file/src/main/resources/bootstrap-grey.yml index e8342bf..4328a2f 100644 --- a/bnyer-services/bnyer-file/src/main/resources/bootstrap-grey.yml +++ b/bnyer-services/bnyer-file/src/main/resources/bootstrap-grey.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 175.24.122.142 + # 部署在不同服务器上的指定端口 + port: 8011 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml index d8c9f80..8000f86 100644 --- a/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 175.24.122.142 + # 部署在不同服务器上的指定端口 + port: 8011 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DownloadSyncTask.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DownloadSyncTask.java index 98a4815..0aaf476 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DownloadSyncTask.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DownloadSyncTask.java @@ -19,7 +19,7 @@ public class DownloadSyncTask { @Autowired private TiktokImgService tiktokImgService; - @XxlJob("collectionSyncTask") + @XxlJob("downloadSyncTask") public ReturnT syncDownload(String param) throws Exception { tiktokImgService.insertDownloadNum(); XxlJobLogger.log("{} 我执行了同步图片下载数量任务", System.currentTimeMillis()); diff --git a/bnyer-services/bnyer-img/src/main/resources/bootstrap-grey.yml b/bnyer-services/bnyer-img/src/main/resources/bootstrap-grey.yml index e8342bf..f363f68 100644 --- a/bnyer-services/bnyer-img/src/main/resources/bootstrap-grey.yml +++ b/bnyer-services/bnyer-img/src/main/resources/bootstrap-grey.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 9102 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-services/bnyer-img/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-img/src/main/resources/bootstrap-prod.yml index d8c9f80..e2259a9 100644 --- a/bnyer-services/bnyer-img/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-img/src/main/resources/bootstrap-prod.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 9102 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-services/bnyer-system/src/main/resources/bootstrap-grey.yml b/bnyer-services/bnyer-system/src/main/resources/bootstrap-grey.yml index e8342bf..fd662b6 100644 --- a/bnyer-services/bnyer-system/src/main/resources/bootstrap-grey.yml +++ b/bnyer-services/bnyer-system/src/main/resources/bootstrap-grey.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 9101 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址 diff --git a/bnyer-services/bnyer-system/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-system/src/main/resources/bootstrap-prod.yml index d8c9f80..07584e9 100644 --- a/bnyer-services/bnyer-system/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-system/src/main/resources/bootstrap-prod.yml @@ -2,6 +2,10 @@ spring: cloud: nacos: discovery: + # 解决部署在不同服务器访问不到的问题，需暴露外网ip + ip: 81.69.47.31 + # 部署在不同服务器上的指定端口 + port: 9101 # 服务注册地址 server-addr: http://175.24.122.142:8848 # 命名空间地址