gridjs-spreadsheet 24.12.0 → 25.1.0

package/example/src/main/java/com/aspose/gridjs/demo/controller/GridJs2Controller.java

@@ -0,0 +1,558 @@
+package com.aspose.gridjs.demo.controller;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.zip.GZIPOutputStream;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
+
+import com.aspose.cells.LoadFormat;
+import com.aspose.cells.Workbook;
+import com.aspose.gridjs.Config;
+import com.aspose.gridjs.GridCellException;
+import com.aspose.gridjs.GridInterruptMonitor;
+import com.aspose.gridjs.GridJsWorkbook;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+
+@RestController
+@RequestMapping({"/GridJs2"})
+public class GridJs2Controller {
+     @Value("${testconfig.ListDir}")
+    private String listDir;//="D:\\codebase\\customerissue\\wb\\tempfromdownload\\";
+
+    
+ 
+    @GetMapping("/DetailFileJsonWithUid")
+    public ResponseEntity<String> detailFileJsonWithUid(@RequestParam String filename, @RequestParam String uid) {
+        try {
+           
+        	Path filePath = Paths.get(listDir, filename);
+            GridJsWorkbook wbj = new GridJsWorkbook();
+
+            // Check if already in cache
+            StringBuilder sb = wbj.getJsonByUid(uid, filename);
+            if (sb == null) {
+                Workbook wb = new Workbook(filePath.toString());
+                wbj.importExcelFile(uid, wb);
+                sb = wbj.exportToJsonStringBuilder(filename);
+            }
+
+            // Return the content as plain text with UTF-8 encoding
+            return ResponseEntity.ok()
+                    .header("Content-Type", "text/plain; charset=UTF-8")
+                    .body(sb.toString());
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body("Error processing the file: " + e.getMessage());
+        }
+    }
+    
+    @GetMapping("/DetailStreamJsonWithUid")
+    public void detailStreamJsonWithUid(@RequestParam String filename, @RequestParam String uid,HttpServletResponse response) {
+       
+           
+        	Path filePath = Paths.get(listDir, filename);
+            GridJsWorkbook wbj = new GridJsWorkbook();
+
+            response.setContentType("application/json");
+            response.setHeader("Content-Encoding", "gzip");
+            try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(response.getOutputStream())) {
+            	boolean  isdone= wbj.jsonToStreamByUid(gzipOutputStream,uid, filename);
+				if (!isdone) {
+					Workbook wb = new Workbook(filePath.toString());
+					wbj.importExcelFile(uid,wb);
+					wbj.jsonToStream(gzipOutputStream, filename);
+				}
+            } catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+    }
+    
+    
+    @Value("${testconfig.UploadPath}")
+    private String uploadDir;
+    
+    @GetMapping("/DetailStreamJsonWithUidFromUpload")
+    public void detailStreamJsonWithUidFromUpload(@RequestParam String filename, @RequestParam String uid,HttpServletResponse response) {
+       
+           
+        	Path filePath = Paths.get(uploadDir, filename);
+            GridJsWorkbook wbj = new GridJsWorkbook();
+
+            response.setContentType("application/json");
+            response.setHeader("Content-Encoding", "gzip");
+            try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(response.getOutputStream())) {
+            	boolean  isdone= wbj.jsonToStreamByUid(gzipOutputStream,uid, filename);
+				if (!isdone) {
+					Workbook wb = new Workbook(filePath.toString());
+					wbj.importExcelFile(uid,wb);
+					wbj.jsonToStream(gzipOutputStream, filename);
+				}
+            } catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+    }
+    
+    @PostMapping("/LazyLoading")
+    public void lazyLoadingStreamJson(
+            @RequestParam(value = "name", required = false) String sheetName,
+            @RequestParam(value = "uid", required = false) String uid,
+            HttpServletResponse response) throws IOException {
+
+        GridJsWorkbook wbj = new GridJsWorkbook();
+
+        // 设置响应头
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+        response.setHeader(HttpHeaders.CONTENT_ENCODING, "gzip");
+
+        try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(response.getOutputStream())) {
+            try {
+				wbj.lazyLoadingStream(gzipOutputStream, uid, sheetName);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+        }
+    }
+    
+    @PostMapping("/UpdateCell")
+    public ResponseEntity<String> updateCell(HttpServletRequest request) {
+        String p = request.getParameter("p");
+        String uid = request.getParameter("uid");
+        GridJsWorkbook gwb = new GridJsWorkbook();
+        String ret;
+		try {
+			ret = gwb.updateCell(p, uid);
+			return new ResponseEntity<>(ret, HttpStatus.OK);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.OK);
+		}
+
+    }
+    
+	@PostMapping("/AddImage_FAIL")
+	public ResponseEntity<String> addImageFail(HttpServletRequest request) {
+		String uid = request.getParameter("uid");
+		String p = request.getParameter("p");
+		String isControl = request.getParameter("control");
+		String ret = null;
+		GridJsWorkbook gwb = new GridJsWorkbook();
+		try {
+			if (isControl == null) {
+				Part filePart = request.getPart("image"); // Retrieves <input type="file" name="file">
+				if (filePart == null || filePart.getSize() == 0) {
+					// for add shape,need to set p.type as one of AutoShapeType
+					ret = gwb.insertImage(uid, p, null, null);
+
+				} else {
+					try (InputStream inputStream = filePart.getInputStream()) {
+						ret = gwb.insertImage(uid, p, inputStream, null);
+					} catch (IOException e) {
+						return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.BAD_REQUEST);
+					}
+				}
+			} else {
+				ret = gwb.insertImage(uid, p, null, null);
+			}
+			return new ResponseEntity<>(ret, HttpStatus.OK);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.OK);
+		}
+	}
+	
+	@PostMapping("/AddImage")
+	public ResponseEntity<String> handleFileUpload(@RequestParam(value = "image", required = false) MultipartFile file,
+			@RequestParam("uid") String uid, 
+			@RequestParam("p") String p,
+			@RequestParam(value = "control", required = false) String isControl) {
+		String ret = null;
+		GridJsWorkbook gwb = new GridJsWorkbook();
+		try {
+			if (isControl == null) {
+				if (file != null && !file.isEmpty()) {
+					try (InputStream inputStream = file.getInputStream()) {
+//						Files.copy(inputStream,  Paths.get("D:\\tmpdel\\tmp\\gridjsjava\\upload\\123.png"));
+						ret = gwb.insertImage(uid, p, inputStream, null);
+						
+					} catch (IOException e) {
+						return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.BAD_REQUEST);
+					}
+					
+
+				} else {
+					// for add shape,need to set p.type as one of AutoShapeType
+					ret = gwb.insertImage(uid, p, null, null);
+
+				}
+			} else {
+				ret = gwb.insertImage(uid, p, null, null);
+			}
+
+			return new ResponseEntity<>(ret, HttpStatus.OK);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.internalServerError().body("Error occurred while uploading file");
+		}
+	}
+
+    @PostMapping("/CopyImage")
+    public ResponseEntity<String> copyImage(HttpServletRequest request) {
+        String uid = request.getParameter("uid");
+        String p = request.getParameter("p");
+        GridJsWorkbook gwb = new GridJsWorkbook();
+        try {
+        String ret = gwb.copyImageOrShape(uid, p);
+
+        return new ResponseEntity<>(ret, HttpStatus.OK);
+        } catch (Exception e) {
+			// TODO Auto-generated catch block
+			return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.OK);
+		}
+    }
+
+    private static InputStream getStreamFromUrl(String url) throws IOException {
+        URL imageUrl = new URL(url);
+        URLConnection connection = imageUrl.openConnection();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int bytesRead;
+        try (InputStream in = connection.getInputStream()) {
+            while ((bytesRead = in.read(buffer)) != -1) {
+                baos.write(buffer, 0, bytesRead);
+            }
+        }
+        return new ByteArrayInputStream(baos.toByteArray());
+    }
+
+    @PostMapping("/AddImageByURL")
+    public ResponseEntity<String> addImageByUrl(HttpServletRequest request) {
+        String uid = request.getParameter("uid");
+        String p = request.getParameter("p");
+        String imageUrl = request.getParameter("imageurl");
+        String ret = null;
+        GridJsWorkbook gwb = new GridJsWorkbook();
+        try {
+        if (imageUrl != null) {
+            try (InputStream stream = getStreamFromUrl(imageUrl)) {
+                ret = gwb.insertImage(uid, p, stream, imageUrl);
+            } catch (IOException e) {
+                return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.BAD_REQUEST);
+            }
+        } else {
+            return new ResponseEntity<>(gwb.errorJson("image url is null"), HttpStatus.BAD_REQUEST);
+        }
+
+        return new ResponseEntity<>(ret, HttpStatus.OK);
+        } catch (Exception e) {
+			// TODO Auto-generated catch block
+			return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.OK);
+		}
+    }
+    
+    @GetMapping("/Image")
+    public ResponseEntity<InputStreamResource> getImage(HttpServletRequest request) {
+        String fileId = request.getParameter("id");
+        String uid = request.getParameter("uid");
+        try {
+        InputStream imageStream = GridJsWorkbook.getImageStream(uid, fileId);
+        if (imageStream == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.IMAGE_PNG)
+                .body(new InputStreamResource(imageStream));
+        } catch (Exception e) {
+			 e.printStackTrace();
+        	 return ResponseEntity.notFound().build();
+		}
+    }
+    /*
+    @GetMapping("/ImageTest")
+    public ResponseEntity<InputStreamResource> getImageTest(HttpServletRequest request) {
+        try {
+            // Load the image file from the classpath (resources folder)
+        	  String fileId = request.getParameter("id");
+              String uid = request.getParameter("uid");
+              
+              InputStream imageStream = GridJsWorkbook.getImageStream(uid, fileId);
+              if (imageStream == null) {
+                  return ResponseEntity.notFound().build();
+              }
+
+            // Set the headers for the response
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Type", "image/jpeg");
+
+            // Return the InputStreamResource with the headers
+            return ResponseEntity
+                    .ok()
+                    .headers(headers)
+                    .body(new InputStreamResource(imageStream));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+    
+    @GetMapping("/PImage")
+    public ResponseEntity<InputStreamResource> getPImage(HttpServletRequest request) {
+        String fileId = request.getParameter("id");
+        String uid = request.getParameter("uid");
+        try {
+        InputStream imageStream = GridJsWorkbook.getImageStream(uid, fileId);
+        if (imageStream == null) {
+            return ResponseEntity.notFound().build();
+        }
+        InputStreamResource resource = new InputStreamResource(imageStream);
+        MediaType mediaType = MediaType.IMAGE_PNG; 
+        return ResponseEntity.ok()
+                .contentType(mediaType)
+                .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + fileId + "\"")
+                .body(resource);
+        } catch (Exception e) {
+			 e.printStackTrace();
+        	 return ResponseEntity.notFound().build();
+		}
+    }
+    
+    @GetMapping("/pimages/{imageName}")
+    public ResponseEntity<InputStreamResource> getImage(@PathVariable("imageName") String imageName) {
+        try {
+            // Read the image file
+            FileInputStream fis = new FileInputStream("C:\\Users\\peter\\Pictures\\test\\" + imageName);
+            InputStreamResource resource = new InputStreamResource(fis);
+
+            // Set the content type based on the image type (JPEG, PNG, etc.)
+            MediaType mediaType = MediaType.IMAGE_JPEG; // Change this based on your image type
+
+            // Create the response entity with the appropriate headers
+            return ResponseEntity.ok()
+                    .contentType(mediaType)
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + imageName + "\"")
+                    .body(resource);
+        } catch (IOException e) {
+            // Handle the exception, e.g., log it
+            e.printStackTrace();
+            return ResponseEntity.notFound().build();
+        }
+    }
+    */
+    
+    @GetMapping("/Ole")
+    public ResponseEntity<?> getOle(HttpServletRequest request) {
+        int oleId = Integer.parseInt(request.getParameter("id"));
+        String uid = request.getParameter("uid");
+        String sheet = request.getParameter("sheet");
+
+        GridJsWorkbook gwb = new GridJsWorkbook();
+        String[] filename = new String[1];
+        try {
+        byte[] fileByte = gwb.getOle(uid, sheet, oleId, filename);
+      
+        if (filename != null) {
+            return ResponseEntity.ok()
+                    .contentType( (getMimeType(filename[0])))
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename[0] + "\"")
+                    .body(fileByte);
+        } else {
+            return ResponseEntity.notFound().build();
+        }
+        } catch (Exception e) {
+			// TODO Auto-generated catch block
+			return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.OK);
+		}
+    }
+    
+    
+    @GetMapping("/ImageUrl")
+    public ResponseEntity<String> getImageUrl(@RequestParam String id, @RequestParam String uid) {
+        if (GridJsWorkbook.CacheImp != null) {
+            return ResponseEntity.ok(GridJsWorkbook.getImageUrl(uid, id, "."));
+        } else {
+            String file = uid + "." + id;
+            return ResponseEntity.ok("/GridJs2/GetZipFile?f=" + file);
+        }
+    }
+
+    @GetMapping("/GetZipFile")
+    public ResponseEntity<StreamingResponseBody> getZipFile(@RequestParam String f) {
+        Path filePath = Paths.get(Config.getFileCacheDirectory(), f);
+
+        if (!Files.exists(filePath)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        StreamingResponseBody responseBody = outputStream -> {
+            try (InputStream inputStream = Files.newInputStream(filePath)) {
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+            }
+        };
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + f + "\"")
+                .body(responseBody);
+    }
+    
+    public static MediaType getMimeType(String fileName) {
+        Path filePath = Paths.get(fileName);
+        try {
+            // Probe the content type of the file
+            String mimeType = Files.probeContentType(filePath);
+            
+            // If the MIME type couldn't be determined, default to binary
+            if (mimeType == null) {
+                mimeType = "application/octet-stream";
+            }
+
+            // Parse and return the MediaType
+            return MediaType.parseMediaType(mimeType);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            // Return a default MediaType in case of an error
+            return MediaType.APPLICATION_OCTET_STREAM;
+        }
+    }
+    
+    @GetMapping("/GetFile")
+    public ResponseEntity<byte[]> getFile(@RequestParam("id") String fileid,@RequestParam("filename") String filename) throws IOException {
+       
+        MediaType mimeType = getMimeType(filename);
+       
+//        try {
+//            TimeUnit.SECONDS.sleep(3); // simulate network lag
+//        } catch (InterruptedException e) {
+//            Thread.currentThread().interrupt();
+//        }
+        Path filePath = Paths.get(Config.getFileCacheDirectory(), fileid.replace('/', '.')+"."+filename);
+        byte[] bytes = Files.readAllBytes(filePath);
+        return ResponseEntity.ok()
+                .contentType(mimeType)
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename)
+                .body(bytes);
+    }
+    
+    
+    //this is for the way that implment GridCacheForStream
+    @GetMapping("/GetFileUseCacheStream")
+    public ResponseEntity<InputStreamResource>  getFileUseCacheStream(@RequestParam("id") String fileid) throws IOException {
+ 
+    	MediaType mimeType = getMimeType(fileid);
+    	String name =   fileid.replace('/', '.');
+ 
+    	
+    	 InputStream inputStream = GridJsWorkbook.CacheImp.loadStream(fileid);
+         if (inputStream == null) {
+             // Handle the case where the file is not found
+             return ResponseEntity.notFound().build();
+         }
+
+         HttpHeaders headers = new HttpHeaders();
+         headers.setContentType(mimeType);
+         headers.setContentDispositionFormData("attachment", name);
+
+         return ResponseEntity.ok()
+                 .headers(headers)
+                 .body(new InputStreamResource(inputStream));
+  
+    }
+    
+    
+    
+    private static void InterruptMonitor(GridInterruptMonitor monitor,int milliseconds)
+    {
+    	 
+        try
+        {
+            Thread.sleep(milliseconds);
+           
+            (monitor).interrupt();
+        }
+        catch (Exception e)
+        {
+            System.out.println("Succeeded for load in give time.");
+        }
+    }
+    
+    @PostMapping("/Download")
+	public ResponseEntity<String> download(HttpServletRequest request) {
+		String p = request.getParameter("p");
+		String uid = request.getParameter("uid");
+		String filename = request.getParameter("file");
+
+		GridJsWorkbook gwb = new GridJsWorkbook();
+		try {
+			gwb.mergeExcelFileFromJson(uid, p);
+
+			GridInterruptMonitor m = new GridInterruptMonitor();
+			gwb.setInterruptMonitorForSave(m);
+
+			ExecutorService executor = Executors.newSingleThreadExecutor();
+			executor.submit(() -> InterruptMonitor(m, 30 * 1000));
+
+			try {
+				gwb.saveToCacheWithFileName(uid, filename, null);
+			} catch (Exception ex) {
+				if (ex instanceof GridCellException) {
+					return ResponseEntity
+							.ok(((GridCellException) ex).getMessage() + ((GridCellException) ex).getCode());
+				}
+			}
+
+			String fileUrl = null;
+			if (GridJsWorkbook.CacheImp != null) {
+				fileUrl = GridJsWorkbook.CacheImp.getFileUrl(uid + "/" + filename);
+			} else {
+				fileUrl = "/GridJs2/GetFile?id=" + uid + "&filename=" + filename;
+			}
+			return ResponseEntity.ok("\""+fileUrl+"\"");
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			return new ResponseEntity<>(gwb.errorJson(e.getMessage()), HttpStatus.OK);
+		}
+	}
+
+ 
+}

package/example/src/main/resources/application.properties

@@ -0,0 +1,17 @@
+spring.application.name=gridjsdemo
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=10MB
+#for local test
+testconfig.ListDir=D:\\codebase\\customerissue\\wb\\tempfromdownload\\
+testconfig.FileName=excelColumnWordBreak.xlsm
+testconfig.CachePath=F:\\storage\\gridjs_temp
+testconfig.UploadPath=F:\\storage\\upload
+testconfig.AsposeLicensePath=F:\\aspose.lic
+#for docker linux
+#testconfig.ListDir=/app/wb
+#testconfig.FileName=controls.xlsx
+#testconfig.CachePath=/app/grid_cache
+#testconfig.UploadPath=/app/upload
+#testconfig.AsposeLicensePath=/app/aspose.lic
+

package/example/src/main/resources/static/xspread/555f60323063f2b68b6eac7ce9c45b19.svg

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{opacity:0.6;}
+	.st5{opacity:0.38;fill:url(#SVGID_5_);enable-background:new    ;}
+	.st6{opacity:0.38;fill:url(#SVGID_6_);enable-background:new    ;}
+	.st7{opacity:0.38;fill:url(#SVGID_7_);enable-background:new    ;}
+	.st8{opacity:0.38;fill:url(#SVGID_8_);enable-background:new    ;}
+</style>
+<g>
+	
+		<radialGradient id="SVGID_1_" cx="519.1851" cy="-127.3083" r="8.2454" gradientTransform="matrix(0 1 -0.9943 0 -113.4659 -506.377)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0.1429" style="stop-color:#D5EFFC"/>
+		<stop  offset="0.8424" style="stop-color:#3C8EC6"/>
+		<stop  offset="1" style="stop-color:#3399CC"/>
+	</radialGradient>
+	<path class="st0" d="M21,13.6c0-0.5,0.5-6.4-4.6-9.1C14.1,3.2,10.9,3.2,9.1,5C6,8.2,8.6,11.5,9.6,11.8c0,0,0,0,0-0.1
+		c-1.6-6.3,9.3-7.4,11.2,1.8C20.9,13.9,21,13.9,21,13.6z"/>
+	
+		<radialGradient id="SVGID_2_" cx="446.2906" cy="702.4343" r="5.9862" gradientTransform="matrix(0.9943 0 0 1 -430.3552 -688)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0.1429" style="stop-color:#FEE588"/>
+		<stop  offset="0.5636" style="stop-color:#F79B30"/>
+		<stop  offset="0.6867" style="stop-color:#F58B2D"/>
+		<stop  offset="0.8883" style="stop-color:#F3752A"/>
+		<stop  offset="1" style="stop-color:#F36C29"/>
+	</radialGradient>
+	<path class="st1" d="M8.5,21.2c0.5,0,6.4,0.5,9.1-4.6c1.3-2.4,1.2-5.6-0.5-7.4c-3.1-3.1-6.4-0.5-6.8,0.5c0,0,0,0,0.1,0
+		c6.2-1.6,7.3,9.3-1.8,11.3C8.3,21,8.3,21.1,8.5,21.2z"/>
+	
+		<radialGradient id="SVGID_3_" cx="-378.6884" cy="623.4329" r="8.246" gradientTransform="matrix(0 -1 0.9943 0 -610.95 -369.3066)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FCB116"/>
+		<stop  offset="0.193" style="stop-color:#FBB318"/>
+		<stop  offset="0.3352" style="stop-color:#F9B91C"/>
+		<stop  offset="0.461" style="stop-color:#F6C323"/>
+		<stop  offset="0.5767" style="stop-color:#F4D12D"/>
+		<stop  offset="0.6727" style="stop-color:#F0E03A"/>
+		<stop  offset="0.7439" style="stop-color:#E5D534"/>
+		<stop  offset="0.8645" style="stop-color:#CFBD24"/>
+		<stop  offset="1" style="stop-color:#B19E11"/>
+	</radialGradient>
+	<path class="st2" d="M1,8.6c0,0.5-0.5,6.4,4.6,9.1C8,19,11.2,18.9,13,17.2c3.1-3.2,0.5-6.5-0.5-6.8c0,0,0,0,0,0.1
+		c1.6,6.3-9.3,7.4-11.2-1.8C1.2,8.3,1.1,8.3,1,8.6z"/>
+	
+		<radialGradient id="SVGID_4_" cx="445.619" cy="696.9989" r="8.2461" gradientTransform="matrix(0.9943 0 0 1 -430.3552 -688)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#A1C43A"/>
+		<stop  offset="0.4545" style="stop-color:#A0CC3A"/>
+		<stop  offset="1" style="stop-color:#3C943A"/>
+	</radialGradient>
+	<path class="st3" d="M13.5,1C13,1,7.1,0.6,4.5,5.7C3.2,8.1,3.2,11.3,5,13c3.1,3.1,6.4,0.5,6.8-0.5c0,0,0,0-0.1,0
+		c-6.2,1.6-7.3-9.3,1.8-11.3C13.8,1.2,13.8,1.1,13.5,1z"/>
+	<g class="st4">
+		
+			<radialGradient id="SVGID_5_" cx="413.168" cy="345.1736" r="9.5277" gradientTransform="matrix(1.0925 0 0 1.6216 -440.2973 -540.7683)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F9E788"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</radialGradient>
+		<path class="st5" d="M11,5.2c-0.9,0-1.7,0.2-2.4,0.5c-2.3,3,0.1,5.9,1,6.2c0,0,0,0,0-0.1C8.7,8,12.4,6,15.8,7.2
+			C14.7,6,12.9,5.2,11,5.2z"/>
+		
+			<radialGradient id="SVGID_6_" cx="413.1686" cy="345.1745" r="9.5274" gradientTransform="matrix(1.0925 0 0 1.6216 -440.2973 -540.7683)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F9E788"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</radialGradient>
+		<path class="st6" d="M10.3,9.7C10.3,9.7,10.3,9.7,10.3,9.7c3.8-0.9,5.7,2.7,4.6,6.1c1.5-1.1,2.4-2.8,2.4-4.7
+			c0-0.7-0.1-1.4-0.4-2.1C13.8,6.1,10.6,8.7,10.3,9.7z"/>
+		
+			<radialGradient id="SVGID_7_" cx="413.1689" cy="345.1732" r="9.526" gradientTransform="matrix(1.0925 0 0 1.6216 -440.2973 -540.7683)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F9E788"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</radialGradient>
+		<path class="st7" d="M12.5,10.4C12.4,10.3,12.4,10.4,12.5,10.4c0.9,3.9-2.7,5.8-6.2,4.6C7.4,16.2,9.1,17,11,17
+			c0.9,0,1.7-0.2,2.4-0.5C15.7,13.6,13.4,10.7,12.5,10.4z"/>
+		
+			<radialGradient id="SVGID_8_" cx="413.168" cy="345.1736" r="9.5275" gradientTransform="matrix(1.0925 0 0 1.6216 -440.2973 -540.7683)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F9E788"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</radialGradient>
+		<path class="st8" d="M11.8,12.5C11.8,12.5,11.8,12.5,11.8,12.5C8,13.5,6.1,9.9,7.2,6.4c-1.5,1.1-2.4,2.8-2.4,4.7
+			c0,0.7,0.1,1.4,0.4,2.1C8.3,16.1,11.4,13.5,11.8,12.5z"/>
+	</g>
+</g>
+</svg>