renun/zfile
1
0
Fork 0
mirror of https://github.com/zfile-dev/zfile.git synced 2025-04-19 05:34:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修复本地存储 BUG

Browse Source
This commit is contained in:
zhaojun1998
2019-12-01 23:11:11 +08:00
parent 4ac21fd32e
commit bf02366cf6
13 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/im/zhaojun/common/controller/InstallController.java
View File

@@ -59,6 +59,7 @@ public class InstallController {
systemConfigDTO.setStorageStrategy(storageTypeEnum);
systemConfigDTO.setUsername(installModelDTO.getUsername());
systemConfigDTO.setPassword(new BCryptPasswordEncoder().encode(installModelDTO.getPassword()));
systemConfigDTO.setDomain(installModelDTO.getDomain());
systemConfigService.updateSystemConfig(systemConfigDTO);
Map<String, String> storageStrategyConfig = installModelDTO.getStorageStrategyConfig();

2
src/main/java/im/zhaojun/common/model/constant/SystemConfigConstant.java
View File

@@ -16,4 +16,6 @@ public class SystemConfigConstant {
public static final String PASSWORD = "password";
public static final String DOMAIN = "domain";
}

10
src/main/java/im/zhaojun/common/model/dto/InstallModelDTO.java
View File

@@ -9,6 +9,7 @@ public class InstallModelDTO {
private StorageTypeEnum storageStrategy;
private String username;
private String password;
private String domain;
private Map<String, String> storageStrategyConfig;
public String getSiteName() {
@@ -51,6 +52,14 @@ public class InstallModelDTO {
this.password = password;
}
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
@Override
public String toString() {
return "InstallModelDTO{" +
@@ -58,6 +67,7 @@ public class InstallModelDTO {
", storageStrategy=" + storageStrategy +
", username='" + username + '\'' +
", password='" + password + '\'' +
", domain='" + domain + '\'' +
", storageStrategyConfig=" + storageStrategyConfig +
'}';
}

10
src/main/java/im/zhaojun/common/model/dto/SystemConfigDTO.java
View File

@@ -26,6 +26,8 @@ public class SystemConfigDTO {
@JsonIgnore
private String password;
private String domain;
public Integer getId() {
return id;
}
@@ -89,4 +91,12 @@ public class SystemConfigDTO {
public void setPassword(String password) {
this.password = password;
}
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
}

4
src/main/java/im/zhaojun/common/service/SystemConfigService.java
View File

@@ -62,6 +62,10 @@ public class SystemConfigService {
systemConfig.setValue(systemConfigDTO.getSiteName());
systemConfigList.add(systemConfig);
SystemConfig domainConfig = systemConfigRepository.findByKey(SystemConfigConstant.DOMAIN);
domainConfig.setValue(systemConfigDTO.getDomain());
systemConfigList.add(domainConfig);
SystemConfig infoEnableSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.INFO_ENABLE);
infoEnableSystemConfig.setValue(systemConfigDTO.getInfoEnable() ? "true" : "false");
systemConfigList.add(infoEnableSystemConfig);

17
src/main/java/im/zhaojun/local/service/LocalServiceImpl.java
View File

@@ -1,9 +1,12 @@
package im.zhaojun.local.service;
import im.zhaojun.common.model.StorageConfig;
import im.zhaojun.common.model.SystemConfig;
import im.zhaojun.common.model.constant.SystemConfigConstant;
import im.zhaojun.common.model.dto.FileItemDTO;
import im.zhaojun.common.model.enums.FileTypeEnum;
import im.zhaojun.common.model.enums.StorageTypeEnum;
import im.zhaojun.common.repository.SystemConfigRepository;
import im.zhaojun.common.service.FileService;
import im.zhaojun.common.service.StorageConfigService;
import im.zhaojun.common.util.StringUtils;
@@ -28,15 +31,12 @@ public class LocalServiceImpl implements FileService {
private static final String FILE_PATH_KEY = "filePath";
@Value("${server.port}")
private String port;
@Value("${server.servlet.context-path}")
private String contextPath;
@Resource
private StorageConfigService storageConfigService;
@Resource
private SystemConfigRepository systemConfigRepository;
private String filePath;
private boolean isInitialized;
@@ -83,9 +83,8 @@ public class LocalServiceImpl implements FileService {
@Override
public String getDownloadUrl(String path) throws Exception {
InetAddress localHost = Inet4Address.getLocalHost();
String host = localHost.getHostAddress();
return StringUtils.concatPath( "http://" + host + ":" + port + contextPath, "file" + path);
SystemConfig usernameConfig = systemConfigRepository.findByKey(SystemConfigConstant.DOMAIN);
return StringUtils.concatPath( usernameConfig.getValue(), "file" + path);
}
public String getFilePath() {