Merge branch 'fix/ds' into 'develop'

修复dumpStore的错误,没有去dump StorageObject

See merge request o2oa/o2oa!716

o2server/service_windows.bat

@@ -1,13 +1,13 @@
 @echo off
 if not "%1" == "install" ( if not "%1" == "uninstall"  ( if not "%1" == "start" ( if not "%1" == "stop" (
-echo     使用: service_windows.bat install ^| uninstall ^| start ^| stop
-echo     依赖于 Microsoft.NET Framework 4
+echo     service_windows.bat install ^| uninstall ^| start ^| stop
+echo     depends on Microsoft.NET Framework 4
 goto out
 ))))
 echo ^<configuration^> > %~dp0local\service.xml
 echo ^<id^>O2SERVER^<^/id^> >> %~dp0local\service.xml
 echo ^<name^>O2SERVER SERVICE^<^/name^> >> %~dp0local\service.xml
-echo ^<description^>O2OA平台服务.^<^/description^> >> %~dp0local\service.xml
+echo ^<description^>O2OA Platform Service.^<^/description^> >> %~dp0local\service.xml
 echo ^<executable^>%~dp0start_windows.bat^</executable^> >> %~dp0local\service.xml
 echo ^<log mode="none"^/^> >> %~dp0local\service.xml
 echo ^</configuration^> >> %~dp0local\service.xml

o2server/x_console/src/main/java/com/x/server/console/action/DumpStorage.java

@@ -243,10 +243,10 @@ public class DumpStorage {
 	private List<String> entities() throws Exception {
 		List<String> list = new ArrayList<>();
 		if (StringUtils.equals(Config.dumpRestoreData().getMode(), DumpRestoreData.TYPE_FULL)) {
-			list.addAll((List<String>) Config.resource(Config.RESOURCE_CONTAINERENTITYNAMES));
+			list.addAll((List<String>) Config.resource(Config.RESOURCE_STORAGECONTAINERENTITYNAMES));
 			return list;
 		}
-		for (String str : (List<String>) Config.resource(Config.RESOURCE_CONTAINERENTITYNAMES)) {
+		for (String str : (List<String>) Config.resource(Config.RESOURCE_STORAGECONTAINERENTITYNAMES)) {
 			Class<?> cls = Class.forName(str);
 			ContainerEntity containerEntity = cls.getAnnotation(ContainerEntity.class);
 			if (Objects.equals(containerEntity.reference(), Reference.strong)) {