Merge remote-tracking branch 'origin/master'

k94314517

2024-10-31 b6d54f1aafc8e0184c8c236514849e1a4c568655

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java

@@ -161,12 +161,16 @@
        Map<String, Object> context = new HashMap<>();
        try {
            if(ftp == null){
                log.error("初始化Ftp上传文件成功=============开始========="+DateUtil.getPlusTime2(new Date()));
                ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
                        Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
                log.error("初始化Ftp上传文件成功=============结束========="+DateUtil.getPlusTime2(new Date()));
            }else{
                log.error("重连ftp上传文件成功=============开始========="+DateUtil.getPlusTime2(new Date()));
                ftp.connect();
                log.error("重连ftp上传文件成功=============结束========="+DateUtil.getPlusTime2(new Date()));
            }

            CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();