diff --git a/README.md b/README.md index 6c1a04d8..f5c7f9fb 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ litemall = Spring Boot后端 + Vue管理员前端 + 微信小程序用户前端 ![](doc/pic/4.png) -### 快速启动 +## 快速启动 1. 配置最小开发环境: * [MySQL](https://dev.mysql.com/downloads/mysql/) diff --git a/deploy/litemall/application-core.yml b/deploy/litemall/application-core.yml index 308e6327..a5370c5c 100644 --- a/deploy/litemall/application-core.yml +++ b/deploy/litemall/application-core.yml @@ -89,7 +89,6 @@ litemall: local: storagePath: storage address: http://122.152.206.172:8080/wx/storage/fetch/ - port: 8081 # 阿里云对象存储配置信息 aliyun: endpoint: oss-cn-shenzhen.aliyuncs.com diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java index 345fff5b..305ee71b 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java @@ -20,7 +20,6 @@ public class LocalStorage implements Storage { private String storagePath; private String address; - private String port; private Path rootLocation; @@ -47,15 +46,6 @@ public class LocalStorage implements Storage { this.address = address; } - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - @Override public void store(MultipartFile file, String keyName) { try { diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java index 62fe0920..514a9b1e 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java @@ -45,7 +45,6 @@ public class StorageAutoConfiguration { LocalStorage localStorage = new LocalStorage(); StorageProperties.Local local = this.properties.getLocal(); localStorage.setAddress(local.getAddress()); - localStorage.setPort(local.getPort()); localStorage.setStoragePath(local.getStoragePath()); return localStorage; } diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageProperties.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageProperties.java index b8b21f0d..1844f4ac 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageProperties.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageProperties.java @@ -43,7 +43,6 @@ public class StorageProperties { public static class Local { private String address; - private String port; private String storagePath; public String getAddress() { @@ -54,14 +53,6 @@ public class StorageProperties { this.address = address; } - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - public String getStoragePath() { return storagePath; } diff --git a/litemall-core/src/main/resources/application-core.yml b/litemall-core/src/main/resources/application-core.yml index 69b561c0..c88468b6 100644 --- a/litemall-core/src/main/resources/application-core.yml +++ b/litemall-core/src/main/resources/application-core.yml @@ -88,8 +88,8 @@ litemall: # 本地对象存储配置信息 local: storagePath: storage - address: http://localhost:8082/wx/storage/fetch/ - port: 8081 + # 这个地方应该是wx模块的WxStorageController的fetch方法对应的地址 + address: http://localhost:8080/wx/storage/fetch/ # 阿里云对象存储配置信息 aliyun: endpoint: oss-cn-shenzhen.aliyuncs.com