From a57913f1584ea335a877d7df5a4d61922def65cb Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@nismail.iie.ac.cn>
Date: Tue, 9 Oct 2018 14:12:23 +0800
Subject: [PATCH] ignore

---
 .classpath                                 | 6 +-----
 .settings/.gitignore                       | 2 ++
 .settings/org.eclipse.core.resources.prefs | 3 ++-
 .settings/org.eclipse.wst.common.component | 6 ++----
 src/main/resources/log4j.properties        | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 .settings/.gitignore

diff --git a/.classpath b/.classpath
index 4adf262..6aa45c2 100644
--- a/.classpath
+++ b/.classpath
@@ -28,10 +28,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..f6cca2f
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1,2 @@
+/org.eclipse.wst.common.component
+/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 966d51c..bdfeb46 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,8 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources/applicationConfig-rule.properties=UTF-8
 encoding//src/main/resources/b.txt=UTF-8
+encoding//src/main/resources/fastdfs-client.properties=UTF-8
 encoding//src/main/resources/jdbc.properties=UTF-8
 encoding//src/main/resources/log4j.properties=UTF-8
 encoding//src/main/resources/matt.properties=UTF-8
@@ -13,4 +15,3 @@ encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8
 encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8
 encoding//src/main/webapp/static/common/jeesite.css=UTF-8
 encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7350c94..833f7d1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="galaxy-0.0.1-SNAPSHOT">
+    <wb-module deploy-name="galaxy-service-0.0.1-SNAPSHOT">
         <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"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
         <property name="java-output-path" value="/galaxy/target/classes"/>
-        <property name="context-root" value="galaxy"/>
+        <property name="context-root" value="galaxy-service"/>
     </wb-module>
 </project-modules>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 8833690..5a2ee09 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -11,7 +11,7 @@ log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.file.Threshold=error
 log4j.appender.file.encoding=UTF-8
 log4j.appender.file.Append=true
-log4j.appender.file.file=${nis.root}/WEB-INF/log/nis.log
+log4j.appender.file.file=/WEB-INF/log/nis.log
 log4j.appender.file.DatePattern='.'yyyy-MM-dd
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 #log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss} %X{ip} [%t] %5p %c{1} %m%n