mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复存储引擎

This commit is contained in:
TinyAnts 2022-06-23 16:10:10 +08:00
parent d1b02d2c89
commit 2f7361c2dd
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java
View File

@ -121,10 +121,10 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
// 管理员信息
SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select(SystemAdmin.class, info->
!info.getColumn().equals("salt") &&
!info.getColumn().equals("password") &&
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
!info.getColumn().equals("salt") &&
!info.getColumn().equals("password") &&
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("is_delete", 0)
.eq("id", adminId)
.last("limit 1"));

9
server/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java
View File

@ -33,12 +33,13 @@ public class UrlUtil {
}
String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) {
return RequestUtil.domain() + "/" + uploadPrefix + url;
}
Map<String, String> config = ConfigUtil.getMap("storage", engine);
return config.get("domain") + url;
return config.getOrDefault("domain", "") + url;
}
/**
@ -56,12 +57,13 @@ public class UrlUtil {
}
String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) {
return url.replace(RequestUtil.domain() + "/" + uploadPrefix + "/", "");
}
Map<String, String> config = ConfigUtil.getMap("storage", engine);
return url.replace(config.get("domain") + "/" + uploadPrefix + "/", "");
return url.replace(config.getOrDefault("domain", "") + "/" + uploadPrefix + "/", "");
}
/**
@ -73,12 +75,13 @@ public class UrlUtil {
*/
public static String domain() {
String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) {
return RequestUtil.domain() + "/";
}
Map<String, String> config = ConfigUtil.getMap("storage", engine);
return config.get("domain") + "/";
return config.getOrDefault("domain", "") + "/";
}
}