Merge branch 'test_wangge_two' into 'test'

罗元桥

2021-06-23 2b322522e7b801377cdba46c66a1c4ae61f56be0

 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);
    }
}