diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java index bd3ea3e..c9279bc 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java @@ -3,7 +3,7 @@ package com.sxpcwlkj.system.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.sxpcwlkj.common.code.controller.BaseController; import com.sxpcwlkj.common.code.entity.CaptchaEntity; -import com.sxpcwlkj.common.properties.MsProperties; +import com.sxpcwlkj.common.properties.MssAdminProperties; import com.sxpcwlkj.common.utils.DataUtil; import com.sxpcwlkj.common.utils.R; import com.sxpcwlkj.system.service.CaptchaService; @@ -35,7 +35,7 @@ import java.util.Map; public class CaptchaController extends BaseController { private final SysTenantService sysTenantService; private final CaptchaService captchaService; - private final MsProperties msProperties; + private final MssAdminProperties msProperties; /** * 系统配置 diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysTenantVo.java b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysTenantVo.java index 2cde36b..aa2cf57 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysTenantVo.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysTenantVo.java @@ -1,7 +1,7 @@ package com.sxpcwlkj.system.entity.vo; -import com.sxpcwlkj.common.properties.MsProperties; +import com.sxpcwlkj.common.properties.MssAdminProperties; import lombok.Data; @@ -23,7 +23,7 @@ public class SysTenantVo { */ private String name; - private MsProperties properties; + private MssAdminProperties properties; private String revision; } diff --git a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/properties/MsProperties.java b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/properties/MssAdminProperties.java similarity index 80% rename from mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/properties/MsProperties.java rename to mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/properties/MssAdminProperties.java index 20ff0dd..44f50cb 100644 --- a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/properties/MsProperties.java +++ b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/properties/MssAdminProperties.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; @Data @Component @ConfigurationProperties(prefix = "sxpcwlkj") -public class MsProperties { +public class MssAdminProperties { /** * 名称 */ @@ -33,5 +33,12 @@ public class MsProperties { * 机构组织 */ private String organization; - + /** + * 版本 + */ + private String version; + /** + * 描述 + */ + private String describe; }