点击右上角【Star】收藏本软件 ^_^

2020-08-17 21:40:06 +08:00
parent 4bc10be699
commit 87c0a7116f
23 changed files with 4 additions and 126 deletions
--- 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
+rebel.xml
--- a/common/.settings/org.eclipse.core.resources.prefs
+++ b/common/.settings/org.eclipse.core.resources.prefs
@@ -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
--- a/common/.settings/org.eclipse.jdt.core.prefs
+++ b/common/.settings/org.eclipse.jdt.core.prefs
@@ -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
--- a/common/.settings/org.eclipse.m2e.core.prefs
+++ b/common/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
--- a/common/.settings/org.eclipse.wst.common.component
+++ b/common/.settings/org.eclipse.wst.common.component
@@ -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>
--- a/common/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/common/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -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>
--- a/common/.settings/org.eclipse.wst.validation.prefs
+++ b/common/.settings/org.eclipse.wst.validation.prefs
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
--- a/modules/core/.settings/org.eclipse.core.resources.prefs
+++ b/modules/core/.settings/org.eclipse.core.resources.prefs
@@ -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
--- a/modules/core/.settings/org.eclipse.jdt.core.prefs
+++ b/modules/core/.settings/org.eclipse.jdt.core.prefs
@@ -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
--- a/modules/core/.settings/org.eclipse.m2e.core.prefs
+++ b/modules/core/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
--- a/modules/core/.settings/org.eclipse.wst.common.component
+++ b/modules/core/.settings/org.eclipse.wst.common.component
@@ -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>
--- a/modules/core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/modules/core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -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>
--- a/modules/core/.settings/org.eclipse.wst.validation.prefs
+++ b/modules/core/.settings/org.eclipse.wst.validation.prefs
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
--- a/parent/.settings/org.eclipse.core.resources.prefs
+++ b/parent/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
--- a/web/.settings/.jsdtscope
+++ b/web/.settings/.jsdtscope
@@ -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>
--- a/web/.settings/org.eclipse.core.resources.prefs
+++ b/web/.settings/org.eclipse.core.resources.prefs
@@ -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
--- a/web/.settings/org.eclipse.jdt.core.prefs
+++ b/web/.settings/org.eclipse.jdt.core.prefs
@@ -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
--- a/web/.settings/org.eclipse.m2e.core.prefs
+++ b/web/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -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>
--- a/web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -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>
--- a/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -1 +0,0 @@
-Window
--- a/web/.settings/org.eclipse.wst.validation.prefs
+++ b/web/.settings/org.eclipse.wst.validation.prefs
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
				`@@ -1 +0,0 @@`
				`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`