Merge branch 'feature-recommend2' into 'developer'

加载图片缓存统计

See merge request !2990

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/context/combined/ImageCombined.java

@@ -114,7 +114,7 @@ public class ImageCombined {
     }
 
     public static void main(String[] args) throws Exception{
-        BufferedImage largeImage = loadImageWithCache(LARGE_IMAGE_URL);
+        BufferedImage largeImage = loadImageWithCache(LARGE_IMAGE_URL,"");
         BufferedImage qrCodeImage = ImageIO.read(new URL(QR_CODE_URL));
 
         int showStyle = 0;
@@ -124,6 +124,7 @@ public class ImageCombined {
     }
 
     public static byte[] getCombinedImage(CombinedQDTO combinedQDTO) throws Exception{
+        String enterpriseId = combinedQDTO.getEnterpriseId();
         String imageUrl = combinedQDTO.getImageUrl();
         String qrCodeUrl = combinedQDTO.getQrCodeUrl();
         Integer showStyle = combinedQDTO.getShowStyle();
@@ -136,7 +137,7 @@ public class ImageCombined {
         //压缩图片的参数
         imageUrl = imageUrl + "?imageView2/2/w/1080/h/10800/format/jpg";
         logger.info("加载要合成的图片开始1");
-        BufferedImage largeImage = loadImageWithCache(imageUrl);
+        BufferedImage largeImage = loadImageWithCache(imageUrl,enterpriseId);
         logger.info("加载要合成的图片开始2");
         BufferedImage qrCodeImage = loadImageWithReader(qrCodeUrl);
         logger.info("加载要合成的图片结束");
@@ -182,8 +183,8 @@ public class ImageCombined {
     /**
      * 从缓存中加载图像
      */
-    private static BufferedImage loadImageWithCache(String url) {
-        boolean useCache = ApolloUtils.combinedCache();
+    private static BufferedImage loadImageWithCache(String url,String enterpriseId) {
+        boolean useCache = ApolloUtils.combinedCache(enterpriseId);
         if (!useCache) {
             logger.info("非缓存加载图片:{}", url);
             return loadImageWithReader(url);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/ApolloUtils.java

@@ -69,13 +69,17 @@ public class ApolloUtils {
         return Integer.parseInt(combinedFontsType);
     }
 
-    public static boolean combinedCache() {
+    public static boolean combinedCache(String enterpriseId) {
         Config config = ConfigService.getAppConfig();
         String combinedCache = config.getProperty("combinedCache", "");
         if (StringUtils.isBlank(combinedCache)) {
             return false;
         }
-        return true;
+        String combinedCacheEid = config.getProperty("combinedCacheEid", "");
+        if (StringUtils.isBlank(combinedCacheEid)) {
+            return true;
+        }
+        return combinedCacheEid.contains(enterpriseId);
     }
 
     /**