yaozhixue 1 năm trước cách đây
mục cha
commit
d948f78df9

+ 8 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -33,6 +33,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static jdk.nashorn.internal.objects.NativeString.substr;
+
 @Slf4j
 @Service
 public class PublicServiceImpl implements PublicService {
@@ -1495,6 +1497,12 @@ public class PublicServiceImpl implements PublicService {
     @Override
     public String path(String f){
         SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
+
+        String procf = f.trim();
+        if (substr(procf,procf.length()-1,procf.length()).equals(".")){
+            f = procf+"jpeg";
+        }
+
         String filedir = "syncdata/" + sdfs.format(new Date()) + f;
         return filedir;
     }

+ 22 - 2
src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -12,6 +12,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 
+import static jdk.nashorn.internal.objects.NativeString.substr;
 import static jdk.nashorn.internal.objects.NativeString.trim;
 
 
@@ -77,7 +78,8 @@ public class test {
 */
 
 
-        A a = new A();
+
+/* A a = new A();
         A b = new A();
         List<A> list = new ArrayList<>();
 
@@ -159,9 +161,27 @@ public class test {
         calendar.add(Calendar.YEAR, -1);
         // 获取减去一年后的日期
         Date newDate = calendar.getTime();
-        System.out.println("减去一年后的日期: " + newDate);
+        System.out.println("减去一年后的日期: " + newDate);*/
 
+        String s="asdfkl.";
+        String t = s.trim();
+        if (substr(t,t.length()-1,t.length()).equals(".")){
+            System.out.println(t+"jpeg");
+        }
+        System.out.println(t);
+        s="asdfkl. ";
+        t = s.trim();
+        if (substr(t,t.length()-1,t.length()).equals(".")){
+            System.out.println(t+"jpeg");
+        }
+        System.out.println(t);
 
+        s="asdfkl123";
+        t = s.trim();
+        if (substr(t,t.length()-1,t.length()).equals(".")){
+            System.out.println(t+"jpeg");
+        }
+        System.out.println(t);
 
     }
 

+ 2 - 1
src/main/java/com/zfire/jiasm/syncdata/utils/oss/OSSUtil.java

@@ -32,7 +32,8 @@ public class OSSUtil {
     private String OSS_TYPE_PIC;
 
     public  boolean uploadFile(String ossObjectKey, File file){
-        OSS client = new OSSClientBuilder().build(OSS_ENDPOINT_WW, ACCESS_KEY_ID, ACCESS_KEY_SECERT);
+        // OSS client = new OSSClientBuilder().build(OSS_ENDPOINT_WW, ACCESS_KEY_ID, ACCESS_KEY_SECERT);
+        OSS client = new OSSClientBuilder().build("fwcdn.gd-jxm.com.w.kunlunaq.com", ACCESS_KEY_ID, ACCESS_KEY_SECERT);
         PutObjectResult putObjectResult = client.putObject(new PutObjectRequest(OSS_BUCKET_NAME, ossObjectKey, file));
         log.info("putObjectResult" + putObjectResult);
         return true;