Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

huanghongfa

2021-02-02 8d838dc3b52e2daacb45906ef1831a2f4aedf390

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java

@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.util.ObjectUtils;
@@ -35,6 +36,20 @@
public class CommonApi {
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;

    @ApiOperation(value = "上传照片")
    @PostMapping(value = "uploadimage",consumes = "multipart/*",headers = "content-type=multipart/form-date")
@@ -42,12 +57,12 @@
        String name = file.getOriginalFilename();
        name= UUID.randomUUID().toString().replaceAll("-","")+".jpg";
        try {
            SFTPUtil sftp = new SFTPUtil();
            SFTPUtil sftp = new SFTPUtil(userName,password,host,port);
            sftp.login();
            InputStream is = file.getInputStream();
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(FtpConstants.HTTP_URL+"/idcard/" + name);
            return R.ok(url+"/idcard/" + name);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();