anderx преди 5 години
родител
ревизия
831b2c9406

+ 17 - 0
.classpath

@@ -25,5 +25,22 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.0"/>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

+ 2 - 0
.settings/org.eclipse.jdt.apt.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false

+ 3 - 0
.settings/org.eclipse.jdt.core.prefs

@@ -8,7 +8,10 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

+ 0 - 2
.settings/org.eclipse.wst.common.component

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="local">
-        <wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
         <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="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <property name="java-output-path" value="/wechat-guessing/target/classes"/>
         <property name="context-root" value="local"/>

+ 3 - 2
pom.xml

@@ -5,7 +5,7 @@
   <artifactId>kede-web</artifactId>
   <packaging>war</packaging>
   <version>0.0.1-SNAPSHOT</version>
-  <name>kede-web</name>
+  <name>kede-web-HN</name>
   <url>http://maven.apache.org</url>
  <properties>
 		<java-version>1.8</java-version>
@@ -155,7 +155,8 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.40</version>
+			<!-- <version>5.1.40</version> -->
+			<version>8.0.11</version>
 		</dependency>
 
 		<!-- Logging -->

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 #Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.driverClassName=com.mysql.cj.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft_ow?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
+jdbc.url=jdbc:mysql://localhost:3306/aft_ow?useSSL=false&serverTimezone=UTC
+jdbc.username=root
 jdbc.password=123456
 #测试
 #jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20181217?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
@@ -60,7 +60,7 @@ template.cacheable=false
 
 avatar.upload.host=//kedejs.jishutao.com/upload
 #连接开å
-portal.host=//kedejs.jishutao.com/portal/1.0.05
+portal.host=//kedejs.jishutao.com/portal/1.0.07
 static.host=//kedejs.jishutao.com/client/1.0.1
 avatar.host=//kedejs.jishutao.com
 

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -57,7 +57,7 @@
         </footer>
         <!-- 底部  end -->
     </div>
-    <div th:replace="common::footer(~{::script},'')">
+    <div th:replace="common::footer(~{},'')">
     </div>
 </body>
 </html>

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/index.html

@@ -749,16 +749,16 @@
 			var index = item.index()
 			switch (index){
 				case 0:
-					window.location.href = "http://www.kedexinxi.com/portal/aboutKede"
+                    window.location.href = window.location.protocol+'//'+window.location.host+"/portal/aboutKede"
 					break;
 				case 1:
-					window.location.href = "http://www.kedexinxi.com/portal/aboutKede?btn=3"
+                    window.location.href = window.location.protocol+'//'+window.location.host+"/portal/aboutKede?btn=3"
 					break;
 				case 2:
-					window.location.href = "http://www.kedexinxi.com/portal/aboutKede"
+                    window.location.href = window.location.protocol+'//'+window.location.host+"/portal/aboutKede"
 					break;
 				case 3:
-					window.location.href = "http://www.kedexinxi.com/portal/client"
+                    window.location.href = window.location.protocol+'//'+window.location.host+"/portal/client"
 					break;
 			}
 		})