From 4992c36aed7404605c82d31d22462c123481248b Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Tue, 22 Aug 2023 11:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=AE=BF=E9=97=AE=E6=96=87=E4=BB=B6ip?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/config/FileUploadProperties.java   |  9 +++++++
 .../service/impl/SysFilesServiceImpl.java     |  4 +--
 src/main/resources/application-dev.yml        | 14 +++++-----
 src/main/resources/application-prod.yml       | 26 ++++++++++++-------
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/common/config/FileUploadProperties.java b/src/main/java/com/huoran/iasf/common/config/FileUploadProperties.java
index 5f2481a..c128439 100644
--- a/src/main/java/com/huoran/iasf/common/config/FileUploadProperties.java
+++ b/src/main/java/com/huoran/iasf/common/config/FileUploadProperties.java
@@ -16,6 +16,7 @@ import org.springframework.util.StringUtils;
 public class FileUploadProperties {
 
     private String path;
+    private String ip;
     private String url;
     private String accessUrl;
 
@@ -28,6 +29,14 @@ public class FileUploadProperties {
         this.path = path;
     }
 
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
     public String getUrl() {
         return url;
     }
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysFilesServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysFilesServiceImpl.java
index 1574384..4dc5b93 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysFilesServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysFilesServiceImpl.java
@@ -104,9 +104,9 @@ public class SysFilesServiceImpl extends ServiceImpl<SysFilesMapper, SysFilesEnt
             sysFilesEntity.setType(fileCheck(suffixName));
             this.save(sysFilesEntity);
             // String hostAddress = InetAddress.getLocalHost().getHostAddress();
-            String hostAddress = getLocalHostExactAddress().getHostAddress();
+//            String hostAddress = getLocalHostExactAddress().getHostAddress();
             // String url = fileUploadProperties.getUrl() + "/preview" + "/" + sysFilesEntity.getId();
-            String url = "http://" + hostAddress + fileUploadProperties.getUrl() + sysFilesEntity.getId();
+            String url = fileUploadProperties.getIp() + fileUploadProperties.getUrl() + sysFilesEntity.getId();
             sysFilesEntity.setUrl(url);
             this.updateById(sysFilesEntity);
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c89dc6d..286bd26 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,13 +8,15 @@ spring:
           username: root
 #          password: 123456
           password: iasf#2022
+#          password: HuoRan@2021
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
-#          url: jdbc:mysql://192.168.31.136:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
+#          url: jdbc:mysql://127.0.0.1:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
+          url: jdbc:mysql://192.168.31.136:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
+#          url: jdbc:mysql://139.9.47.170:3306/iasf?serverTimezone=GMT%2B8
   cache:
     type: redis
   redis:
-    host: localhost # Redis服务器地址
+    host: 127.0.0.1 # Redis服务器地址
     database: 0 # Redis数据库索引（默认为0）
     port: 6379 # Redis服务器连接端口
     password: # Redis服务器连接密码（默认为空）
@@ -31,11 +33,11 @@ singleServerConfig:
   password:
 
 file:
-  #文件上传目录 绝对路径 末尾请加 /
-  path: C:/files/ #windows
-  #path: /data/files/ #linux
+  #文件上传目录 绝对路径 末尾请加 / windows
+  path: C:/files/
   #文件预览url
   url: /iasf/sysFiles/preview/
+  ip: http://10.10.11.7
 
   #本地开启
 #  url: :10000/iasf/sysFiles/preview/
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b1e3cc0..d09ed37 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -6,28 +6,34 @@ spring:
       datasource:
         master:
           username: root
-          password: 123456
+          password: HuoRan@2021
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
+          url: jdbc:mysql://139.9.47.170:3306/iasf?serverTimezone=GMT%2B8
+  cache:
+    type: redis
   redis:
-    host: localhost # Redis服务器地址
+    host: 127.0.0.1 # Redis服务器地址
     database: 0 # Redis数据库索引（默认为0）
     port: 6379 # Redis服务器连接端口
-    password: # Redis服务器连接密码（默认为空）
+    password: HuoRan@2021 # Redis服务器连接密码（默认为空）
     jedis:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
         max-idle: 8 # 连接池中的最大空闲连接
         min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 3000ms # 连接超时时间（毫秒
+    timeout: 3000ms # 连接超时时间（毫秒）
+
+singleServerConfig:
+  address: "redis://127.0.0.1:6379"
+  password: HuoRan@2021
 
 file:
-  #文件上传目录 绝对路径 末尾请加 /
-  path: D:/files/ #windows
-  #path: /data/files/ #linux
-  #文件预览、下载的url, 末尾请勿加 /
-  url: :10000/iasf/sysFiles/preview/
+  #文件上传目录 绝对路径 末尾请加 / linux
+  path: /usr/local/huoran/huorantech_website/files/
+  #文件预览url
+  url: /iasf/sysFiles/preview/
+  ip: http://139.159.254.212
 
 knife4j:
   production: true #生成环境禁用查看文档
\ No newline at end of file