From aaebcadee036ee15ee10591be989e66a4b0ee40b Mon Sep 17 00:00:00 2001
From: zhourui <zhourui@o2oa.net>
Date: Mon, 29 Mar 2021 18:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84storageType?=
 =?UTF-8?q?:custom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2server/pom.xml                              | 33 ++++++++++++++++++-
 .../com/x/base/core/entity/StorageType.java   |  4 ++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/o2server/pom.xml b/o2server/pom.xml
index d6bc030578..fa12d06df6 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -398,6 +398,37 @@
 						</compilerArgs>
 					</configuration>
 				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.6.0,)
+										</versionRange>
+										<goals>
+											<goal>java</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -1033,7 +1064,7 @@
 			<dependency>
 				<groupId>com.microsoft.playwright</groupId>
 				<artifactId>playwright</artifactId>
-				<version>1.9.1-alpha-0</version>
+				<version>1.10.0</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageType.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageType.java
index aaecec8bb6..61d937f448 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageType.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageType.java
@@ -1,6 +1,8 @@
 package com.x.base.core.entity;
 
 public enum StorageType {
-	file, processPlatform, mind, meeting, calendar, okr, cms, bbs, report, strategyDeploy, teamwork, structure, im, general;
+	file, processPlatform, mind, meeting, calendar, okr, cms, bbs, report, strategyDeploy, teamwork, structure, im,
+	general, custom;
+
 	public static final int length = JpaObject.length_32B;
 }
\ No newline at end of file
-- 
GitLab