打印

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -234,16 +234,16 @@ public class PerformancesExpressController extends BaseController {
     @RequiresPermissions("kylin:performancesExpress:print")
     @PostMapping("/print")
     @ResponseBody
-    public AjaxResult print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        ResponseDto res = performancesExpressServiceImpl.print(performanceExpressSearchAdminParam);
+    public ResponseDto print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        String res = performancesExpressServiceImpl.print(performanceExpressSearchAdminParam);
         try {
-            if (res.isSuccess()) {
-                return success();
+            if (res.isEmpty()) {
+                return ResponseDto.failure("处理失败");
             } else {
-                return error(res.getMessage());
+                return ResponseDto.success(res);
             }
         } catch (Exception e) {
-            return error(e.getMessage());
+            return ResponseDto.failure(e.getMessage());
         }
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -95,6 +95,18 @@
             <artifactId>xml-apis</artifactId>
             <version>1.4.01</version>
         </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.10.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.10.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/utils/CodeUtil.java

@@ -38,7 +38,7 @@ import java.util.Map;
 
 /**
  * <p>
- * xx 服务实现类
+ * 二维码 条形码 html转img
  * </p>
  *
  * @author jiangxiulong
@@ -49,8 +49,8 @@ public class CodeUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(CodeUtil.class);
 
-    public static String pathName = "/data/images/tmphtml/";
-//    public static String pathName = "/Users/jiangxiulong/Desktop/tmphtml/";
+//    public static String pathName = "/data/images/tmphtml/";
+    public static String pathName = "/Users/jiangxiulong/Desktop/tmphtml/";
 
     public static String getQRCode(String content, int width, int height) {
         if (!StringUtils.isEmpty(content)) {
@@ -159,9 +159,7 @@ public class CodeUtil {
 
             Doc doc = new SimpleDoc(fin, dof, das);
 
-            logger.error("allPrinters", 111111);
             DocPrintJob job = ps.createPrintJob();
-            logger.error("allPrinters1", 2222222);
 
             job.print(doc, pras);
             fin.close();
@@ -199,7 +197,8 @@ public class CodeUtil {
     public static String html2img(KylinOrderExpress kylinOrderExpress,String jContact, String jAddress, String jTel, KylinOrderTickets orderInfo)
     {
         String barCode = getBarCode(kylinOrderExpress.getMailno(), 90, 13);
-        String qrCode = getQRCode("2453657424", 25, 25);
+
+        String qrCode = getQRCode(kylinOrderExpress.getTwoDimensionCode(), 25, 25);
 
         String html = tmpHtml();
 
@@ -227,40 +226,53 @@ public class CodeUtil {
                 ;
         Html2Image html2Image = Html2Image.fromHtml(replace3);
 
-        String imgPath = pathName.concat("qrcode/img.png");
+        String imgPathName = pathName.concat("faceImg");
+        File fatherFile = new File(imgPathName);
+        try {
+            if (!fatherFile.exists()) {
+                fatherFile.mkdir();
+            } else {
+                fatherFile.delete();
+                fatherFile.mkdir();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String imgPath = imgPathName.concat("/").concat(kylinOrderExpress.getMailno()).concat(".png");
 
         html2Image.getImageRenderer().saveImage(imgPath);
 
         return imgPath;
     }
 
-    public static void main(String[] args) {
-//        String imgPath = html2img();
+    /*public static void main(String[] args) {
+        String imgPath = html2img();
         // 打印图片
-//        drawImage(imgPath, 1);
-    }
+        drawImage(imgPath, 1);
+    }*/
 
     public static String tmpHtml()
     {
         String html = "<!DOCTYPE html>\n" +
-                "<html style=\"width: 100mm;\" lang=\"en\">\n" +
+                "<html lang=\"en\" style=\"width: 100mm;\">\n" +
                 "<head>\n" +
                 "    <meta charset=\"utf-8\">\n" +
                 "    <meta name=\"renderer\" content=\"webkit\">\n" +
                 "    <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n" +
                 "    <meta http-equiv=\"Cache-Control\" content=\"no-transform\">\n" +
-                "    <meta http-equiv=\"Access-Control-Allow-Origin\" content=\"*\"/>\n" +
+                "    <meta http-equiv=\"Access-Control-Allow-Origin\" content=\"*\" />\n" +
                 "    <meta content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0\" name=\"viewport\">\n" +
-                "    <meta name=\"apple-mobile-web-app-capable\" content=\"yes\"/>\n" +
-                "    <meta name=\"apple-mobile-web-app-status-bar-style\" content=\"black\"/>\n" +
-                "    <meta name=\"format-detection\" content=\"address=no\"/>\n" +
+                "    <meta name=\"apple-mobile-web-app-capable\" content=\"yes\" />\n" +
+                "    <meta name=\"apple-mobile-web-app-status-bar-style\" content=\"black\" />\n" +
+                "    <meta name=\"format-detection\" content=\"address=no\" />\n" +
                 "    <meta name=\"keywords\" content=\"\">\n" +
                 "    <meta name=\"description\" content=\"\">\n" +
                 "</head>\n" +
-                "<body>\n" +
+                "<body style=\"margin: 0;\n" +
+                "    padding: 0;\">\n" +
                 "<!-- 顺丰快递面单打印，尺寸：100mm*150mm模版 -->\n" +
                 "<div\n" +
-                "        style=\"width: 96mm;\n" +
+                "        style=\"width: 98mm;\n" +
                 "\t\t\theight: 150mm;\n" +
                 "\t\t\tpadding-top: 5mm;\n" +
                 "\t\t\tborder: 1px solid #000;\n" +
@@ -270,11 +282,7 @@ public class CodeUtil {
                 "    <div\n" +
                 "            style=\"width: 100%;\n" +
                 "\t\t\t\tfont-family: 宋体;\n" +
-                "\t\t\t\tfont-size: 4pt;\n" +
-                "\t\t\t\tdisplay: flex;\n" +
-                "\t\t\t\tflex-direction: row;\n" +
-                "\t\t\t\tjustify-content: space-between;\n" +
-                "\t\t\t\talign-items: flex-end;\"\n" +
+                "\t\t\t\tfont-size: 4pt;\"\n" +
                 "    >\n" +
                 "        <!-- 1.1 打印系统来源(太长放不下了，所以去掉了) -->\n" +
                 "        <!-- <div class=\"source\">\n" +
@@ -294,10 +302,12 @@ public class CodeUtil {
                 "        </div> -->\n" +
                 "        <!-- 3  时效类型 -->\n" +
                 "        <div\n" +
-                "                style=\"font-family: 黑体;\n" +
-                "\t\t\t\t\tfont-size: 18pt;\n" +
-                "\t\t\t\t\tfont-weight: bolder;\n" +
-                "\t\t\t\t\tmargin-right: 2mm;\"\n" +
+                "            style=\"font-family: 黑体;\n" +
+                "\t\t\t\tfont-size: 26px;\n" +
+                "\t\t\t\tfont-weight: bolder;\n" +
+                "\t\t\t\twidth: 100%;\n" +
+                "\t\t\t\ttext-align: right;\n" +
+                "\t\t\t\tmargin-right: 3mm;\"\n" +
                 "        >\n" +
                 "            <!-- 3.1 特快即日、特快A、特快、标快、标快陆运、特惠、电商标快 -->\n" +
                 "            特快\n" +
@@ -309,7 +319,7 @@ public class CodeUtil {
                 "    <div>\n" +
                 "        <!-- 2.1 条码 -->\n" +
                 "        <div>\n" +
-                "            <img src=\"images/yiweima.png\" style=\"width: 90%; height: 13mm; margin: 0 5mm;\">\n" +
+                "            <img src=\"images/yiweima.png\" style=\"width: 90%; height: 13mm; margin: 2mm 5mm;\">\n" +
                 "        </div>\n" +
                 "        <!-- 2.2 子母件单号、汉字、件数标识、 -->\n" +
                 "        <div\n" +
@@ -377,18 +387,14 @@ public class CodeUtil {
                 "                到付22元\n" +
                 "            </td>\n" +
                 "            <td rowspan=\"3\">\n" +
-                "                <img src=\"images/erweima.png\" style=\"width: 25mm; height: 25mm\">\n" +
+                "                <img src=\"images/erweima.png\" style=\"width: 25mm; height: 25mm; margin: 1mm\">\n" +
                 "            </td>\n" +
                 "            <!-- 13\t已验视 -->\n" +
                 "            <td\n" +
                 "                    rowspan=\"3\"\n" +
-                "                    style=\"font-family: 黑体; font-size: 22pt; font-weight: bold; color: #272727b3;\"\n" +
+                "                    style=\"font-family: 黑体; font-size: 20pt; font-weight: bold; color: #272727b3; writing-mode:vertical-lr;\"\n" +
                 "            >\n" +
-                "                已\n" +
-                "\t\t\t\t\t<br>\n" +
-                "\t\t\t\t\t验\n" +
-                "\t\t\t\t\t<br>\n" +
-                "\t\t\t\t\t视\n" +
+                "                已验视\n" +
                 "            </td>\n" +
                 "            <!-- 产品名称\t限时限时KC24字段 -->\n" +
                 "            <td\n" +
@@ -488,6 +494,7 @@ public class CodeUtil {
                 "</div>\n" +
                 "</body>\n" +
                 "\n" +
+                "\n" +
                 "</html>";
         return html;
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/utils/UploadUtil.java

+package com.liquidnet.client.admin.zhengzai.admin.service.impl.utils;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.PutObjectRequest;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.FilesUtils;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
+import com.liquidnet.service.kylin.entity.PlatformOssFiles;
+import com.liquidnet.service.kylin.mapper.PlatformOssFilesMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+/**
+ * <p>
+ * 临时上传
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-20 2:09 下午
+ */
+@Component
+public class UploadUtil {
+    @Value("${liquidnet.aliyun.oss.endpoint}")
+    private String endpoint;
+    @Value("${liquidnet.aliyun.oss.accessKeyId}")
+    private String accessKeyId;
+    @Value("${liquidnet.aliyun.oss.accessKeySecret}")
+    private String accessKeySecret;
+
+    @Autowired
+    private PlatformOssFilesMapper platformOssFilesMapper;
+
+    public UploadVo upload(File file, String pathName, String contentType) {
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+
+        File fileNew = file;
+
+        // file md5
+        String fileMD5 = FilesUtils.getFileMD5(fileNew);
+        PlatformOssFiles platformOssFiles = platformOssFilesMapper.selectOne(Wrappers.lambdaQuery(PlatformOssFiles.class).eq(PlatformOssFiles::getMd5str, fileMD5));
+        UploadVo uploadVo = new UploadVo();
+        if (null == platformOssFiles) {
+            String filename = fileNew.getName();
+            //这里文件名用了uuid 防止重复，可以根据自己的需要来写
+            String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
+            uploadName = uploadName.replace("-", "");// 078a77e0cf80481b824c5935247cff15.jpeg
+            String uploadpath = pathName + "/" + DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyy_MM_dd2) + "/" + uploadName;
+            String buckName = "img-zhengzai-tv";
+            PutObjectRequest putObjectRequest = new PutObjectRequest(buckName, uploadpath, fileNew);
+            ossClient.putObject(putObjectRequest);
+            ossClient.shutdown();
+
+            // 入库
+            PlatformOssFiles platformOssFilesDate = new PlatformOssFiles();
+            String ossFilesId = IDGenerator.nextSnowId();
+            platformOssFilesDate.setOssFilesId(ossFilesId);
+            platformOssFilesDate.setOssPath(uploadpath);
+            platformOssFilesDate.setFileName(filename);
+            platformOssFilesDate.setContentType(contentType);
+            platformOssFilesDate.setSize((int) fileNew.length());
+            platformOssFilesDate.setMd5str(fileMD5);
+            platformOssFilesDate.setBuckType(1);
+            platformOssFilesDate.setCreatedAt(DateUtil.getNowTime());
+            platformOssFilesMapper.insert(platformOssFilesDate);
+
+            BeanUtils.copyProperties(platformOssFilesDate, uploadVo);
+        } else {
+            BeanUtils.copyProperties(platformOssFiles, uploadVo);
+        }
+        return uploadVo;
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/utils/ZipMultiFileUtil.java

+package com.liquidnet.client.admin.zhengzai.admin.service.impl.utils;
+
+import com.liquidnet.commons.lang.util.DateUtil;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.time.LocalDateTime;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * <p>
+ * zip
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-20
+ */
+@Component
+public class ZipMultiFileUtil {
+
+//    public static String pathName = "/data/images/tmphtml/";
+    public static String fatherPath = "/Users/jiangxiulong/Desktop/tmphtml/faceImg";
+//    public static String fileDir = "/data/images/tmphtml/faceImgZip";
+    public static String fileDir = "/Users/jiangxiulong/Desktop/tmphtml/faceImgZip";
+
+    public static void zipFiles(File[] srcFiles, File zipFile) {
+        try {
+            if (srcFiles.length != 0) {
+                // 判断压缩后的文件存在不，不存在则创建
+                if (!zipFile.exists()) {
+                    zipFile.createNewFile();
+                } else {
+                    zipFile.delete();
+                    zipFile.createNewFile();
+                }
+
+                // 创建 FileInputStream 对象
+                FileInputStream fileInputStream = null;
+                // 实例化 FileOutputStream 对象
+                FileOutputStream fileOutputStream = new FileOutputStream(zipFile);
+                // 实例化 ZipOutputStream 对象
+                ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream);
+                // 创建 ZipEntry 对象
+                ZipEntry zipEntry = null;
+                // 遍历源文件数组
+                for (int i = 0; i < srcFiles.length; i++) {
+                    // 将源文件数组中的当前文件读入 FileInputStream 流中
+                    fileInputStream = new FileInputStream(srcFiles[i]);
+                    // 实例化 ZipEntry 对象，源文件数组中的当前文件
+                    zipEntry = new ZipEntry(srcFiles[i].getName());
+                    zipOutputStream.putNextEntry(zipEntry);
+                    // 该变量记录每次真正读的字节个数
+                    int len;
+                    // 定义每次读取的字节数组
+                    byte[] buffer = new byte[1024];
+                    while ((len = fileInputStream.read(buffer)) > 0) {
+                        zipOutputStream.write(buffer, 0, len);
+                    }
+                }
+                zipOutputStream.closeEntry();
+                zipOutputStream.close();
+                fileInputStream.close();
+                fileOutputStream.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 将存放在sourceFilePath目录下的源文件，打包成fileName名称的zip文件，并存放到zipFilePath路径下
+     *
+     * @param sourceFilePath :待压缩的文件路径
+     * @param zipFilePath    :压缩后存放路径
+     * @param fileName       :压缩后文件的名称
+     * @return
+     */
+    public static boolean fileToZip(String sourceFilePath, String zipFilePath, String fileName) {
+        boolean flag = false;
+        File sourceFile = new File(sourceFilePath);
+        FileInputStream fis = null;
+        BufferedInputStream bis = null;
+        FileOutputStream fos = null;
+        ZipOutputStream zos = null;
+
+        if (sourceFile.exists() == false) {
+            System.out.println("待压缩的文件目录：" + sourceFilePath + "不存在");
+            sourceFile.mkdir(); // 新建目录
+        }
+        try {
+            File zipFile = new File(zipFilePath + "/" + fileName);
+            if (zipFile.exists()) {
+                System.out.println(zipFilePath + "目录下存在名字为:" + fileName + ".zip" + "打包文件.");
+            } else {
+                File[] sourceFiles = sourceFile.listFiles();
+                if (null == sourceFiles || sourceFiles.length < 1) {
+                    System.out.println("待压缩的文件目录：" + sourceFilePath + "里面不存在文件，无需压缩.");
+                } else {
+                    fos = new FileOutputStream(zipFile);
+                    zos = new ZipOutputStream(new BufferedOutputStream(fos));
+                    byte[] bufs = new byte[1024 * 10];
+                    for (int i = 0; i < sourceFiles.length; i++) {
+                        //创建ZIP实体，并添加进压缩包
+                        ZipEntry zipEntry = new ZipEntry(sourceFiles[i].getName());
+                        zos.putNextEntry(zipEntry);
+                        //读取待压缩的文件并写进压缩包里
+                        fis = new FileInputStream(sourceFiles[i]);
+                        bis = new BufferedInputStream(fis, 1024 * 10);
+                        int read = 0;
+                        while ((read = bis.read(bufs, 0, 1024 * 10)) != -1) {
+                            zos.write(bufs, 0, read);
+                        }
+                    }
+                    flag = true;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        } finally {
+            //关闭流
+            try {
+                if (null != bis) bis.close();
+                if (null != zos) zos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+                throw new RuntimeException(e);
+            }
+        }
+        return flag;
+    }
+
+    public static String goZip() {
+        //创建父级目录 用于存放分区（分区中存放多个分类）
+        String fileName = "faceImgs".concat(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmssTrim));
+
+        File fatherFile = new File(fileDir);
+        try {
+            if (!fatherFile.exists()) {
+                fatherFile.mkdir();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //将项目名称的文件夹 压缩为zip
+        boolean res = ZipMultiFileUtil.fileToZip(fatherPath, fileDir, fileName + ".zip");
+        if (res) {
+            return fileDir.concat("/").concat(fileName).concat(".zip");
+        } else {
+            return "";
+        }
+    }
+
+    /*public static void main(String[] args) {
+        goZip();
+    }*/
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil;
+import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.UploadUtil;
+import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.ZipMultiFileUtil;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.ShunfengSignUtils;
 import com.liquidnet.commons.lang.util.*;
@@ -13,6 +15,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
 import com.liquidnet.service.kylin.entity.*;
@@ -27,6 +30,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -101,6 +105,12 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
     @Autowired
     private CodeUtil codeUtil;
 
+    @Autowired
+    private ZipMultiFileUtil zipMultiFileUtil;
+
+    @Autowired
+    private UploadUtil uploadUtil;
+
     public List<PerformanceExpressPerformanceListAdminDao> getPerformancesList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<PerformanceExpressPerformanceListAdminDao> voList = new ArrayList();
         try {
@@ -563,7 +573,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         } while (count >= limitNum);
     }
 
-    public ResponseDto print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+    public String print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<String> ids = performanceExpressSearchAdminParam.getIds();
         for (String orderExpressId : ids) {
             KylinOrderExpress kylinOrderExpress = kylinOrderExpressMapper.selectOne(
@@ -575,9 +585,14 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                             .eq(KylinOrderTickets::getOrderTicketsId, kylinOrderExpress.getOrderTicketsId())
             );
             String imgPath = codeUtil.html2img(kylinOrderExpress, jContact, jProvince.concat(jCity).concat(jAddress), jTel, orderInfo);
-            codeUtil.drawImage(imgPath, 1);
         }
-        return ResponseDto.success();
+
+        String zpiPath = zipMultiFileUtil.goZip();
+
+        //上传
+        UploadVo upload = uploadUtil.upload(new File(zpiPath), "faceImgZip", "zip");
+
+        return upload.getOssPath();
     }
 
 }

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -87,6 +87,12 @@ liquidnet:
     dysms:
       accessKeyId: LTAI5tHt7yvm97G8zxackcMK
       accessKeySecret: xC3i5qEptJ3JIIRaYLaKvhk4gVASfl
+    oss:
+      imgUrl: "https://img.zhengzai.tv/"
+      appUrl: "https://app.zhengzai.tv/"
+      endpoint: http://oss-cn-hangzhou.aliyuncs.com
+      accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
+      accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
   wechat:
     zhengzai:
       applet:

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -3,17 +3,13 @@ package com.liquidnet.service.platform.controller.basicServices;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.common.utils.BinaryUtil;
-import com.aliyun.oss.common.utils.IOUtils;
 import com.aliyun.oss.model.GenericResult;
-import com.aliyun.oss.model.GetObjectRequest;
 import com.aliyun.oss.model.ProcessObjectRequest;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.FilesUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
 import com.liquidnet.service.kylin.entity.PlatformOssFiles;
@@ -28,7 +24,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.Pattern;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.Formatter;