diff --git a/shuili-common/src/main/java/com/shuili/common/constant/Constants.java b/shuili-common/src/main/java/com/shuili/common/constant/Constants.java index 67e216e4..a44b6452 100644 --- a/shuili-common/src/main/java/com/shuili/common/constant/Constants.java +++ b/shuili-common/src/main/java/com/shuili/common/constant/Constants.java @@ -125,5 +125,5 @@ public class Constants /** * 资源映射路径 前缀 */ - public static final String RESOURCE_PREFIX = "/profile"; + public static final String RESOURCE_PREFIX = "/sgcyy-slgcyxgl/profile"; } diff --git a/shuili-framework/src/main/java/com/kms/framework/config/ServerConfig.java b/shuili-framework/src/main/java/com/kms/framework/config/ServerConfig.java index cf8503c4..3e4dd94a 100644 --- a/shuili-framework/src/main/java/com/kms/framework/config/ServerConfig.java +++ b/shuili-framework/src/main/java/com/kms/framework/config/ServerConfig.java @@ -1,32 +1,31 @@ package com.kms.framework.config; -import javax.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Component; import com.shuili.common.utils.ServletUtils; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.net.URI; /** * 服务相关配置 - * + * * @author kms */ @Component -public class ServerConfig -{ +public class ServerConfig { /** * 获取完整的请求路径，包括：域名，端口，上下文访问路径 - * + * * @return 服务地址 */ - public String getUrl() - { + public String getUrl() { HttpServletRequest request = ServletUtils.getRequest(); return getDomain(request); } - public static String getDomain(HttpServletRequest request) - { - StringBuffer url = request.getRequestURL(); - String contextPath = request.getServletContext().getContextPath(); - return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString(); + public static String getDomain(HttpServletRequest request) { + String host = request.getHeader("Referer"); + URI uri = URI.create(host); + return uri.getScheme() + "://" + uri.getAuthority() ; } } diff --git a/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java b/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java index f41b86d3..085e17ec 100644 --- a/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java +++ b/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java @@ -1,8 +1,6 @@ package com.shuili.common.config; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; /** @@ -11,26 +9,35 @@ import org.springframework.stereotype.Component; * @author shuili */ @Component -//@ConfigurationProperties(prefix = "shuili") -public class ShuiliConfig -{ - /** 项目名称 */ +@ConfigurationProperties(prefix = "shuili") +public class ShuiliConfig { + /** + * 项目名称 + */ private static String name; - private static String nameKey; + private static String nameKey; - /** 版本 */ + /** + * 版本 + */ private String version; - /** 版权年份 */ + /** + * 版权年份 + */ private String copyrightYear; - /** 实例演示开关 */ + /** + * 实例演示开关 + */ private boolean demoEnabled; - /** 上传路径 */ + /** + * 上传路径 + */ - private static String profile="D:/tianhui"; + private static String profile = "D:/tianhui"; private static String licensePath; @@ -38,11 +45,13 @@ public class ShuiliConfig return licensePath; } - public void setLicensePath(String licensePath) { + public void setLicensePath(String licensePath) { ShuiliConfig.licensePath = licensePath; } - /** 获取地址开关 */ + /** + * 获取地址开关 + */ private static boolean addressEnabled; private static boolean init; @@ -56,7 +65,7 @@ public class ShuiliConfig return detectLang; } - public void setDetectLang(String detectLang) { + public void setDetectLang(String detectLang) { ShuiliConfig.detectLang = detectLang; } @@ -68,48 +77,39 @@ public class ShuiliConfig ShuiliConfig.nameKey = nameKey; } - public static String getName() - { + public static String getName() { return name; } - public void setName(String name) - { - ShuiliConfig.name = name; + public void setName(String name) { + ShuiliConfig.name = name; } - public String getVersion() - { + public String getVersion() { return version; } - public void setVersion(String version) - { + public void setVersion(String version) { this.version = version; } - public String getCopyrightYear() - { + public String getCopyrightYear() { return copyrightYear; } - public void setCopyrightYear(String copyrightYear) - { + public void setCopyrightYear(String copyrightYear) { this.copyrightYear = copyrightYear; } - public boolean isDemoEnabled() - { + public boolean isDemoEnabled() { return demoEnabled; } - public void setDemoEnabled(boolean demoEnabled) - { + public void setDemoEnabled(boolean demoEnabled) { this.demoEnabled = demoEnabled; } - public static String getProfile() - { + public static String getProfile() { return profile; } @@ -117,8 +117,7 @@ public class ShuiliConfig return uploadType; } - public void setProfile(String profile) - { + public void setProfile(String profile) { ShuiliConfig.profile = profile; } @@ -126,45 +125,40 @@ public class ShuiliConfig ShuiliConfig.uploadType = uploadType; } - public static boolean isAddressEnabled() - { + public static boolean isAddressEnabled() { return addressEnabled; } - public void setAddressEnabled(boolean addressEnabled) - { + public void setAddressEnabled(boolean addressEnabled) { ShuiliConfig.addressEnabled = addressEnabled; } /** * 获取头像上传路径 */ - public static String getAvatarPath() - { + public static String getAvatarPath() { return getProfile() + "/avatar"; } /** * 获取下载路径 */ - public static String getDownloadPath() - { + public static String getDownloadPath() { return getProfile(); } /** * 获取上传路径 */ - public static String getUploadPath() - { + public static String getUploadPath() { return getProfile() + "/upload"; } - public static boolean isInit() { - return init; - } + public static boolean isInit() { + return init; + } - public void setInit(boolean init) { - ShuiliConfig.init = init; - } + public void setInit(boolean init) { + ShuiliConfig.init = init; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java index 5364dd7b..a75705ca 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -127,10 +127,10 @@ public class DfCheckingRecordV2Service extends BaseService dtoList = new ArrayList<>(); for (DfCheckingProblemV2 record : recordsList) { DfRecordDetailV2Dto.DfRecordItemDetailV2Dto detailV2Dto = new DfRecordDetailV2Dto.DfRecordItemDetailV2Dto(); - if (null != record.getParts()) { + if (StringUtils.isNotBlank(record.getParts())) { detailV2Dto.setParts(DfCheckingV2Service.getStringList(record.getParts().split(","))); } - if (null != record.getDoc()) { + if (StringUtils.isNotBlank(record.getDoc())) { detailV2Dto.setProblemImages(DfCheckingV2Service.getStringList(record.getDoc().split(","))); } detailV2Dto.setItemId(record.getItemId()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java index a63eb355..146e0a43 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java @@ -125,10 +125,10 @@ public class DwCheckingRecordV2Service extends BaseService dtoList = new ArrayList<>(); for (DwCheckingProblemV2 record : recordsList) { DwRecordDetailV2Dto.DwRecordItemDetailV2Dto detailV2Dto = new DwRecordDetailV2Dto.DwRecordItemDetailV2Dto(); - if (null != record.getParts()) { + if (StringUtils.isNotBlank(record.getParts())) { detailV2Dto.setParts(DwCheckingV2Service.getStringList(record.getParts().split(","))); } - if (null != record.getDoc()) { + if (StringUtils.isNotBlank(record.getDoc())) { detailV2Dto.setProblemImages(DwCheckingV2Service.getStringList(record.getDoc().split(","))); } detailV2Dto.setItemId(record.getItemId()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java index ea0df726..173d125f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java @@ -113,12 +113,11 @@ public class SzCheckingRecordV2Service extends BaseService items = szCheckingV2ProjectItemV2Service.list(new LambdaQueryWrapper() - .eq(SzCheckingV2ProjectItem::getCheckingId,szCheckingRecord.getCheckingId())); - + .eq(SzCheckingV2ProjectItem::getCheckingId, szCheckingRecord.getCheckingId())); dto.setItems(items.stream() @@ -131,10 +130,10 @@ public class SzCheckingRecordV2Service extends BaseService dtoList = new ArrayList<>(); for (SzCheckingProblemV2 record : recordsList) { SzRecordDetailV2Dto.SzRecordItemDetailV2Dto detailV2Dto = new SzRecordDetailV2Dto.SzRecordItemDetailV2Dto(); - if (null != record.getParts()) { + if (StringUtils.isNotBlank(record.getParts())) { detailV2Dto.setParts(DfCheckingV2Service.getStringList(record.getParts().split(","))); } - if (null != record.getDoc()) { + if (StringUtils.isNotBlank(record.getDoc())) { detailV2Dto.setProblemImages(DfCheckingV2Service.getStringList(record.getDoc().split(","))); } detailV2Dto.setItemId(record.getItemId()); @@ -183,11 +182,11 @@ public class SzCheckingRecordV2Service extends BaseService - - + + @@ -30,7 +30,7 @@