Merge pull request #7448 in DESIGN/design from feature/10.0 to feature/big-screen

* commit 'daa011083217139643bcf5c5934da1a50a387559':
  REPORT-65474 设计器-水印，平台改变水印开关，模板水印变成了模板单独设置 1.新建水印默认不是模板水印，当新建模板水印的时候，进行配置即可。
  REPORT-64811 10.0设计器下载的组件文件无法解压缩

designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

@@ -34,6 +34,7 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     @Override
     protected void populateServerSettings() {
         WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig();
+        watermarkAttr.setValid(true);
         watermarkPane.populate(watermarkAttr);
     }
 
@@ -55,8 +56,9 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
 
     public WatermarkAttr update() {
         WatermarkAttr watermark = watermarkPane.update();
-        if (isUsingServerSettings()) {
-            watermark.setValid(false);
+        if (!isUsingServerSettings()) {
+            watermark.setValid(true);
+            watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
         }
         return watermark;
     }

designer-form/src/main/java/com/fr/design/mainframe/share/util/DownloadUtils.java

@@ -38,8 +38,8 @@ import java.util.Set;
  * created by Harrison on 2020/05/27
  **/
 public class DownloadUtils {
-    private static final String REUSES_URL = CloudCenter.getInstance().acquireUrlByKind("af.reuseInfo") + "file/download";
-    private static final String PACKAGE_REUSES_URL = CloudCenter.getInstance().acquireUrlByKind("af.reuseInfo") + "package/download/";
+    private static final String REUSES_URL = ShareComponentConstants.REU_INFO_PATH + "file/download";
+    private static final String PACKAGE_REUSES_URL = ShareComponentConstants.REU_INFO_PATH + "package/download/";
     private static final String CERTIFICATE_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtsz62CPSWXZE/IYZRiAuTSZkw\n" +
             "1WOwer8+JFktK0uKLAUuQoBr+UjAMFtRA8W7JgKMDwZy/2liEAiXEOSPU/hrdV8D\n" +
             "tT541LnGi1X/hXiRwuttPWYN3L2GYm/d5blU+FBNwghBIrdAxXTzYBc6P4KL/oYX\n" +