From 32c350b8aca021b84125f1334f7a183a2defcbfd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 08 三月 2023 14:13:17 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-smoke/src/main/resources/application-pro.yml | 4 ++--
ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
index 79b2aca..97714a6 100644
--- a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
@@ -27,7 +27,7 @@
// 涓婁紶鏂囦欢娴�
try {
// 鑾峰彇鏂囦欢鐨勫悕绉�
- String fileName = file.getOriginalFilename();
+ String fileName = "sczf/" + file.getOriginalFilename();
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(getcontentType(fileName.substring(fileName.lastIndexOf("."))));
// 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼�
@@ -76,7 +76,7 @@
// 涓婁紶鏂囦欢娴�
try {
// 鑾峰彇鏂囦欢鐨勫悕绉�
- String fileName = String.valueOf(UUID.randomUUID());
+ String fileName = "sczf/" + String.valueOf(UUID.randomUUID());
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(getcontentType(ext));
// 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼�
diff --git a/ycl-smoke/src/main/resources/application-pro.yml b/ycl-smoke/src/main/resources/application-pro.yml
index c429f13..045f68f 100644
--- a/ycl-smoke/src/main/resources/application-pro.yml
+++ b/ycl-smoke/src/main/resources/application-pro.yml
@@ -24,8 +24,8 @@
spring:
redis:
database: 0
- host: 10.53.157.24
- port: 6379
+ host: 127.0.0.1
+ port: 6380
password: ycl2018
jedis:
pool:
--
Gitblit v1.8.0