From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 19 八月 2021 09:28:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java index 8055531..cdb8fff 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java @@ -2,6 +2,7 @@ import com.panzhihua.common.constants.FtpConstants; import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.SFTPUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,6 +46,9 @@ private int port; @Value("${ftp.url}") private String url; + + @Resource + private CommunityService communityService; /** * 允许的图片文件后缀 @@ -150,4 +154,10 @@ sftp.logout(); return R.ok(urlList); } + + @GetMapping("/getConf/noToken") + @ApiOperation(value = "根据code查询系统配置") + public R getConf(@RequestParam("code") String code){ + return communityService.getConf(code); + } } -- Gitblit v1.7.1