20190322

.gitignore

@@ -0,0 +1,6 @@
+.vscode
+.DS_Store
+.idea
+node_modules/
+/target
+*.iml

.idea/artifacts/guangming_war_exploded.xml

@@ -1,18 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="guangming:war exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/guangming_war_exploded</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="guangming" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="lib" />
-          <element id="library" level="project" name="lib2" />
-          <element id="library" level="project" name="lib1" />
-        </element>
-      </element>
-      <element id="javaee-facet-resources" facet="guangming/web/Web" />
-    </root>
-  </artifact>
-</component>

.idea/libraries/Java_EE_6_Java_EE_6.xml

@@ -1,16 +0,0 @@
-<component name="libraryTable">
-  <library name="Java EE 6-Java EE 6">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/javax.persistence.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.annotation.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.jms.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.ejb.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.transaction.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.resource.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.servlet.jsp.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.servlet.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/lib.xml

@@ -1,69 +1,16 @@
 <component name="libraryTable">
   <library name="lib">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.context-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.transaction-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jdom-1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/Qrcode.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/thumbnailator-0.4.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.core-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/ezmorph-1.0.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-excelant-3.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/log4j-1.2.17.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/xstream-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/httpcore-4.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-fileupload-1.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mybatis-3.3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-ooxml-schemas-3.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-examples-3.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-beanutils-1.7.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-ooxml-3.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/aopalliance-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/json.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mail-1.4.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.jdbc-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.web-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/xpp3_min-1.1.4c.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/activation-1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-codec-1.9.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-lang-2.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/curvesapi-1.04.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.expression-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/json-lib-2.3-jdk15.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.web.servlet-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-3.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/c3p0-0.9.1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mybatis-spring-1.1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.asm-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/aliyun-sdk-oss-2.0.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jackson-mapper-lgpl-1.9.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/dom4j-1.6.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-collections4-4.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-logging-1.1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/httpclient-4.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.aop-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/xmlbeans-2.6.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-scratchpad-3.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jboss-logging-3.0.0.CR1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.beans-3.1.2.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jstl-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-io-2.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-collections-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/gson-2.2.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/ueditor-1.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jackson-core-lgpl-1.9.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mysql-connector-java-5.1.30-bin.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.test-3.1.1.RELEASE.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jettison-1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/httpmime-4.5.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-discovery-0.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-httpclient-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/dahantc-http-json-api.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.servlet.jsp.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.ejb.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.annotation.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.persistence.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.jms.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.servlet.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.transaction.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.resource.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/dahantc-http-json-api-resource.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/lib1.xml

@@ -1,11 +1,67 @@
 <component name="libraryTable">
   <library name="lib1">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/WEB-INF/lib/commons-io-2.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/WEB-INF/lib/commons-codec-1.9.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/WEB-INF/lib/ueditor-1.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/WEB-INF/lib/json.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/WEB-INF/lib/commons-fileupload-1.3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.context-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-collections-3.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/ueditor-1.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.web-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-ooxml-schemas-3.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jackson-mapper-lgpl-1.9.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mysql-connector-java-5.1.30-bin.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-3.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-collections4-4.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/c3p0-0.9.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/json-lib-2.3-jdk15.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-codec-1.9.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.test-3.1.1.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-ooxml-3.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/activation-1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/httpmime-4.5.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.asm-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-io-2.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.core-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/aopalliance-1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/thumbnailator-0.4.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/xstream-1.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.jdbc-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mybatis-spring-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-beanutils-1.7.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/xpp3_min-1.1.4c.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/ezmorph-1.0.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mail-1.4.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/Qrcode.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.beans-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-examples-3.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.expression-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/xmlbeans-2.6.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/gson-2.3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/gson-2.2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.web.servlet-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-scratchpad-3.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/curvesapi-1.04.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jboss-logging-3.0.0.CR1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.aop-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jdom-1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-fileupload-1.2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/log4j-1.2.17.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/aliyun-sdk-oss-2.0.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/httpcore-4.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-httpclient-3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jackson-core-lgpl-1.9.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/dom4j-1.6.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-discovery-0.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-lang-2.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/json.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/poi-excelant-3.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/dahantc-http-json-api.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jstl-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/httpclient-4.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/commons-logging-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jettison-1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/dahantc-http-json-api-resource.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/org.springframework.transaction-3.1.2.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/mybatis-3.3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/WEB-INF/lib/jboss-vfs-3.1.0.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/lib2.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="lib2">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/ueditor-1.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/commons-fileupload-1.3.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/commons-io-2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/ueditor-1.1.2.jar!/" />
       <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/commons-codec-1.9.jar!/" />
       <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/json.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Web/ueditor/jsp/lib/commons-fileupload-1.3.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/misc.xml

@@ -3,17 +3,4 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="myConfigurationMap">
-      <map>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="trunkUrl" value="svn://121.40.132.44/guangming/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
 </project>

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/guangming.iml" filepath="$PROJECT_DIR$/guangming.iml" />
+      <module fileurl="file://$PROJECT_DIR$/zoumasuyuan.iml" filepath="$PROJECT_DIR$/zoumasuyuan.iml" />
     </modules>
   </component>
 </project>

.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

guangming.iml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/Web/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/Web" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="Spring Application Context" removed="false">
-          <file>file://$MODULE_DIR$/src/appDataSource.xml</file>
-          <file>file://$MODULE_DIR$/src/appWebService.xml</file>
-          <file>file://$MODULE_DIR$/src/appWebServlet.xml</file>
-          <file>file://$MODULE_DIR$/src/applicationContext.xml</file>
-        </fileset>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib" level="project" />
-    <orderEntry type="library" name="lib2" level="project" />
-    <orderEntry type="library" name="lib1" level="project" />
-    <orderEntry type="library" name="Java EE 6-Java EE 6" level="project" />
-    <orderEntry type="module-library">
-      <library name="JUnit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>