Merge remote-tracking branch 'origin/master'

4dkankan-utils-oss/src/main/java/com/fdkankan/oss/UploadUtils.java

@@ -25,7 +25,7 @@ public class UploadUtils {
     @Value("${oss.secrey}")
     private String secrey;
 
-    @Value("${oss.bucket.bucket}")
+    @Value("${oss.bucket}")
     private String bucket;
 
     public void upload(String filePath, String key1) {