Merge branch 'fix/properties对象中的泛型都要显示申明' into 'wrdp'

[门户][内容管理]properties对象中的泛型都要显示申明

See merge request o2oa/o2oa!2933

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/BaseAction.java

@@ -15,7 +15,8 @@ import java.util.Map;
 
 public class BaseAction extends StandardJaxrsAction {
 
-	protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Form.class, View.class, ViewFieldConfig.class, ViewCategory.class);
+	protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Form.class, View.class, ViewFieldConfig.class, ViewCategory.class,
+			Script.class, com.x.processplatform.core.entity.element.Script.class, com.x.portal.core.entity.Script.class);
 
 	protected LogService logService = new LogService();
 

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/FormProperties.java

@@ -11,31 +11,31 @@ import java.util.Map;
 public class FormProperties extends JsonProperties {
 
 	@FieldDescribe("关联表单.")
-	private List<String> relatedFormList = new ArrayList<>();
+	private List<String> relatedFormList = new ArrayList<String>();
 
 	@FieldDescribe("移动端关联表单.")
-	private List<String> mobileRelatedFormList = new ArrayList<>();
+	private List<String> mobileRelatedFormList = new ArrayList<String>();
 
 	@FieldDescribe("关联脚本.")
-	private Map<String, String> relatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> relatedScriptMap = new LinkedHashMap<String, String>();
 
 	@FieldDescribe("移动端关联脚本.")
-	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<String, String>();
 
 	public List<String> getRelatedFormList() {
-		return this.relatedFormList == null ? new ArrayList<>() : this.relatedFormList;
+		return this.relatedFormList == null ? new ArrayList<String>() : this.relatedFormList;
 	}
 
 	public List<String> getMobileRelatedFormList() {
-		return this.mobileRelatedFormList == null ? new ArrayList<>() : this.mobileRelatedFormList;
+		return this.mobileRelatedFormList == null ? new ArrayList<String>() : this.mobileRelatedFormList;
 	}
 
 	public Map<String, String> getRelatedScriptMap() {
-		return this.relatedScriptMap == null ? new LinkedHashMap<>() : this.relatedScriptMap;
+		return this.relatedScriptMap == null ? new LinkedHashMap<String, String>() : this.relatedScriptMap;
 	}
 
 	public Map<String, String> getMobileRelatedScriptMap() {
-		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<>() : this.mobileRelatedScriptMap;
+		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<String, String>() : this.mobileRelatedScriptMap;
 	}
 
 	public void setRelatedFormList(List<String> relatedFormList) {

o2server/x_portal_core_entity/src/main/java/com/x/portal/core/entity/PageProperties.java

@@ -11,31 +11,31 @@ import java.util.Map;
 public class PageProperties extends JsonProperties {
 
 	@FieldDescribe("关联Widget.")
-	private List<String> relatedWidgetList = new ArrayList<>();
+	private List<String> relatedWidgetList = new ArrayList<String>();
 
 	@FieldDescribe("移动端关联Widget.")
-	private List<String> mobileRelatedWidgetList = new ArrayList<>();
+	private List<String> mobileRelatedWidgetList = new ArrayList<String>();
 
 	@FieldDescribe("关联脚本.")
-	private Map<String, String> relatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> relatedScriptMap = new LinkedHashMap<String, String>();
 
 	@FieldDescribe("移动端关联脚本.")
-	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<String, String>();
 
 	public List<String> getRelatedWidgetList() {
-		return this.relatedWidgetList == null ? new ArrayList<>() : this.relatedWidgetList;
+		return this.relatedWidgetList == null ? new ArrayList<String>() : this.relatedWidgetList;
 	}
 
 	public List<String> getMobileRelatedWidgetList() {
-		return this.mobileRelatedWidgetList == null ? new ArrayList<>() : this.mobileRelatedWidgetList;
+		return this.mobileRelatedWidgetList == null ? new ArrayList<String>() : this.mobileRelatedWidgetList;
 	}
 
 	public Map<String, String> getRelatedScriptMap() {
-		return this.relatedScriptMap == null ? new LinkedHashMap<>() : this.relatedScriptMap;
+		return this.relatedScriptMap == null ? new LinkedHashMap<String, String>() : this.relatedScriptMap;
 	}
 
 	public Map<String, String> getMobileRelatedScriptMap() {
-		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<>() : this.mobileRelatedScriptMap;
+		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<String, String>() : this.mobileRelatedScriptMap;
 	}
 
 	public void setRelatedWidgetList(List<String> relatedWidgetList) {