兼容 亚马逊和 天翼云的oss

blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/NewIOSSClient.java

@@ -1,5 +1,4 @@
 package org.springblade.resource.feign;
-
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.resource.vo.NewBladeFile;

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

@@ -38,7 +38,7 @@ import org.springblade.resource.entity.Oss;
 public class AliOssBuilder {
 
     @SneakyThrows
-    public static AliossTemplateRe template(Oss oss, BladeOssRule ossRule) {
+    public static AliossTemplate template(Oss oss, OssRule ossRule) {
         // 创建ClientConfiguration。ClientConfiguration是OSSClient的配置类，可配置代理、连接超时、最大连接数等参数。
         ClientConfiguration conf = new ClientConfiguration();
         // 设置OSSClient允许打开的最大HTTP连接数，默认为1024个。
@@ -63,7 +63,7 @@ public class AliOssBuilder {
         ossProperties.setBucketName(oss.getBucketName());
         CredentialsProvider credentialsProvider = new DefaultCredentialProvider(ossProperties.getAccessKey(), ossProperties.getSecretKey());
         OSSClient ossClient = new OSSClient(ossProperties.getEndpoint(), credentialsProvider, conf);
-        return new AliossTemplateRe(ossClient, ossProperties, ossRule);
+        return new AliossTemplate(ossClient, ossProperties, ossRule);
     }
 
 }

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

@@ -17,24 +17,22 @@
 package org.springblade.resource.builder.oss;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.oss.OssTemplate;
 import org.springblade.core.oss.enums.OssEnum;
 import org.springblade.core.oss.enums.OssStatusEnum;
 import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.oss.rule.BladeOssRule;
+import org.springblade.core.oss.rule.OssRule;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
-import org.springblade.resource.builder.ossre.OssTemplateRe;
 import org.springblade.resource.entity.Oss;
 import org.springblade.resource.service.IOssService;
-import org.springblade.system.cache.ParamCache;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -48,129 +46,119 @@ import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
  */
 public class OssBuilder {
 
-    public static final String OSS_CODE = "oss:code:";
-    public static final String OSS_PARAM_KEY = "code";
-    public static final String OSS_TENANT_ID = "000000";
+	public static final String OSS_CODE = "oss:code:";
+	public static final String OSS_PARAM_KEY = "code";
 
-    private final OssProperties ossProperties;
-    private final IOssService ossService;
+	private final OssProperties ossProperties;
+	private final IOssService ossService;
 
-    public OssBuilder(OssProperties ossProperties, IOssService ossService) {
-        this.ossProperties = ossProperties;
-        this.ossService = ossService;
-    }
+	public OssBuilder(OssProperties ossProperties, IOssService ossService) {
+		this.ossProperties = ossProperties;
+		this.ossService = ossService;
+	}
 
-    /**
-     * oss配置缓存池
-     */
-    private final Map<String, Oss> ossPool = new ConcurrentHashMap<>();
+	/**
+	 * OssTemplate配置缓存池
+	 */
+	private final Map<String, OssTemplate> templatePool = new ConcurrentHashMap<>();
 
-    /**
-     * OssTemplate配置缓存池
-     */
-    private final Map<String, OssTemplateRe> templatePool = new ConcurrentHashMap<>();
+	/**
+	 * oss配置缓存池
+	 */
+	private final Map<String, Oss> ossPool = new ConcurrentHashMap<>();
 
-    /**
-     * 获取template --阿里云
-     * @return OssTemplate
-     */
-    public OssTemplateRe template() {
-        return template(StringPool.EMPTY);
-    }
+	/**
+	 * 获取template
+	 *
+	 * @return OssTemplate
+	 */
+	public OssTemplate template() {
+		return template(StringPool.EMPTY);
+	}
 
-    /**
-     * 获取template ---- 阿里云
-     * @param code 资源编号
-     * @return OssTemplate
-     */
-    public OssTemplateRe template(String code) {
-        String tenantId = AuthUtil.getTenantId();
-        Oss oss = getOss(tenantId, code);
-        /*String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
-        if(sys_isonline.equals("20")){
-            oss.setEndpoint("http://183.247.216.148:9000/");
-        }else{
-            oss.setEndpoint("https://oss-cn-shenzhen.aliyuncs.com/");
-        }*/
-       // oss.setEndpoint("http://183.247.216.148:9000/");
-        oss.setEndpoint("https://oss-cn-shenzhen.aliyuncs.com/");
-        System.out.println("oss="+oss.getEndpoint());
-        Oss ossCached = ossPool.get(tenantId);
-        OssTemplateRe template = templatePool.get(tenantId);
-        // 若为空或者不一致，则重新加载
-        if (Func.hasEmpty(template, ossCached) || !oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
-            synchronized (OssBuilder.class) {
-                template = templatePool.get(tenantId);
-                if (Func.hasEmpty(template, ossCached) || !oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
-                    BladeOssRule ossRule;
-                    // 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启
-                    if (oss.getEndpoint().equals(ossProperties.getEndpoint()) && oss.getAccessKey().equals(ossProperties.getAccessKey()) && ossProperties.getTenantMode()) {
-                        ossRule = new BladeOssRule(Boolean.TRUE);
-                    } else {
-                        ossRule = new BladeOssRule(Boolean.FALSE);
-                    }
+	/**
+	 * 获取template
+	 *
+	 * @param code 资源编号
+	 * @return OssTemplate
+	 */
+	public OssTemplate template(String code) {
+		String tenantId = AuthUtil.getTenantId();
+		Oss oss = getOss(tenantId, code);
+		Oss ossCached = ossPool.get(tenantId);
+		OssTemplate template = templatePool.get(tenantId);
+		// 若为空或者不一致，则重新加载
+		if (Func.hasEmpty(template, ossCached) || !oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
+			synchronized (OssBuilder.class) {
+				template = templatePool.get(tenantId);
+				if (Func.hasEmpty(template, ossCached) || !oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
+					OssRule ossRule;
+					// 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启
+					if (oss.getEndpoint().equals(ossProperties.getEndpoint()) && oss.getAccessKey().equals(ossProperties.getAccessKey()) && ossProperties.getTenantMode()) {
+						ossRule = new BladeOssRule(Boolean.TRUE);
+					} else {
+						ossRule = new BladeOssRule(Boolean.FALSE);
+					}
+					if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
+						template = MinioOssBuilder.template(oss, ossRule);
+					} else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
+						template = QiniuOssBuilder.template(oss, ossRule);
+					} else if (oss.getCategory() == OssEnum.ALI.getCategory()) {
+						template = AliOssBuilder.template(oss, ossRule);
+					} else if (oss.getCategory() == OssEnum.TENCENT.getCategory()) {
+						template = TencentCosBuilder.template(oss, ossRule);
+					} else if (oss.getCategory() == OssEnum.HUAWEI.getCategory()) {
+						template = HuaweiObsBuilder.template(oss, ossRule);
+					} else if (oss.getCategory() == OssEnum.AMAZONS3.getCategory()) {
+						template = AmazonS3OssBuilder.template(oss, ossRule);
+					}
+					templatePool.put(tenantId, template);
+					ossPool.put(tenantId, oss);
+				}
+			}
+		}
+		return template;
+	}
 
-                    //获取对象
-                   if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
-                        template = MinioOssBuilder.template(oss, ossRule);
-                   } else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
-                       // template = QiniuOssBuilder.template(oss, ossRule);
-                   } else if (oss.getCategory() == OssEnum.ALI.getCategory()) {
-                       template = AliOssBuilder.template(oss, ossRule);
-                   } else if (oss.getCategory() == OssEnum.TENCENT.getCategory()) {
-                       // template = TencentOssBuilder.template(oss, ossRule);
-                   }
-                    templatePool.put(tenantId, template);
-                    ossPool.put(tenantId, oss);
-                }
-            }
-        }
-        return template;
-    }
-
-    /**
-     * 获取对象存储实体
-     *
-     * @param tenantId 租户ID
-     * @return Oss
-     */
-    public Oss getOss(String tenantId, String code) {
-        String key = StringUtils.isNotEmpty(tenantId) ? tenantId : OSS_TENANT_ID;
-        LambdaQueryWrapper<Oss> lqw = Wrappers.<Oss>query().lambda().eq(Oss::getTenantId, key);
-        // 获取传参的资源编号并查询，若有则返回，若没有则调启用的配置
-        String ossCode = StringUtil.isBlank(code) ? WebUtil.getParameter(OSS_PARAM_KEY) : code;
-        if (StringUtil.isNotBlank(ossCode)) {
-            key = key.concat(StringPool.DASH).concat(ossCode);
-            lqw.eq(Oss::getOssCode, ossCode);
-        } else {
-            lqw.eq(Oss::getStatus, OssStatusEnum.ENABLE.getNum());
-            Oss o = ossService.getOne(lqw);
-            if (Func.notNull(o)) {
-                key = o.getOssCode();
-            }
-        }
-        Oss oss = CacheUtil.get(RESOURCE_CACHE, OSS_CODE, key, () -> {
-            Oss o = ossService.getOne(lqw);
-            // 若为空则调用默认配置
-            if ((Func.isEmpty(o))) {
-                Oss defaultOss = new Oss();
-                defaultOss.setId(0L);
-                defaultOss.setCategory(OssEnum.of(ossProperties.getName()).getCategory());
-                defaultOss.setEndpoint(ossProperties.getEndpoint());
-                defaultOss.setBucketName(ossProperties.getBucketName());
-                defaultOss.setAccessKey(ossProperties.getAccessKey());
-                defaultOss.setSecretKey(ossProperties.getSecretKey());
-                return defaultOss;
-            } else {
-                return o;
-            }
-        });
-        if (oss == null || oss.getId() == null) {
-            throw new ServiceException("未获取到对应的对象存储配置");
-        } else {
-            return oss;
-        }
-    }
+	/**
+	 * 获取对象存储实体
+	 *
+	 * @param tenantId 租户ID
+	 * @return Oss
+	 */
+	public Oss getOss(String tenantId, String code) {
+		String key = tenantId;
+		LambdaQueryWrapper<Oss> lqw = Wrappers.<Oss>query().lambda().eq(Oss::getTenantId, key);
+		// 获取传参的资源编号并查询，若有则返回，若没有则调启用的配置
+		String ossCode = StringUtil.isBlank(code) ? WebUtil.getParameter(OSS_PARAM_KEY) : code;
+		if (StringUtil.isNotBlank(ossCode)) {
+			key = key.concat(StringPool.DASH).concat(ossCode);
+			lqw.eq(Oss::getOssCode, ossCode);
+		} else {
+			lqw.eq(Oss::getStatus, OssStatusEnum.ENABLE.getNum());
+		}
+		Oss oss = CacheUtil.get(RESOURCE_CACHE, OSS_CODE, key, () -> {
+			Oss o = ossService.getOne(lqw);
+			// 若为空则调用默认配置
+			if (o == null || o.getId() == null) {
+				Oss defaultOss = new Oss();
+				defaultOss.setId(0L);
+				defaultOss.setCategory(OssEnum.of(ossProperties.getName()).getCategory());
+				defaultOss.setEndpoint(ossProperties.getEndpoint());
+				defaultOss.setBucketName(ossProperties.getBucketName());
+				defaultOss.setAccessKey(ossProperties.getAccessKey());
+				defaultOss.setSecretKey(ossProperties.getSecretKey());
+				return defaultOss;
+			} else {
+				return o;
+			}
+		});
+		if (oss == null || oss.getId() == null) {
+			throw new ServiceException("未获取到对应的对象存储配置");
+		} else {
+			return oss;
+		}
+	}
 
 
 }

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

@@ -241,6 +241,16 @@ public class AliossTemplateRe implements OssTemplateRe {
         }
     }
 
+    @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());
     }

blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java

@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Chill
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AllArgsConstructor
 public class BladeOssConfiguration {
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/NewIOSSClientImpl.java

@@ -100,7 +100,7 @@ public class NewIOSSClientImpl implements NewIOSSClient {
         try {
             //获取文件流
             InputStream inputStream = new FileInputStream(new File(localFileUrl));
-            return this.ossBuilder.template().putFileWithPath(fileName,filePath, projectId,inputStream);
+            return this.ossBuilder.template().putFile(fileName, inputStream);//this.ossBuilder.template().putFileWithPath(fileName,filePath, projectId,inputStream);
         } catch (Exception e) {
             e.printStackTrace();
         }

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/30 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
     public void SignInfo() {
         //执行代码
 
@@ -72,8 +72,8 @@ public class EVController {
                 "GROUP_CONCAT(create_user) as userId," +
                 "GROUP_CONCAT(nick_name) as nickName," +
                 "sign_type as sigType" +
-                " from u_task_batch where is_deleted=0 and JSON_UNQUOTE(JSON_EXTRACT(json_data,'$.taskId')) in(SELECT id from u_task where project_id =1792760669353865218 and is_deleted =0 and approval_type=1 ) GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type ASC ";
-
+                " from u_task_batch where is_deleted=0 GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type ASC ";
+                //and JSON_UNQUOTE(JSON_EXTRACT(json_data,'$.taskId')) in(SELECT id from u_task where project_id =1792760669353865218 and is_deleted =0 and approval_type=1 )
         List<TaskSignInfoVO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TaskSignInfoVO.class));
 
         if (query != null && query.size() >= 1) {

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

@@ -73,7 +73,7 @@ public class EVisaController4 {
     private final NewIOSSClient newIOSSClient;
 
     // 电签主类
-    @Scheduled(cron = "0/10 * * * * ?")
+   // @Scheduled(cron = "0/10 * * * * ?")
     public void SignInfo() {
         //执行代码
         log.info("扫描开始");

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

@@ -647,6 +647,7 @@ public class EVDataServiceImpl implements EVDataService {
                     System.out.println("pdf上传=" + bladeFile.getLink());
                     return "sucess@@@@" + bladeFile.getLink();
                 } else {
+                    System.out.println("-----上传oss 失败-----");
                     return "电签成功";
                 }
             }

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

@@ -5526,7 +5526,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
     public Map<String, String> getWtpParent(String meterType, String projectId) {
-        Map<String, Object> map = this.jdbcTemplate.queryForMap("select id,wbs_id wbsId,CONCAT(ancestors,',',id) path from  m_wbs_tree_private a  where a.node_name=? and a.project_id=?", meterType, projectId);
+        Map<String, Object> map = this.jdbcTemplate.queryForMap("select id,wbs_id wbsId,CONCAT(ancestors,',',p_key_id) path from  m_wbs_tree_private a  where a.node_name=? and a.project_id=?", meterType, projectId);
         Map<String, String> result = new HashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             result.put(entry.getKey(), StringUtils.handleNull(entry.getValue()));

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

@@ -6,29 +6,19 @@ import com.spire.xls.FileFormat;
 import com.spire.xls.Workbook;
 import com.spire.xls.Worksheet;
 import com.spire.xls.core.spreadsheet.HTMLOptions;
-import com.sun.javafx.tk.FontMetrics;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
-import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.IoUtil;
-import org.apache.poi.ss.util.CellUtil;
-
-import javax.swing.*;
-import java.awt.*;
 import java.io.*;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class ExcelInfoUtils2 {

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

@@ -10,8 +10,6 @@ import com.spire.xls.CellRange;
 import com.spire.xls.FileFormat;
 import com.spire.xls.Worksheet;
 import com.spire.xls.core.spreadsheet.HTMLOptions;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import org.apache.commons.lang.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.poi.hssf.usermodel.HSSFPrintSetup;
@@ -274,7 +272,7 @@ public class FileUtils {
      *
      * @param imgUrl
      */
-    public static void CompressImage(String imgUrl, InputStream img) {
+/*    public static void CompressImage(String imgUrl, InputStream img) {
         try {
             //图片所在路径
             BufferedImage templateImage = ImageIO.read(img);
@@ -302,7 +300,7 @@ public class FileUtils {
         } catch (IOException e) {
             e.printStackTrace();
         }
-    }
+    }*/
 
     /**
      * 根据宽度和高度改变图片尺寸

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

@@ -2,12 +2,7 @@ package org.springblade.manager.utils;
 
 import sun.font.FontDesignMetrics;
 
-import java.io.FileInputStream;
-
-
-import javax.swing.*;
 import java.awt.*;
-import java.io.File;
 /**
  * @Project my
  * @PackageName com.my.test.codeTest.test.图片组合

blade-service/blade-meter/src/main/java/org/springblade/meter/utils/MeMsgUtils.java

@@ -24,6 +24,7 @@ public class MeMsgUtils {
         HttpClient httpClient = HttpClientBuilder.create().build();
 
         String url = "http://152.168.2.16:7030/tz_server/sms/sendSmsContent";
+      //  String url = "http://183.247.216.148:7030/tz_server/sms/sendSmsContent";
 
         HttpPost httpPost = new HttpPost(url);
 

blade-service/blade-meter/src/main/java/org/springblade/meter/utils/PdfAddimgUtil.java

@@ -67,6 +67,7 @@ public class PdfAddimgUtil {
                     pyzby = Func.toFloat(textdictInfo.get(0).get("pyzby"));
                     signImg = textdictInfo.get(0).get("signature_file_url")+"";
                 }
+                System.out.println("任务电器:"+i);
                 gaizhang(pdfFile, new File(pdfUrl), (int) position[0], position[1], position[2], signImg,pyzbx,pyzby,type);
             }
         }

blade-service/blade-user/src/main/java/org/springblade/system/user/util/RsaUtilToken.java

@@ -1,13 +1,11 @@
 package org.springblade.system.user.util;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
 import javax.crypto.Cipher;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
 
 public final class RsaUtilToken {
 
@@ -60,7 +58,7 @@ public final class RsaUtilToken {
      */
     private static String encryptBASE64(byte[] key) {
         try {
-            return (new BASE64Encoder()).encodeBuffer(key);
+            return Base64.getEncoder().encodeToString(key);
         } catch (Exception ex) {
             throw new RuntimeException("编码返回字符串失败");
         }
@@ -71,7 +69,7 @@ public final class RsaUtilToken {
      */
     private static byte[] decryptBASE64(String key) {
         try {
-            return (new BASE64Decoder()).decodeBuffer(key);
+            return Base64.getDecoder().decode(key);
         } catch (Exception ex) {
             throw new RuntimeException("解码返回byte失败");
         }