From 7df0246d69fea539b7bb1519f9c16c1d69b82d1c Mon Sep 17 00:00:00 2001
From: luojie <php_echo@163.com>
Date: Thu, 19 Oct 2023 22:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lld/im/service/config/WebConfig.java  |  1 +
 .../lld/im/service/file/FileController.java   | 38 +++++++++++++++++++
 .../src/main/resources/application-dev.yml    |  8 ++--
 .../src/main/resources/application.yml        |  2 +-
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java

diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/config/WebConfig.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/config/WebConfig.java
index 528fcce..c2b811e 100644
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/config/WebConfig.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/config/WebConfig.java
@@ -23,6 +23,7 @@ public class WebConfig implements WebMvcConfigurer {
         registry.addInterceptor(gateWayInterceptor)
                 .addPathPatterns("/**")
                 .excludePathPatterns("/v1/user/login")
+                .excludePathPatterns("/v1/file/**")
                 .excludePathPatterns("/v1/message/checkSend");
     }
 
diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java
new file mode 100644
index 0000000..8c40c5d
--- /dev/null
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java
@@ -0,0 +1,38 @@
+package com.lld.im.service.file;
+
+import com.lld.im.common.ResponseVO;
+import com.lld.im.common.model.SyncReq;
+import com.lld.im.service.conversation.model.DeleteConversationReq;
+import com.lld.im.service.conversation.model.UpdateConversationReq;
+import com.lld.im.service.conversation.service.ConversationService;
+import com.lld.im.service.utils.MinioUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @description:
+ * @author: lld
+ * @version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("v1/file")
+public class FileController {
+
+
+    @Autowired
+    ConversationService conversationService;
+
+    @PostMapping("/upload")
+    public ResponseVO PostMapping(@RequestParam("file") MultipartFile file)  {
+
+        final String upload = MinioUtil.upload(file, "/test");
+        return ResponseVO.successResponse(upload);
+    }
+
+
+}
diff --git a/hs-im-server/im-service/src/main/resources/application-dev.yml b/hs-im-server/im-service/src/main/resources/application-dev.yml
index b6fef8f..e7149df 100644
--- a/hs-im-server/im-service/src/main/resources/application-dev.yml
+++ b/hs-im-server/im-service/src/main/resources/application-dev.yml
@@ -19,9 +19,9 @@ spring:
         min-idle: 10
     password: dSMIXBQrCBXiHHjk123
   rabbitmq:
-    host: 192.168.2.180
+    host: 119.45.242.222
     port: 5672
-    addresses: 192.168.2.180
+    addresses: 119.45.242.222
     username: guest
     password: guest
     #    virtual-host:
@@ -55,7 +55,7 @@ server:
 appConfig:
   appId: 10000
   privateKey: 123456
-  zkAddr: 192.168.2.180:2181 # zk连接地址
+  zkAddr: 119.45.242.222:2181 # zk连接地址
   zkConnectTimeOut: 50000 #zk超时时间
   imRouteWay: 3 # 路由策略1轮训 2随机 3hash
   consistentHashWay: 1 # 如果选用一致性hash的话具体hash算法 1 TreeMap 2 自定义Map
@@ -123,4 +123,4 @@ minio:
   minio_url: http://43.139.240.200:9000
   minio_name: admin
   minio_pass: 12345678
-  bucketName: im
+  bucketName: hd-im
diff --git a/hs-im-server/im-service/src/main/resources/application.yml b/hs-im-server/im-service/src/main/resources/application.yml
index 9f96606..3d7808a 100644
--- a/hs-im-server/im-service/src/main/resources/application.yml
+++ b/hs-im-server/im-service/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod
+    active: dev