From 87c0a7116f2fa9520167ccbffff2f85d7183bc9b Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 17 Aug 2020 21:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E3=80=90Star=E3=80=91=E6=94=B6=E8=97=8F=E6=9C=AC=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=20^=5F^?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  8 ++++----
 .../org.eclipse.core.resources.prefs          |  5 -----
 common/.settings/org.eclipse.jdt.core.prefs   |  8 --------
 common/.settings/org.eclipse.m2e.core.prefs   |  4 ----
 .../org.eclipse.wst.common.component          |  6 ------
 ....eclipse.wst.common.project.facet.core.xml |  5 -----
 .../org.eclipse.wst.validation.prefs          |  2 --
 .../org.eclipse.core.resources.prefs          |  5 -----
 .../core/.settings/org.eclipse.jdt.core.prefs |  8 --------
 .../core/.settings/org.eclipse.m2e.core.prefs |  4 ----
 .../org.eclipse.wst.common.component          |  6 ------
 ....eclipse.wst.common.project.facet.core.xml |  5 -----
 .../org.eclipse.wst.validation.prefs          |  2 --
 .../org.eclipse.core.resources.prefs          |  2 --
 web/.settings/.jsdtscope                      | 12 -----------
 .../org.eclipse.core.resources.prefs          |  5 -----
 web/.settings/org.eclipse.jdt.core.prefs      |  8 --------
 web/.settings/org.eclipse.m2e.core.prefs      |  4 ----
 .../org.eclipse.wst.common.component          | 20 -------------------
 ....eclipse.wst.common.project.facet.core.xml |  7 -------
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 -
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 -
 .../org.eclipse.wst.validation.prefs          |  2 --
 23 files changed, 4 insertions(+), 126 deletions(-)
 delete mode 100644 common/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 common/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 common/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 common/.settings/org.eclipse.wst.common.component
 delete mode 100644 common/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 common/.settings/org.eclipse.wst.validation.prefs
 delete mode 100644 modules/core/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 modules/core/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 modules/core/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 modules/core/.settings/org.eclipse.wst.common.component
 delete mode 100644 modules/core/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 modules/core/.settings/org.eclipse.wst.validation.prefs
 delete mode 100644 parent/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 web/.settings/.jsdtscope
 delete mode 100644 web/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 web/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 web/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 web/.settings/org.eclipse.wst.common.component
 delete mode 100644 web/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 web/.settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 web/.settings/org.eclipse.wst.jsdt.ui.superType.name
 delete mode 100644 web/.settings/org.eclipse.wst.validation.prefs

diff --git a/.gitignore b/.gitignore
index 8130674a..0ba49067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,10 @@
 **/target
 **/webapp/userfiles
 **/WEB-INF/classes
+**/transaction-logs
 **/logs/*.log*
+*.epoch
+*.lic
 
 .settings
 .apt_generated
@@ -15,10 +18,7 @@
 *.ipr
 *.iml
 *.iws
-*.lic
 
 .DS_Store
 Thumbs.db
-rebel.xml
-
-*.epoch
\ No newline at end of file
+rebel.xml
\ No newline at end of file
diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 365bbd60..00000000
--- a/common/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/common/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c788ee34..00000000
--- a/common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/common/.settings/org.eclipse.m2e.core.prefs b/common/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 14b697b7..00000000
--- a/common/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/common/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 2b059ac7..00000000
--- a/common/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="jeesite-common">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>
diff --git a/common/.settings/org.eclipse.wst.common.project.facet.core.xml b/common/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index d788c0d3..00000000
--- a/common/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.7"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
diff --git a/common/.settings/org.eclipse.wst.validation.prefs b/common/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 6f1cba68..00000000
--- a/common/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/modules/core/.settings/org.eclipse.core.resources.prefs b/modules/core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 365bbd60..00000000
--- a/modules/core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/modules/core/.settings/org.eclipse.jdt.core.prefs b/modules/core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c788ee34..00000000
--- a/modules/core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/modules/core/.settings/org.eclipse.m2e.core.prefs b/modules/core/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 14b697b7..00000000
--- a/modules/core/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/modules/core/.settings/org.eclipse.wst.common.component b/modules/core/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 4be3c128..00000000
--- a/modules/core/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="jeesite-module-core">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>
diff --git a/modules/core/.settings/org.eclipse.wst.common.project.facet.core.xml b/modules/core/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index d788c0d3..00000000
--- a/modules/core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.7"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
diff --git a/modules/core/.settings/org.eclipse.wst.validation.prefs b/modules/core/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 6f1cba68..00000000
--- a/modules/core/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/parent/.settings/org.eclipse.core.resources.prefs b/parent/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b802..00000000
--- a/parent/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/web/.settings/.jsdtscope b/web/.settings/.jsdtscope
deleted file mode 100644
index e34514d9..00000000
--- a/web/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/web/.settings/org.eclipse.core.resources.prefs b/web/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 365bbd60..00000000
--- a/web/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/web/.settings/org.eclipse.jdt.core.prefs b/web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1ab2bb53..00000000
--- a/web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/web/.settings/org.eclipse.m2e.core.prefs b/web/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 14b697b7..00000000
--- a/web/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index bdc6ecd6..00000000
--- a/web/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="web">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="jeesite-module-core-4.0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-core/jeesite-module-core">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="jeesite-common-4.0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="jeesite-framework-4.0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="web"/>
-        <property name="java-output-path" value="/jeesite-web/src/main/webapp/WEB-INF/classes"/>
-        <property name="component.exclusion.patterns" value="WEB-INF/classes/*.lic,userfiles/**"/>
-    </wb-module>
-</project-modules>
diff --git a/web/.settings/org.eclipse.wst.common.project.facet.core.xml b/web/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index a2909b14..00000000
--- a/web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>
diff --git a/web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a4..00000000
--- a/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6..00000000
--- a/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/web/.settings/org.eclipse.wst.validation.prefs b/web/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 6f1cba68..00000000
--- a/web/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1