oss

(cherry picked from commit df7ca8e51ab61a950a58986aa9b4e3cac9e96de3)

blade-common/src/main/java/org/springblade/common/utils/AsyncConfigurer.java

@@ -15,7 +15,7 @@ public class AsyncConfigurer {
     /**
      * cpu 核心数量
      */
-    public static final int cpuNum = 3 ;//Runtime.getRuntime().availableProcessors();
+    public static final int cpuNum = 1 ;//Runtime.getRuntime().availableProcessors();
 
     /**
      * 线程池配置

blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -52,6 +52,7 @@ import org.springframework.util.ResourceUtils;
 
 public class CommonUtil {
     private static final double INCH_TO_CM = 2.54;
+
     public static Boolean checkBigDecimal(Object value) {
         try {
             if (value != null && StringUtils.isNotEmpty(value.toString())) {
@@ -140,17 +141,20 @@ public class CommonUtil {
     /**
      * 根据OSS文件路径获取文件输入流
      */
-    public static synchronized InputStream getOSSInputStream(String urlStr) throws Exception {
-        urlStr = replaceOssUrl(urlStr);
-        //获取OSS文件流
-        URL url =new URL(urlStr);
-        final URLConnection conn = url.openConnection();
-        conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+    public static InputStream getOSSInputStream(String urlStr) {
         try {
+            urlStr = replaceOssUrl(urlStr);
+            //获取OSS文件流
+            URL url = new URL(urlStr);
+            URLConnection conn = url.openConnection();
+            // 设置连接超时时间
+            conn.setConnectTimeout(10000); // 5秒
+            // 设置读取超时时间
+            conn.setReadTimeout(10000); // 5秒
+            conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
             return conn.getInputStream();
-        } catch (Exception e){
+        } catch (Exception e) {
             System.out.println("zw-----------");
-            e.printStackTrace();
             return null;
         }
     }
@@ -179,7 +183,7 @@ public class CommonUtil {
     /**
      * 获取字节数组
      */
-    public static synchronized byte[] InputStreamToBytes(InputStream is){
+    public static synchronized byte[] InputStreamToBytes(InputStream is) {
         BufferedInputStream bis = new BufferedInputStream(is);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         int date = -1;
@@ -296,29 +300,30 @@ public class CommonUtil {
 
     /**
      * Map拆分 (指定分组大小)
-     * @param map Map
+     *
+     * @param map       Map
      * @param chunkSize 每个分组的大小 (>=1)
-     * @param <K> Key
-     * @param <V> Value
+     * @param <K>       Key
+     * @param <V>       Value
      * @return 子Map列表
      */
-    public static <K,V> List<Map<K,V>> splitByChunkSize(Map<K,V> map, int chunkSize){
-        if(Objects.isNull(map) || map.isEmpty() || chunkSize<1){
+    public static <K, V> List<Map<K, V>> splitByChunkSize(Map<K, V> map, int chunkSize) {
+        if (Objects.isNull(map) || map.isEmpty() || chunkSize < 1) {
             //空map或者分组大小<1，无法拆分
             return Collections.emptyList();
         }
 
         int mapSize = map.size(); //键值对总数
-        int groupSize = mapSize/chunkSize + (mapSize%chunkSize==0?0:1); //计算分组个数
-        List<Map<K,V>> list = Lists.newArrayListWithCapacity(groupSize); //子Map列表
+        int groupSize = mapSize / chunkSize + (mapSize % chunkSize == 0 ? 0 : 1); //计算分组个数
+        List<Map<K, V>> list = Lists.newArrayListWithCapacity(groupSize); //子Map列表
 
-        if(chunkSize >= mapSize){ //只能分1组的情况
+        if (chunkSize >= mapSize) { //只能分1组的情况
             list.add(map);
             return list;
         }
 
         int count = 0; //每个分组的组内计数
-        Map<K,V> subMap = Maps.newHashMapWithExpectedSize(chunkSize); //子Map
+        Map<K, V> subMap = Maps.newHashMapWithExpectedSize(chunkSize); //子Map
 
         for (Map.Entry<K, V> entry : map.entrySet()) {
             if (count < chunkSize) {
@@ -342,20 +347,21 @@ public class CommonUtil {
 
     /**
      * Map拆分(指定分组个数)
-     * @param map Map
+     *
+     * @param map       Map
      * @param groupSize 分组个数 (>=1)
-     * @param <K> Key
-     * @param <V> Value
+     * @param <K>       Key
+     * @param <V>       Value
      * @return 子Map列表
      */
-    public static <K,V> List<Map<K,V>> splitByGroupSize(Map<K,V> map, int groupSize){
-        if(Objects.isNull(map) || map.isEmpty() || groupSize<1){
+    public static <K, V> List<Map<K, V>> splitByGroupSize(Map<K, V> map, int groupSize) {
+        if (Objects.isNull(map) || map.isEmpty() || groupSize < 1) {
             //空map或者分组数<1，无法拆分
             return Collections.emptyList();
         }
 
-        List<Map<K,V>> list = Lists.newArrayListWithCapacity(groupSize);
-        if(groupSize == 1){ //只有1个分组的情况
+        List<Map<K, V>> list = Lists.newArrayListWithCapacity(groupSize);
+        if (groupSize == 1) { //只有1个分组的情况
             list.add(map);
             return list;
         }
@@ -365,22 +371,22 @@ public class CommonUtil {
         int restCount = mapSize % groupSize; //平均后剩余的键值对数
         int chunkSize0 = mapSize / groupSize; //每个分组键值对数量
         int chunkSize1 = chunkSize0 + 1; //多分一个
-        int chunkSize = chunkIndex<restCount ? chunkSize1 : chunkSize0; //实际每组的大小（前面的部分分组可能会多分1个）
+        int chunkSize = chunkIndex < restCount ? chunkSize1 : chunkSize0; //实际每组的大小（前面的部分分组可能会多分1个）
         int count = 0; //每个分组的组内计数
-        Map<K,V> subMap = Maps.newHashMapWithExpectedSize(chunkSize);//子Map
+        Map<K, V> subMap = Maps.newHashMapWithExpectedSize(chunkSize);//子Map
 
         for (Map.Entry<K, V> entry : map.entrySet()) {
-            if(count < chunkSize){
+            if (count < chunkSize) {
                 //每个分组按实际分组大小（chunkSize）加入键值对
                 subMap.put(entry.getKey(), entry.getValue());
-                count ++; //组内计数+1
-            }else{
+                count++; //组内计数+1
+            } else {
                 //结束上一个分组
                 list.add(subMap); //当前分组装满了->加入列表
-                chunkIndex ++; //分组个数+1
+                chunkIndex++; //分组个数+1
 
                 //开始下一个分组
-                chunkSize = chunkIndex<restCount ? chunkSize1 : chunkSize0; //重新计算分组大小
+                chunkSize = chunkIndex < restCount ? chunkSize1 : chunkSize0; //重新计算分组大小
                 subMap = Maps.newHashMapWithExpectedSize(chunkSize); //新的分组
                 subMap.put(entry.getKey(), entry.getValue()); //添加当前键值对
                 count = 1; //组内计数重置为1
@@ -447,14 +453,14 @@ public class CommonUtil {
      * @param filesPath
      * @throws Exception
      */
-    public static void packageZip(String filesPath,String zipUrl) throws Exception {
+    public static void packageZip(String filesPath, String zipUrl) throws Exception {
         // 要被压缩的文件夹
         File file = new File(filesPath);   //需要压缩的文件夹
         File folder = new File(zipUrl);
         if (!folder.exists() && !folder.isDirectory()) {
             folder.mkdirs();
         }
-        File zipFile = new File(zipUrl+"/" + "localArchive.zip");  //放于和需要压缩的文件夹同级目录
+        File zipFile = new File(zipUrl + "/" + "localArchive.zip");  //放于和需要压缩的文件夹同级目录
         ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(zipFile));
         isDirectory(file, zipOut, "", true);   //判断是否为文件夹
         zipOut.close();
@@ -518,8 +524,8 @@ public class CommonUtil {
      */
 
     public static void main(String[] args) throws IOException {
-       // String imgurl = "/Users/hongchuangyanfa/Desktop/excel/432123.jpg";
-       // String imgurl = "/Users/hongchuangyanfa/Desktop/excel/123.jpg";
+        // String imgurl = "/Users/hongchuangyanfa/Desktop/excel/432123.jpg";
+        // String imgurl = "/Users/hongchuangyanfa/Desktop/excel/123.jpg";
         String imgurl = "/Users/hongchuangyanfa/Downloads/bccb09f5e2caa85611d380f596d4febb.jpg";
         File file = ResourceUtils.getFile(imgurl);
 
@@ -547,7 +553,7 @@ public class CommonUtil {
                 // 需要旋转图片
                 // 1 无需纠正 2 水平翻转（镜像）3 垂直翻转（旋转180°） 4 水平翻转+垂直翻转 5 水平翻转+旋转90°
                 // 6 旋转90° 7 水平翻转+旋转270° 8 +旋转270°
-                if(orientation > 1) {
+                if (orientation > 1) {
                     BufferedImage originalImage = ImageIO.read(new ByteArrayInputStream(imageData));
                     AffineTransform transform = new AffineTransform();
                     if (orientation == 3) {
@@ -635,7 +641,7 @@ public class CommonUtil {
         ByteArrayInputStream bais = new ByteArrayInputStream(imageData);
         BufferedImage originalImage = ImageIO.read(bais);
         long sizeLimit = 512000; //358KB
-        int width = originalImage.getWidth() ;
+        int width = originalImage.getWidth();
         int height = originalImage.getHeight();
         Image scaledImage = originalImage.getScaledInstance(width, height, Image.SCALE_SMOOTH);
         BufferedImage resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
@@ -659,8 +665,8 @@ public class CommonUtil {
             originalImage = ImageIO.read(bais);
             float width2 = originalImage.getWidth() * quality;
             float height2 = originalImage.getHeight() * quality;
-             scaledImage = originalImage.getScaledInstance(width, height, Image.SCALE_SMOOTH);
-             resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            scaledImage = originalImage.getScaledInstance(width, height, Image.SCALE_SMOOTH);
+            resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
             resizedImage.getGraphics().drawImage(scaledImage, 0, 0, null);
 
             // 压缩图像
@@ -704,10 +710,11 @@ public class CommonUtil {
 
     /**
      * 根据起止日期获取工作日
+     *
      * @return
      */
-    public static int getWorkDays(LocalDate startTime,LocalDate endTime){
-        if (startTime.compareTo(endTime) > 0){
+    public static int getWorkDays(LocalDate startTime, LocalDate endTime) {
+        if (startTime.compareTo(endTime) > 0) {
             return -1;
         }
 //        if (startTime.compareTo(endTime) == 0){
@@ -715,12 +722,12 @@ public class CommonUtil {
 //        }
         StringBuilder str = new StringBuilder();
         List<String> list = new ArrayList<>();
-        while (!startTime.equals(endTime)){
-            str.append("d="+startTime+"&");
+        while (!startTime.equals(endTime)) {
+            str.append("d=" + startTime + "&");
             list.add(startTime.toString());
             startTime = startTime.plusDays(1L);
         }
-        str.append("d="+endTime+"&");
+        str.append("d=" + endTime + "&");
         list.add(endTime.toString());
         str.append("type=Y");
         String post = HttpUtil.get("http://timor.tech/api/holiday/batch?" + str.toString());
@@ -730,7 +737,7 @@ public class CommonUtil {
         for (String s : list) {
             Map map = JSONObject.parseObject(jsonObject.get(s).toString(), Map.class);
             int type = (int) map.get("type");
-            if (type == 0 || type == 3){
+            if (type == 0 || type == 3) {
                 workDays++;
             }
         }
@@ -738,24 +745,21 @@ public class CommonUtil {
     }
 
     public static String replaceOssUrl(String url) {
-      /*  if(url.indexOf("-internal")<0 && url.indexOf(".aliyuncs.com")>=0) {
-                // 如果当前环境变量不包含linuxtesttest，则替换URL中的oss路径
-            url = url.replace(".aliyuncs.com", "-internal.aliyuncs.com");
-        }*/
         //本地部署- 甬台温
-        if (url.indexOf("183.247.216.148")>=0) {
+        if (url.indexOf("183.247.216.148") >= 0 || url.indexOf("152.168.2.15") >= 0) {
             // 如果当前环境变量不包含linuxtesttest，则替换URL中的oss路径
-            if(SystemUtils.isMacOs() || SystemUtils.isWindows()){
-                url = url.replace("https://","http://").replace(":9000//",":9000/");
-            }else{
-                url = url.replace("https://","http://").replace("183.247.216.148","152.168.2.15").replace(":9000//",":9000/");
+            if (SystemUtils.isMacOs() || SystemUtils.isWindows()) {
+                url = url.replace("https://", "http://").replace(":9000//", ":9000/");
+            } else {
+                url = url.replace("https://", "http://").replace("183.247.216.148", "152.168.2.15").replace(":9000//", ":9000/");
             }
         }
         return url;
     }
 
     /**
-     *  webp文件转字节数组
+     * webp文件转字节数组
+     *
      * @param
      * @return
      */
@@ -763,8 +767,8 @@ public class CommonUtil {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         try {
             BufferedImage webpImage = ImageIO.read(inputStream);
-            ImageIO.write(webpImage,"png",bos);
-        }catch (Exception e){
+            ImageIO.write(webpImage, "png", bos);
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return bos.toByteArray();
@@ -775,6 +779,7 @@ public class CommonUtil {
         double pixelsPerCm = 90 / INCH_TO_CM;
         return (int) Math.round(cm * pixelsPerCm);
     }
+
     // 图片厘米转像素
     public static double pxToCm(int px) {
         double cmPerPixel = INCH_TO_CM / 90;

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java

@@ -22,12 +22,11 @@ import com.aliyun.oss.common.auth.CredentialsProvider;
 import com.aliyun.oss.common.auth.DefaultCredentialProvider;
 import lombok.SneakyThrows;
 import org.springblade.core.oss.AliossTemplate;
-import org.springblade.core.oss.OssTemplate;
+
 import org.springblade.core.oss.props.OssProperties;
-import org.springblade.core.oss.rule.BladeOssRule;
+
 import org.springblade.core.oss.rule.OssRule;
-import org.springblade.resource.builder.ossre.AliossTemplateRe;
-import org.springblade.resource.builder.ossre.OssTemplateRe;
+
 import org.springblade.resource.entity.Oss;
 
 /**

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/ossre/AliossTemplateRe.java

@@ -1,3 +1,4 @@
+/*
 package org.springblade.resource.builder.ossre;
 
 import com.aliyun.oss.OSS;
@@ -251,6 +252,20 @@ public class AliossTemplateRe implements OssTemplateRe {
         return null;
     }
 
+*/
+/*
+    @Override
+    public InputStream statFileStream(String fileName) {
+        return null;
+    }
+
+    @Override
+    public InputStream statFileStream(String bucketName, String fileName) {
+        return null;
+    }
+*//*
+
+
     private String getBucketName() {
         return this.getBucketName(this.ossProperties.getBucketName());
     }
@@ -456,3 +471,4 @@ public class AliossTemplateRe implements OssTemplateRe {
         return "application/pdf";
     }
 }
+*/

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/LargeFileEndpoint.java

@@ -90,13 +90,6 @@ public class LargeFileEndpoint {
 
     private final CommonFileClient commonFileClient;
 
-    @Autowired
-    StringRedisTemplate RedisTemplate;
-
-    private final String bucketName = "bladex-chongqing-info";
-
-    private final String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
-
     private final JdbcTemplate jdbcTemplate;
 
     /**

blade-service-api/blade-e-visa-api/src/main/java/org/springblade/evisa/feign/EVisaClientFallBack.java

@@ -34,7 +34,7 @@ public class EVisaClientFallBack implements FallbackFactory<EVisaClient> {
 
             @Override
             public String createSeal(EVisaMakeSealVO vo) {
-                return null;
+                return "电签服务器重启,请等待1分钟重试";
             }
 
             @Override

blade-service/blade-e-visa/pom.xml

@@ -12,14 +12,6 @@
 
     <artifactId>blade-e-visa</artifactId>
 
-   <repositories>
-        <repository>
-            <id>com.e-iceblue</id>
-            <name>e-iceblue</name>
-            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -285,5 +277,36 @@
 
         <!-- 电签相关 end -->
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <configuration>
+                    <username>${docker.username}</username>
+                    <password>${docker.password}</password>
+                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <compilerArguments>
+                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar:${java.home}/lib/jsse.jar
+                        </bootclasspath>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -58,7 +58,7 @@ public class EVController {
     @Resource(name = "taskExecutor1")
     private ThreadPoolExecutor executor;
 
-    @Scheduled(cron = "0/10 * * * * ?")
+   // @Scheduled(cron = "0/10 * * * * ?")
     public void SignInfo() {
         //执行代码
 

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -1381,7 +1381,7 @@ public class EVisaServiceImpl implements EVisaService {
                 return responseHeadBean.getMessage();
             } else if (responseHeadBean.getMessage().contains("is exist")) {
                 logger.info("【电签模块】{}", responseHeadBean.getMessage());
-                return "error";
+                return "task is exist";
             } else {
                 return responseBean.getHead().getMessage();
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -1697,7 +1698,6 @@ public class ExcelTabController extends BladeController {
     })
     public R addBussFile(@RequestParam("file") MultipartFile file, Long pkeyId, String nodeId, String contractId, String projectId, String classify) {
 
-        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
 
         R<BladeFile> bladeFile = iossClient.addFileInfo(file);
         BladeFile bladeFile1 = bladeFile.getData();
@@ -1710,7 +1710,6 @@ public class ExcelTabController extends BladeController {
         tableFile.setIsDeleted(0);
         tableFile.setExtension(fileExtension);
 
-
         NewBladeFile newBladeFile = new NewBladeFile();
         if (fileExtension.contains("xlsx")) {
             newBladeFile = this.commonFileClient.excelToPdf(file);
@@ -1946,7 +1945,9 @@ public class ExcelTabController extends BladeController {
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
     public R saveBussData2(@Valid @RequestBody JSONObject dataInfo) throws Exception {
+
         ExecutionTime executionTime = new ExecutionTime();
+        executionTime.info("----计划开始----");
         JSONArray dataArray = new JSONArray();
         if (dataInfo.containsKey("dataInfo")) { //节点保存
             JSONObject jsonObject = dataInfo.getJSONObject("dataInfo");
@@ -1961,11 +1962,11 @@ public class ExcelTabController extends BladeController {
         String projectId = tableInfo1.getString("projectId");
         String classify = tableInfo1.getString("classify");
 
+        executionTime.info("----组装开始----");
         /*全加载，或者可以优化成依赖加载*/
         List<AppWbsTreeContractVO> tableAll = new ArrayList<>();
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);
-
-        executionTime.info("公式前");
+        executionTime.info("----组装完成----");
         try {
             Long pKeyId = Long.parseLong(tableInfoList.get(0).getPkeyId());
             String sql = "SELECT node_name from m_wbs_tree_contract where p_key_id=" + pKeyId;
@@ -1979,23 +1980,23 @@ public class ExcelTabController extends BladeController {
 
 
         //公式填充
+        executionTime.info("----公式填充执行----");
         this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeId), ExecuteType.INSPECTION);
-        RandomNumberHolder.RandomNumberclear();
+         RandomNumberHolder.RandomNumberclear();
         assert tableInfoList != null;
         if (tableInfoList.size() == 0) {
             R.success("数据未发生变化");
         }
-
-        executionTime.info("公式耗时");
+        executionTime.info("----公式填充执行完毕----");
         //保存数据到数据库
         R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList);
         RandomNumberHolder.RandomTemplateTypeclear();
         RandomNumberHolder.RandomWbsTreeContractclear();
+        executionTime.info("----数据保存结束----");
         if (!result.isSuccess()) {
             return R.fail(result.getMsg());
         }
-        executionTime.info("表单保存耗时");
-
+        executionTime.info("----数据合并前----");
         List<String> errorPKeyIds = new ArrayList<>();
         //单个pdf加载
         if (tableInfoList != null) {
@@ -2012,7 +2013,8 @@ public class ExcelTabController extends BladeController {
                 }
             });
         }
-        executionTime.info("PDF刷新耗时");
+
+        executionTime.info("----数据保存完毕 ----");
         //发生异常后直接返回，不进行合并
         if (errorPKeyIds.size() > 0) {
             List<AppWbsTreeContractVO> errorTabs = new LinkedList<>();
@@ -2026,10 +2028,10 @@ public class ExcelTabController extends BladeController {
                 return R.fail("以下的表在生成pdf文件时发生了异常【" + StringUtils.join(names, "、") + "】");
             }
         }
-
+        executionTime.info("----数据合并前 ----");
         //合并pdf加载
         excelTabService.getBussPdfs(nodeId, classify, contractId, projectId);
-        executionTime.info("PDF合并耗时");
+        executionTime.info("---PDF合并耗时---");
         //更新缓存
         informationQueryClient.delAsyncWbsTree(contractId);
         executionTime.info("缓存删除耗时");

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/SignPfxFileController.java

@@ -94,8 +94,6 @@ public class SignPfxFileController extends BladeController {
     private final ISignPfxFilePreService pfxFilePreService;
     private final NewIOSSClient newIOSSClient;
     private final IOSSClient iossClient;
-    private final OkHttpClient.Builder okHttpClientBuilder;
-
     /**
      * 根据合同段ID获取项目下的所有合同段
      *

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/SignPfxFileServiceImpl.java

@@ -167,7 +167,7 @@ public class SignPfxFileServiceImpl extends BaseServiceImpl<SignPfxFileMapper, S
         try {
             //调用接口创建印模
             String resultCode = this.eVisaClient.createSeal(JSONObject.parseObject(JSONObject.toJSONString(makeSeal), EVisaMakeSealVO.class));
-            if (StringUtils.isNotEmpty(resultCode) && ("successfully".equals(resultCode) || "success".equals(resultCode) || "1".equals(resultCode))) {
+            if (StringUtils.isNotEmpty(resultCode) && ("successfully".equals(resultCode) || "success".equals(resultCode) || "1".equals(resultCode)|| "task is exist".equals(resultCode))) {
                 logger.info("【电签模块】{}", "创建" + msg + "成功");
                 //修改状态为已注册
                 this.update(Wrappers.<SignPfxFile>lambdaUpdate().set(SignPfxFile::getIsRegister, 1).eq(SignPfxFile::getId, pfxFileId));
@@ -177,9 +177,8 @@ public class SignPfxFileServiceImpl extends BaseServiceImpl<SignPfxFileMapper, S
             }
         } catch (Exception e) {
             e.printStackTrace();
+            return R.fail("调用电签服务失败");
         }
-
-        return R.fail("");
     }
 
     @Override

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -533,9 +533,16 @@ public class FileUtils {
         String file_path2 = getSysLocalFileUrl();
         String sys_file_net_url = ParamCache.getValue(CommonConstant.SYS_FILE_NET_URL);
         String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
-
-        if (fileUrl.indexOf("aliyuncs.com") >= 0 || fileUrl.indexOf("/mnt/sdc/Users/hongchuangyanfa/Desktop/")>=0) {
-            return fileUrl;
+        if(fileUrl.indexOf("aliyuncs.com") >= 0 || fileUrl.indexOf("xinan1.zos.ctyun.cn")>=0 || fileUrl.indexOf("/mnt/sdc/Users/hongchuangyanfa/Desktop/")>=0){
+            if(fileUrl.indexOf("/mnt/sdc/Users/hongchuangyanfa/Desktop/")>=0){
+                if(SystemUtils.isWindows() || SystemUtils.isMacOs()){
+                    file_path2 = file_path;
+                }else{
+                    return fileUrl;
+                }
+            }else{
+                return fileUrl;
+            }
         } else {
             file_path2 = file_path;
         }