1、去掉建党100周年宣传

.idea/.gitignore

@@ -2,3 +2,4 @@
 /workspace.xml
 # Datasource local storage ignored files
 /dataSources.local.xml
+/dataSources/
\ No newline at end of file

.idea/compiler.xml

@@ -7,6 +7,7 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="sfzx_website" />
+        <module name="sfzx-website" />
       </profile>
     </annotationProcessing>
   </component>

.idea/dataSources.xml

@@ -15,5 +15,19 @@
         <property name="yearIsDateType" value="false" />
       </driver-properties>
     </data-source>
+    <data-source source="LOCAL" name="sfzxWebsite@localhost" uuid="a69ddf70-6cac-49ce-9296-dba84c6eefc0">
+      <driver-ref>mysql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/sfzxWebsite</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+        <property name="zeroDateTimeBehavior" value="CONVERT_TO_NULL" />
+        <property name="tinyInt1isBit" value="false" />
+        <property name="characterEncoding" value="utf8" />
+        <property name="characterSetResults" value="utf8" />
+        <property name="yearIsDateType" value="false" />
+      </driver-properties>
+    </data-source>
   </component>
 </project>
\ No newline at end of file

.idea/encodings.xml

@@ -2,5 +2,7 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file

.idea/jarRepositories.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file

pom.xml

@@ -480,7 +480,7 @@
           <connectors>
             <connector
                     implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8686</port>
+              <port>8080</port>
               <maxIdleTime>60000</maxIdleTime>
             </connector>
           </connectors>

src/main/java/org/ccpit/business/serviceNetWork/ServiceNetWork.java

@@ -29,7 +29,7 @@ public class ServiceNetWork {
 	 */
 	private String name;
 	/**
-	 * 网点名称
+	 * 网点地址
 	 */
 	private String linkAddress;
 	/**
@@ -50,7 +50,7 @@ public class ServiceNetWork {
 	private String contacts;
 
 	/**
-	 * 是否删除
+	 *
 	 */
 	private String parentId;
 

src/main/sql/update.sql

+update sfzx_servicenetwork set contacts = '丁明君 张静' where id = 33;
+
+select * from sfzx_servicenetwork where id = 33;
\ No newline at end of file

src/main/sql/update_20210624.sql

+insert into sfzx_serviceNetWork (id,name,linkAddress,webSiteName,webSiteAddress,tel,contacts,parentId,deleted) values
+(108,'东营','山东省东营市府前大街122号财政局大楼1215室','中国国际贸易促进委员会东营市委员会','http://ccpit.dongying.gov.cn/','0546-8082335','高一阁',9,0);
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/front/home-page.jsp

@@ -57,7 +57,6 @@ text-decoration:none;
     </div>
 </div>
  -->
-
 	<nav class="navbar navbar-default">
 	<div class="container-fluid costom_main_navigation">
 		<!-- Brand and toggle get grouped for better mobile display -->