Merge branch 'test' of http://git.izouma.com/licailing/wenlvju into test

pom.xml

@@ -311,6 +311,11 @@
             <artifactId>junrar</artifactId>
             <version>4.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.11.2</version>
+        </dependency>
     </dependencies>
 
 </project>

src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -265,6 +265,10 @@ public class RateService {
 
             //单位概况
             dataMap.put("introduction", rate.getIntroduction());
+
+            //等级
+            dataMap.put("grade", rate.getGrade().getDesc());
+
             //Configuration 用于读取ftl文件
             Configuration configuration = new Configuration(new Version("2.3.0"));
 
@@ -642,7 +646,7 @@ public class RateService {
         if (announcement) {
             njwlSmsService.sendSms(phones, "等级评定结果公告已发布，请在南京市文化和旅游局官方网站（http://wlj.nanjing.gov.cn/）上查询。");
         } else {
-            njwlSmsService.sendSms(phones, "请你单位在5个工作日内将纸质申请材料（2份）送属地区文化和旅游局文化行政主管部门，逾期不送，作自动放弃处理。");
+            njwlSmsService.sendSms(phones, "【宁艺通】2021年南京考级承办单位等级评定工作已完成，拟评定结果已在南京市文化和旅游局官网公示。请你单位登陆“宁艺通”等级评定系统下载打印等级评定材料，并于11月15日前将纸质申报表及完整佐证材料（各2份）送属地区文化和旅游局履行线下审核程序，逾期不送，作自动放弃处理。");
         }
     }
 

src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java

@@ -37,7 +37,8 @@ public class TrainingInstitutionService {
     public void batchSend(List<String> phones) throws InterruptedException {
 
         int count = phones.size() / 950;
-        String body = "http://wljtest.izouma.com/h5/trainingInstitution";
+        String body = "尊敬的调研对象：\n" +
+                "您好，为贯彻落实国家、省、市关于“双减”工作相关文件精神，了解和掌握我市文化艺术类校外培训机构相关情况，市文旅局决定开展全市文化艺术类校外培训机构网上问卷调查，如从事文化艺术类校外培训，请登录：http://wljtest.izouma.com/h5/trainingInstitution，填写调查问卷，如不从事文化艺术类校外培训，请忽略本条信息，谢谢。\n";
         for (int i = 0; i < count; i++) {
             int start = i * 950;
             int end = start + 950;
@@ -47,7 +48,7 @@ public class TrainingInstitutionService {
             List<String> result = phones.subList(start, end);
             String sendPhone = String.join(",", result);
             System.out.println(sendPhone);
-//            njwlSmsService.sendSms(sendPhone, body);
+            njwlSmsService.sendSms(sendPhone, body);
 
             // 睡眠5分钟
             Thread.sleep(5 * 60 * 1000);

src/main/java/com/izouma/wenlvju/service/storage/AliStorageService.java

@@ -1,6 +1,10 @@
 package com.izouma.wenlvju.service.storage;
 
+import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.CopyObjectRequest;
+import com.aliyun.oss.model.CopyObjectResult;
 import com.aliyun.oss.model.ObjectMetadata;
 import com.izouma.wenlvju.exception.BusinessException;
 import lombok.Data;
@@ -67,4 +71,30 @@ public class AliStorageService implements StorageService {
         return ossDomain + "/" + path;
     }
 
+    public void rename(String sourceKey, String destinationKey) {
+        // 填写源Object的完整路径。Object完整路径中不能包含Bucket名称。
+//        String sourceKey = "application.txt";
+
+        // 填写目标Object的完整路径。Object完整路径中不能包含Bucket名称。
+//        String destinationKey = sourceKey;
+
+        // 创建OSSClient实例。
+        OSS ossClient = new OSSClientBuilder().build(ossEndPoint, accessKeyId, accessKeySecret);
+
+        // 创建CopyObjectRequest对象。
+        CopyObjectRequest copyObjectRequest = new CopyObjectRequest(ossBucketName, sourceKey, ossBucketName, destinationKey);
+
+        // 设置新的文件元信息。
+        ObjectMetadata meta = new ObjectMetadata();
+//        meta.setContentType("text/txt");
+        copyObjectRequest.setNewObjectMetadata(meta);
+
+        // 复制文件。
+        CopyObjectResult result = ossClient.copyObject(copyObjectRequest);
+        System.out.println("ETag: " + result.getETag() + " LastModified: " + result.getLastModified());
+
+        // 关闭OSSClient。
+        ossClient.shutdown();
+    }
+
 }

src/test/java/com/izouma/wenlvju/service/sms/NjwlSmsServiceTest.java

@@ -11,7 +11,11 @@ public class NjwlSmsServiceTest extends ApplicationTests {
 
     @Test
     public void test() {
-        njwlSmsService.sendSms("15150689190", "http://wljtest.izouma.com/h5/trainingInstitution");
+//        njwlSmsService.sendSms("15605172272", "【宁艺通】2021年南京考级承办单位等级评定工作已完成，拟评定结果已在南京市文化和旅游局官网公示。请你单位登陆“宁艺通”等级评定系统下载打印等级评定材料，并于11月15日前将纸质申报表及完整佐证材料（各2份）送属地区文化和旅游局履行线下审核程序，逾期不送，作自动放弃处理。");
+        String body = "尊敬的调研对象：\n" +
+                "您好，为贯彻落实国家、省、市关于“双减”工作相关文件精神，了解和掌握我市文化艺术类校外培训机构相关情况，市文旅局决定开展全市文化艺术类校外培训机构网上问卷调查，如从事文化艺术类校外培训，请登录：http://wljtest.izouma.com/h5/trainingInstitution，填写调查问卷，如不从事文化艺术类校外培训，请忽略本条信息，谢谢。\n";
+        ;
+        njwlSmsService.sendSms("15150689190", body);
         // {"expiryDate":"1623808467934","tokenKey":"1fb4796840d8a7b8d43e022e5a1f693c","data":{"phone":"19951988293","message":"test"},"appId":"189610","operationType":"ADD"}
     }
 

src/test/java/com/izouma/wenlvju/service/storage/AliStorageServiceTest.java

@@ -0,0 +1,26 @@
+package com.izouma.wenlvju.service.storage;
+
+import com.izouma.wenlvju.ApplicationTests;
+import com.izouma.wenlvju.domain.Rate;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.RateRepo;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class AliStorageServiceTest extends ApplicationTests {
+
+    @Autowired
+    private AliStorageService aliStorageService;
+    @Autowired
+    private RateRepo          rateRepo;
+
+    @Test
+    public void rename() {
+        Rate wu = rateRepo.findById(12696L).orElseThrow(new BusinessException("wu"));
+        wu.getPrivacyPolicy().forEach(img -> {
+            img.lastIndexOf("/");
+        });
+//        aliStorageService.rename("application/2021-08-30-18-18-18DKdQtyCS.", "application/2021-08-30-18-18-18DKdQtyCS.jpg");
+    }
+}