From 6ab6e9cda22cc7847f16c2194e2cac636e84491b Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Thu, 12 Jul 2018 16:20:02 +0800 Subject: [PATCH] =?UTF-8?q?perf[litemall-all,=20litemall-os-api]:=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4os=E6=A8=A1=E5=9D=97=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=AE=BF=E9=97=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-all/src/main/resources/application-dep.properties | 4 ++++ litemall-all/src/main/resources/application-dev.properties | 4 ++++ .../src/main/resources/application-prod.properties | 6 +++++- .../linlinjava/litemall/os/web/OsStorageController.java | 6 +++++- .../src/main/resources/application-dep.properties | 4 +++- .../src/main/resources/application-dev.properties | 4 +++- .../src/main/resources/application-prod.properties | 7 ++++--- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/litemall-all/src/main/resources/application-dep.properties b/litemall-all/src/main/resources/application-dep.properties index c5bf7b29..072b5932 100644 --- a/litemall-all/src/main/resources/application-dep.properties +++ b/litemall-all/src/main/resources/application-dep.properties @@ -25,3 +25,7 @@ logging.level.root=ERROR logging.level.org.springframework=ERROR logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall=DEBUG + +# 开发者应该设置成自己的域名，必须附带http或者https +org.linlinjava.litemall.os.address=http://122.152.206.172 +org.linlinjava.litemall.os.port=8080 diff --git a/litemall-all/src/main/resources/application-dev.properties b/litemall-all/src/main/resources/application-dev.properties index c5bf7b29..f759d177 100644 --- a/litemall-all/src/main/resources/application-dev.properties +++ b/litemall-all/src/main/resources/application-dev.properties @@ -25,3 +25,7 @@ logging.level.root=ERROR logging.level.org.springframework=ERROR logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall=DEBUG + +# 开发者应该设置成自己的域名，必须附带http或者https +org.linlinjava.litemall.os.address=http://127.0.0.1 +org.linlinjava.litemall.os.port=8080 diff --git a/litemall-all/src/main/resources/application-prod.properties b/litemall-all/src/main/resources/application-prod.properties index 39a1447c..0af08048 100644 --- a/litemall-all/src/main/resources/application-prod.properties +++ b/litemall-all/src/main/resources/application-prod.properties @@ -23,4 +23,8 @@ spring.datasource.druid.filters=stat,wall,log4j logging.level.root=ERROR logging.level.org.springframework=ERROR logging.level.org.mybatis=ERROR -logging.level.org.linlinjava.litemall=ERROR \ No newline at end of file +logging.level.org.linlinjava.litemall=ERROR + +# 开发者应该设置成自己的域名，必须附带http或者https +org.linlinjava.litemall.os.address=https://www.example.com +org.linlinjava.litemall.os.port=443 \ No newline at end of file diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java index 173508d9..78cbe26b 100644 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java +++ b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java @@ -34,7 +34,11 @@ public class OsStorageController { private ObjectStorageConfig osConfig; private String generateUrl(String key){ - return "http://" + osConfig.getAddress() + ":" + osConfig.getPort() + "/os/storage/fetch/" + key; + String url = osConfig.getAddress() + ":" + osConfig.getPort() + "/os/storage/fetch/" + key; + if(!url.startsWith("http")){ + url = "http://" + url; + } + return url; } private String generateKey(String originalFilename){ diff --git a/litemall-os-api/src/main/resources/application-dep.properties b/litemall-os-api/src/main/resources/application-dep.properties index 85afee62..2a4f89b6 100644 --- a/litemall-os-api/src/main/resources/application-dep.properties +++ b/litemall-os-api/src/main/resources/application-dep.properties @@ -26,5 +26,7 @@ logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall.db=ERROR logging.level.org.linlinjava.litemall=ERROR -org.linlinjava.litemall.os.address=122.152.206.172 +# 开发者应该设置成自己的域名，必须附带http或者https +# 开发者可以查看OsStorageController.generateUrl +org.linlinjava.litemall.os.address=http://122.152.206.172 org.linlinjava.litemall.os.port=8081 \ No newline at end of file diff --git a/litemall-os-api/src/main/resources/application-dev.properties b/litemall-os-api/src/main/resources/application-dev.properties index a326d37c..0c2f6f82 100644 --- a/litemall-os-api/src/main/resources/application-dev.properties +++ b/litemall-os-api/src/main/resources/application-dev.properties @@ -26,5 +26,7 @@ logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall.db=ERROR logging.level.org.linlinjava.litemall=ERROR -org.linlinjava.litemall.os.address=127.0.0.1 +# 开发者应该设置成自己的域名，必须附带http或者https +# 开发者可以查看OsStorageController.generateUrl +org.linlinjava.litemall.os.address=http://127.0.0.1 org.linlinjava.litemall.os.port=8081 \ No newline at end of file diff --git a/litemall-os-api/src/main/resources/application-prod.properties b/litemall-os-api/src/main/resources/application-prod.properties index dd4fcb62..17a4632d 100644 --- a/litemall-os-api/src/main/resources/application-prod.properties +++ b/litemall-os-api/src/main/resources/application-prod.properties @@ -26,6 +26,7 @@ logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall.db=ERROR logging.level.org.linlinjava.litemall=DEBUG -# 开发者应该设置成自己的域名 -org.linlinjava.litemall.os.address=www.example.com -org.linlinjava.litemall.os.port=80 \ No newline at end of file +# 开发者应该设置成自己的域名，必须附带http或者https +# 开发者可以查看OsStorageController.generateUrl +org.linlinjava.litemall.os.address=https://www.example.com +org.linlinjava.litemall.os.port=443 \ No newline at end of file