fix doesObjectExist

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/StorageAutoConfiguration.java

@@ -1,5 +1,6 @@
 package com.fdkankan.filestorage;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.amazonaws.ClientConfiguration;
@@ -84,9 +85,13 @@ public class StorageAutoConfiguration {
         clientConfiguration.setMaxConnections(300);
         clientConfiguration.setConnectionTimeout(5000);
         clientConfiguration.setSocketTimeout(5000);
+        Regions regions = Regions.EU_WEST_2;
+        if (ObjectUtil.isNotEmpty(properties.getRegion())){
+            regions=Regions.fromName(properties.getRegion());
+        }
         AmazonS3 s3 = AmazonS3ClientBuilder.standard()
                 .withCredentials(new AWSStaticCredentialsProvider(awsCreds))
-                .withRegion(Regions.EU_WEST_2)
+                .withRegion(regions)
                 .withClientConfiguration(clientConfiguration)
                 .build();
         return s3;

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/properties/AwsProperties.java

@@ -1,6 +1,7 @@
 package com.fdkankan.filestorage.properties;
 
 
+import com.amazonaws.regions.Regions;
 import com.fdkankan.filestorage.InnerUtils;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
@@ -48,6 +49,10 @@ public class AwsProperties implements Serializable, InitializingBean {
      * Bucket
      */
     private String bucket;
+    /**
+     * region
+     */
+    private String region;
 
     /**
      * return fullPath

4dkankan-utils-reg/src/main/java/com/fdkankan/reg/RegCodeUtil.java

@@ -141,7 +141,7 @@ public class RegCodeUtil {
     public static  void main(String[] args) {
         RegCodeUtil uat = RegCodeUtil.builder().env("PROD").build();
 
-        String machineCode="E0E4D6CC69F7D41B1EEB9405E491434A203A390D28094E30F2A7B0EF021F697F08FD15DB4E216EA5F636839D9A9C6D9B";
+        String machineCode="EAAFB064BF6A8CFC36BBC59DD6F505906CDB71B2B2A51575136D45DDB6E0A843BCA6F26770BB47D49C99C1C7F678EBBA";
 
 
         //读取机器码
@@ -191,12 +191,12 @@ public class RegCodeUtil {
         log.info("生成相机注册码:{}",camCode1);
 
 //        List<CamRegDto> list1 = BatchParseRegeditCamCode(machineCode+"a",camCode1);
-        CamRegSDto list1 = uat.BatchParseRegeditCamCode(machineCode,"eNoNkbkNAEEIA1viWzhC3v5LOjIkIzM2U8zwSh4zV/YXlSsE9n3KHPb2cUiAMGF76XjEIqcTDEnFm4WXhSRE8oF7R3PoozVx7rQFfosbT6L9xpSMGcLodbORkn2ost+JYg0+t4gdX8nAaDejbzgfT6gZJwYLwPco4dzmE/lkjglZfIgBEppAEVQKLcmiA3VUhfBrd+kRjafwXGrOttKyeVxdYh756d8Imb/BAxFItgtGgFhbnrUIqDoCamXER7CfZl0x/jHuLGpK2We44FVdpQ4XL8evtBV1jwZ1TgPVd8BMBbGVb6Ea75iSm1vBfA/Gt+r61GwrORb+0Jw6QvVewAgRBwSgHODZoQSbkbwfbP/n1Wxj");
+        CamRegSDto list1 = uat.BatchParseRegeditCamCode(machineCode,"eNoNkLkNAEEMAlvyb2/ot/+S7kIQghHbzKAtysxdE9l1QuARxpyurRFdGUX6EGYKjF2BHZkv3bfxqnp8XnDEPVyZceM/EjpwuX5F0yUL9mJDy9gsIh2DZdtw72Apm2/iack/l5PiP0JzIfGQ+VORu/P39sxM97To9qgi7zp8Qe1cLt9JAjjxL1DyT101ZD/sbd9cgZj6y+WkuuUnZYVcdd6d4yZLFHZQGSx8vsxK7z2Zx4RScbqjy/Moj9lJpGM12A4NNRp/HwjM5zJ/+v57Cub+YfYGzyPpvGQLXe81NKndTIRjoL68Tpf67/kAg65fQw==");
 
 
 
 
-        log.info("结束");
+        log.info("结束{}",list1);
     }
 
 }