Merge branch 'master' into Bulbasaur

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<Object> upload(MultipartFile file,
@@ -102,4 +106,9 @@ public class UploadController {
     }
 
 
+    @ApiOperation(value = "返回licences")
+    @PostMapping(value = "/licences")
+    public ResultMessage<Object> licences() {
+        return ResultUtil.data(systemSetting.getLicences());
+    }
 }

common-api/src/main/resources/application.yml

@@ -211,6 +211,7 @@ jasypt:
 lili:
   system:
     isDemoSite: true
+    licences: 'temporary'
   statistics:
     # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
     onlineMember: 48