Merge remote-tracking branch 'origin/additional' into additional

xwj-vic · Mar 27, 2017 · 197a813 · 197a813
2 parents 65cbeab + f99a3f6
commit 197a813
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/web/AppAPI/apitest.java b/src/main/java/web/AppAPI/apitest.java
@@ -13,6 +13,7 @@
 
 /**
  * Created by xuweijie on 2017/3/14.
+ * 接口
  */
 @RequestMapping("/api")
 @Controller

diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
@@ -1,10 +1,10 @@
 validationQuery=SELECT 1
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://120.25.79.159:3306/SSMDB?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+jdbc.url=jdbc:mysql://120.25.79.159:3306/GeneralSSMDB?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 jdbc.username=xuweijie
 jdbc.password=xuweijie
 
 jdbc.driver.slave=com.mysql.jdbc.Driver
-jdbc.url.slave=jdbc:mysql://139.199.10.50:3306/SSMDB?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+jdbc.url.slave=jdbc:mysql://139.199.10.50:3306/GeneralSSMDB?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 jdbc.username.slave=xuweijie
 jdbc.password.slave=xuweijie
diff --git a/src/main/resources/spring/spring-web.xml b/src/main/resources/spring/spring-web.xml
@@ -2,7 +2,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
        xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/mvc
+       http://www.springframework.org/schema/mvc/spring-mvc.xsd
+       http://www.springframework.org/schema/context
+       http://www.springframework.org/schema/context/spring-context.xsd">
 
     <!--配置spring mvc-->
     <!--1,开启springmvc注解模式

diff --git a/src/main/webapp/WEB-INF/ftl/welcome.ftl b/src/main/webapp/WEB-INF/ftl/welcome.ftl
@@ -5,7 +5,13 @@
     <title>freemarker页面</title>
 </head>
 <body>
-Hello ${name}
-
+Hello ${name}  <!--ftl的插值-->
+<#setting number_format="currency"/>
+<#assign answer=46/>
+${answer}
+${answer?string}
+${answer?string.number}
+${answer?string.currency}
+${answer?string.percent}
 </body>
 </html>