diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java index 24e1375..0582a82 100644 --- a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java @@ -7,6 +7,7 @@ import cn.hutool.extra.spring.SpringUtil; import com.google.common.collect.HashMultimap; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.minio.config.MinioProperties; import io.minio.*; import io.minio.errors.*; import io.minio.http.Method; @@ -36,7 +37,6 @@ public final class Minio { private static final String BUCKET_NAME; static { - CLIENT = SpringUtil.getBean(MinioAsyncClient.class); ERROR_MAP.put(ErrorResponseException.class, "文件存储服务响应失败"); ERROR_MAP.put(InsufficientDataException.class, "文件读取失败"); ERROR_MAP.put(InternalException.class, "文件服务器错误"); @@ -45,7 +45,8 @@ public final class Minio { ERROR_MAP.put(IOException.class, "文件读取失败"); ERROR_MAP.put(NoSuchAlgorithmException.class, "缺少 MD5 或 SHA-256 依赖"); ERROR_MAP.put(XmlParserException.class, "数据解析失败"); - BUCKET_NAME = SpringUtil.getBean(com.njzscloud.common.minio.config.MinioProperties.class).getBucketName(); + CLIENT = SpringUtil.getBean(MinioAsyncClient.class); + BUCKET_NAME = SpringUtil.getBean(MinioProperties.class).getBucketName(); if (StrUtil.isNotBlank(BUCKET_NAME)) { createBucket(BUCKET_NAME); } @@ -53,9 +54,13 @@ public final class Minio { public static void createBucket(String bucketName) { Assert.notBlank(bucketName, "未指明存储位置"); - boolean exists = Minio.execSync(() -> CLIENT.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())); - if (exists) return; - Minio.execSync(() -> CLIENT.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build())); + try { + boolean exists = Minio.execSync(() -> CLIENT.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())); + if (exists) return; + Minio.execSync(() -> CLIENT.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build())); + } catch (Exception e) { + log.error("存储桶创建失败", e); + } } public static Tuple2> startMltUpload(String objectName, String contentType, int partNum) { @@ -139,6 +144,7 @@ public final class Minio { try { return fn.exec().get(); } catch (Exception e) { + log.error("执行失败,文件服务器错误", e); throw Exceptions.error(e, ERROR_MAP.getOrDefault(e.getClass(), "文件服务器错误")); } } @@ -147,6 +153,7 @@ public final class Minio { try { return fn.exec(); } catch (Exception e) { + log.error("执行失败,文件服务器错误", e); throw Exceptions.error(e, ERROR_MAP.getOrDefault(e.getClass(), "文件服务器错误")); } } diff --git a/njzscloud-svr/src/main/resources/application-prod.yml b/njzscloud-svr/src/main/resources/application-prod.yml index c1e174d..f90d5ec 100644 --- a/njzscloud-svr/src/main/resources/application-prod.yml +++ b/njzscloud-svr/src/main/resources/application-prod.yml @@ -1,17 +1,19 @@ spring: + servlet: + multipart: + location: /home/zsy/recycling_supervision/server/temp datasource: - url: jdbc:mysql://localhost:3306/njzscloud_supervisory?characterEncoding=UTF-8&allowMultiQueries=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3306/zsy_recycling_supervision?characterEncoding=UTF-8&allowMultiQueries=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root - security: - auth-ignores: - - /index.html - - /jquery.js - - /sockjs.js - - /stomp.js - - /sockjs.js.map - - /favicon.ico - # - /ws/** + password: Ch3nTx2BBJ28AiCZ + + redis: + enable: false + pubsub: false + host: localhost + #password: redis + database: 0 + port: 6379 mail: # 邮件服务器 @@ -20,12 +22,29 @@ spring: username: lzq@qq.com # 授权码 password: lzq +oss: + path: D:/ProJects/gov_manage/njzscloud-supervisory-svr/logs + minio: + endpoint: http://localhost:9090 + access-key: minioadmin + secret-key: sdawi5nEH44wycoxOONSg + bucket-name: zsy - redis: + +app: + district: + province: 320000 + city: 320100 + +mybatis-plus: + tunnel: enable: false - pubsub: false - host: 192.168.1.17 - #password: redis - database: 0 - port: 6379 - + ssh: + host: 139.224.54.144 + port: 22 + user: root + credentials: D:/我的/再昇云/服务器秘钥/139.224.54.144_YZS_S1.pem + localPort: 33061 + db: + host: localhost + port: 33061