xiangpei
2024-09-11 be279a439ad6af9abde48f4f7a9568016a923cdd
互联网端代码初始化
5个文件已修改
86 ■■■■ 已修改文件
ruoyi-admin/src/main/resources/application-prod.yml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/FtpApche.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-prod.yml
@@ -46,15 +46,15 @@
#          url: jdbc:mysql://123.207.71.245:13306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
#          username: root
#          password: 234#Wersdf!
          url: jdbc:mysql://80.36.32.176:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
          username: root
          password: 234#Wersdf!
#          url: jdbc:mysql://80.36.32.176:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
#          username: root
#          password: 234#Wersdf!
#          url: jdbc:mysql://51.9.57.211:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
#          username: root
#          password: 234#Wersdf!
#          url: jdbc:mysql://172.35.50.34:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
#          username: root
#          password: 234#Wersdf!
          url: jdbc:mysql://172.35.50.34:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
          username: root
          password: 234#Wersdf!
        # 从库数据源
        slave:
          lazy: true
@@ -105,7 +105,7 @@
spring.data:
  redis:
    # 地址
    host: 80.36.32.176
    host: 172.35.50.34
    # 端口,默认为6379
    port: 6379
    password: 234#Wersdf!
@@ -268,7 +268,7 @@
--- #ftp,部署哪换哪个IP
ftp:
  url: 51.9.57.211
  url: 172.35.50.34
  username: admin          #本机:ftpup
  passwd: 234#Wersdf!
  path: /
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
@@ -35,7 +35,7 @@
    SysOssVo upload2(SynchronousRequest request) throws ParseException;
    SysOssVo upload3(SynchronousRequest request) throws ParseException;
//    SysOssVo upload3(SynchronousRequest request) throws ParseException;
//    SysOssVo upload(File file);
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -202,29 +202,29 @@
            request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
    }
    /**
     * 同步 定时拉取
     * @param
     * @param
     * @return
     */
    @Override
    public SysOssVo upload3(SynchronousRequest request) throws ParseException {
        String originalfileName = request.getFileName();
        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
        OssClient storage = OssFactory.instance();
        UploadResult uploadResult;
        try {
            uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), request.getFile().getContentType());
        } catch (IOException e) {
            throw new ServiceException(e.getMessage());
        }
        // 保存文件信息
        System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
            +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," +  request.getCreateTime());
        return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
            request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
    }
//    /**
//     * 同步 定时拉取
//     * @param
//     * @param
//     * @return
//     */
//    @Override
//    public SysOssVo upload3(SynchronousRequest request) throws ParseException {
//        String originalfileName = request.getFileName();
//        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
//        OssClient storage = OssFactory.instance();
//        UploadResult uploadResult;
//        try {
//            uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), request.getFile().getContentType());
//        } catch (IOException e) {
//            throw new ServiceException(e.getMessage());
//        }
//        // 保存文件信息
//        System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
//            +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," +  request.getCreateTime());
//        return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
//            request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
//    }
//    @Override
//    public SysOssVo upload(File file) {
@@ -307,7 +307,7 @@
            storage.delete(sysOss.getUrl());
            if(sysOss.getPassword().equals(password) || password.equals("000000")){
                baseMapper.deleteById(sysOss.getOssId());
//                HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
                HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
                return true;
            }
            return false;
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
@@ -60,16 +60,11 @@
            InputStream input = FtpApche.downloadFileFromDailyDir(str);
            byte[] fileBytesByName = FtpApche.getFileBytesByName(input);
            OssClient storage = OssFactory.instance();
            MultipartFile file = new MockMultipartFile(fileName,fileName, fileName.substring(14,fileName.length()), input);
//            UploadResult uploadResult = storage.upload(input,getPath(fileName),"multipart/form-data; charset=ISO-8859-1");
            UploadResult uploadResult;
//            try {
                uploadResult = storage.uploadSuffix2(fileBytesByName, getPath(fileName), "multipart/form-data; charset=ISO-8859-1");
            UploadResult uploadResult = storage.upload(input,getPath(fileName),fileName.substring(14,fileName.length()));
            FtpApche.deleteFile(str);
            input.close();
//            buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file,
//                password, fileBytesByName);
            MultipartFile file = new MockMultipartFile(fileName,fileName, fileName.substring(14,fileName.length()), input);
            buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file,
                password, fileBytesByName);
        }
@@ -104,7 +99,7 @@
    private String post(SynchronousRequest request, byte[] bytes) throws IOException {
        HashMap<String, String> headers = new HashMap<>(3);
        String requestUrl = boundary.getVideo() +  "/resource/synchronization/upload";
        String requestUrl = boundary.getLocalhost() +  "/resource/synchronization/upload";
        ObjectMapper objectMapper = new ObjectMapper();
        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
        headers.put("content-type", "application/json");
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/FtpApche.java
@@ -110,6 +110,11 @@
        boolean result = false;
        InputStream input = file.getInputStream();
        try {
            System.out.println("this is ftpinfo: " + config.getUrl());
            System.out.println("this is ftpinfo: " + config.getPasswd());
            System.out.println("this is ftpinfo: " + config.getPath());
            System.out.println("this is ftpinfo: " + config.getPort());
            System.out.println("this is ftpinfo: " + config.getUsername());
            connect(config);
            ftpClient.setBufferSize(1024 * 1024);
            result = ftpClient.storeFile(new String(name.getBytes(encoding), "iso-8859-1"), input);