修改erm默认字体大小，适应多操作系统

common/src/main/java/com/jeesite/common/mapper/JsonMapper.java

@@ -131,14 +131,14 @@ public class JsonMapper extends ObjectMapper {
 	 */
 	public JsonMapper enabledXssFilter(){
 		this.registerModule(new SimpleModule().addDeserializer(String.class, new JsonDeserializer<String>() {
-				@Override
+			@Override
-				public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+			public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-					String text = p.getText();
+				String text = p.getText();
-					if (text != null) {
+				if (text != null) {
-						return EncodeUtils.xssFilter(text);
+					return EncodeUtils.xssFilter(text);
-					}
-					return null;
 				}
+				return null;
+			}
 		}));
 		return this;
 	}

modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml

@@ -30,8 +30,8 @@
 		<g>255</g>
 		<b>255</b>
 	</color>
-	<font_name>Segoe UI</font_name>
+	<font_name>Arial</font_name>
-	<font_size>9</font_size>
+	<font_size>14</font_size>
 	<settings>
 		<database>StandardSQL</database>
 		<capital>false</capital>
@@ -48,7 +48,7 @@
 		<suspend_validator>false</suspend_validator>
 		<export_setting>
 			<export_ddl_setting>
-				<output_path>db${'\\'}${moduleCode}.sql</output_path>
+				<output_path>db/${moduleCode}.sql</output_path>
 				<encoding>UTF-8</encoding>
 				<line_feed>CR+LF</line_feed>
 				<is_open_after_saved>false</is_open_after_saved>
@@ -80,7 +80,7 @@
 			</export_ddl_setting>
 			<export_excel_setting>
 				<category_id>null</category_id>
-				<output_path>db${'\\'}${moduleCode}.xls</output_path>
+				<output_path>db/${moduleCode}.xls</output_path>
 				<template></template>
 				<template_path></template_path>
 				<used_default_template_lang>en</used_default_template_lang>
@@ -96,7 +96,7 @@
 				<is_open_after_saved>true</is_open_after_saved>
 			</export_html_setting>
 			<export_image_setting>
-				<output_file_path>db${'\\'}${moduleCode}.png</output_file_path>
+				<output_file_path>db/${moduleCode}.png</output_file_path>
 				<category_dir_path></category_dir_path>
 				<with_category_image>true</with_category_image>
 				<is_open_after_saved>true</is_open_after_saved>
@@ -129,8 +129,8 @@
 			<id></id>
 			<height>-1</height>
 			<width>-1</width>
-				<font_name>Microsoft YaHei UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>50</x>
 			<y>50</y>
 			<color>
@@ -1046,8 +1046,8 @@
 			<id>e553474c37270813e70025e433a4cf8a64653e13</id>
 			<height>438</height>
 			<width>387</width>
-				<font_name>Segoe UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>864</x>
 			<y>36</y>
 			<color>
@@ -1145,8 +1145,8 @@
 			<id>5435ef11ea53f170fe3491b199c113e47932e175</id>
 			<height>401</height>
 			<width>320</width>
-				<font_name>Segoe UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>36</x>
 			<y>36</y>
 			<color>
@@ -1606,8 +1606,8 @@
 			<id>5a836e654b7b7d19f102e87336fefa079d98a2e6</id>
 			<height>438</height>
 			<width>346</width>
-				<font_name>Segoe UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>468</x>
 			<y>36</y>
 			<color>

modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml

@@ -30,8 +30,8 @@
 		<g>255</g>
 		<b>255</b>
 	</color>
-	<font_name>Segoe UI</font_name>
+	<font_name>Arial</font_name>
-	<font_size>9</font_size>
+	<font_size>14</font_size>
 	<settings>
 		<database>StandardSQL</database>
 		<capital>false</capital>
@@ -48,7 +48,7 @@
 		<suspend_validator>false</suspend_validator>
 		<export_setting>
 			<export_ddl_setting>
-				<output_path>db${'\\'}${moduleCode}.sql</output_path>
+				<output_path>db/${moduleCode}.sql</output_path>
 				<encoding>UTF-8</encoding>
 				<line_feed>CR+LF</line_feed>
 				<is_open_after_saved>false</is_open_after_saved>
@@ -80,7 +80,7 @@
 			</export_ddl_setting>
 			<export_excel_setting>
 				<category_id>null</category_id>
-				<output_path>db${'\\'}${moduleCode}.xls</output_path>
+				<output_path>db/${moduleCode}.xls</output_path>
 				<template></template>
 				<template_path></template_path>
 				<used_default_template_lang>en</used_default_template_lang>
@@ -96,7 +96,7 @@
 				<is_open_after_saved>true</is_open_after_saved>
 			</export_html_setting>
 			<export_image_setting>
-				<output_file_path>db${'\\'}${moduleCode}.png</output_file_path>
+				<output_file_path>db/${moduleCode}.png</output_file_path>
 				<category_dir_path></category_dir_path>
 				<with_category_image>true</with_category_image>
 				<is_open_after_saved>true</is_open_after_saved>
@@ -129,8 +129,8 @@
 			<id></id>
 			<height>-1</height>
 			<width>-1</width>
-				<font_name>Microsoft YaHei UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>50</x>
 			<y>50</y>
 			<color>
@@ -1046,8 +1046,8 @@
 			<id>e553474c37270813e70025e433a4cf8a64653e13</id>
 			<height>438</height>
 			<width>387</width>
-				<font_name>Segoe UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>864</x>
 			<y>36</y>
 			<color>
@@ -1145,8 +1145,8 @@
 			<id>5435ef11ea53f170fe3491b199c113e47932e175</id>
 			<height>401</height>
 			<width>320</width>
-				<font_name>Segoe UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>36</x>
 			<y>36</y>
 			<color>
@@ -1606,8 +1606,8 @@
 			<id>5a836e654b7b7d19f102e87336fefa079d98a2e6</id>
 			<height>438</height>
 			<width>346</width>
-				<font_name>Segoe UI</font_name>
+				<font_name>Arial</font_name>
-				<font_size>9</font_size>
+				<font_size>14</font_size>
 			<x>468</x>
 			<y>36</y>
 			<color>