theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf[litemall-all, litemall-os-api]: 调整os模块的图片访问配置

Browse Source
This commit is contained in:
Junling Bu
2018-07-12 16:20:02 +08:00
parent ed84767ce2
commit 6ab6e9cda2
7 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
litemall-all/src/main/resources/application-dep.properties
View File

@@ -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

4
litemall-all/src/main/resources/application-dev.properties
View File

@@ -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

6
litemall-all/src/main/resources/application-prod.properties
View File

@@ -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
logging.level.org.linlinjava.litemall=ERROR
# 开发者应该设置成自己的域名，必须附带http或者https
org.linlinjava.litemall.os.address=https://www.example.com
org.linlinjava.litemall.os.port=443

6
litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java
View File

@@ -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){

4
litemall-os-api/src/main/resources/application-dep.properties
View File

@@ -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

4
litemall-os-api/src/main/resources/application-dev.properties
View File

@@ -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

7
litemall-os-api/src/main/resources/application-prod.properties
View File

@@ -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
# 开发者应该设置成自己的域名，必须附带http或者https
# 开发者可以查看OsStorageController.generateUrl
org.linlinjava.litemall.os.address=https://www.example.com
org.linlinjava.litemall.os.port=443