From f82fef9f3d1c6002562318a2bf9c10e5c2450602 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 26 May 2021 09:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=BF=94=E5=9B=9E=20readme?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- .../java/cn/lili/controller/common/UploadController.java | 9 +++++++++ common-api/src/main/resources/application.yml | 1 + .../java/cn/lili/config/properties/SystemSetting.java | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e483913a..68796c5ad 100644 --- a/README.md +++ b/README.md @@ -118,8 +118,6 @@ PS:单独部署的话,数据库文件访问这里:https://gitee.com/beijing_ #### 移动端 -管理端功能展示 - 移动端功能展示 diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 499e17874..7f6d05cd9 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -12,6 +12,7 @@ import cn.lili.common.utils.CommonUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; +import cn.lili.config.properties.SystemSetting; import cn.lili.modules.file.entity.File; import cn.lili.modules.file.plugin.FileManagerPlugin; import cn.lili.modules.file.service.FileService; @@ -51,6 +52,9 @@ public class UploadController { @Autowired private Cache cache; + @Autowired + private SystemSetting systemSetting; + @ApiOperation(value = "文件上传") @PostMapping(value = "/file") public ResultMessage upload(MultipartFile file, @@ -102,4 +106,9 @@ public class UploadController { } + @ApiOperation(value = "返回licences") + @PostMapping(value = "/licences") + public ResultMessage licences() { + return ResultUtil.data(systemSetting.getLicences()); + } } diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml index 50b9a8135..307a502ec 100644 --- a/common-api/src/main/resources/application.yml +++ b/common-api/src/main/resources/application.yml @@ -214,6 +214,7 @@ jasypt: lili: system: isDemoSite: true + licences: 'temporary' statistics: # 在线人数统计 X 小时。这里设置48,即统计过去48小时每小时在线人数 onlineMember: 48 diff --git a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java b/framework/src/main/java/cn/lili/config/properties/SystemSetting.java index 0e658f47c..955ff058c 100644 --- a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java +++ b/framework/src/main/java/cn/lili/config/properties/SystemSetting.java @@ -6,6 +6,7 @@ import org.springframework.context.annotation.Configuration; /** * 系统设置 + * * @author Chopper */ @Data @@ -18,4 +19,9 @@ public class SystemSetting { * 是否是演示站点 */ private Boolean isDemoSite = false; + + /** + * 授权信息 + */ + private String licences = ""; }