dev

uniker · May 28, 2014 · 62d6440 · 62d6440
1 parent 66f7f02
commit 62d6440
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/UPDATELOG.md b/UPDATELOG.md
@@ -1,6 +1,8 @@
 ### rap v0.9 ###
-* [功能] 增加对RESTful API的支持。 2014-05-22
+* [BUG] 修复首次登录密码不正确后再登录由于错误的returnUrl导致登录失败的问题。2014-05-28
 * [BUG] 修复windows BOM信息问题导致NodeJS无法正确使用Mock数据。 2014-05-27
+* [功能] 增加对RESTful API的支持。 2014-05-22
+
 
 ### rap v0.8.1 ###
 * [优化] 工作区复层样式重写。2014-05-06

diff --git a/WebContent/account/login.vm b/WebContent/account/login.vm
@@ -17,7 +17,7 @@
     <body>
         #bodyNewStart
         <form name="formMain" action="$accountUrl.doLogin" method="post">
-            <input type="hidden" name="returnUrl" value="$returnUrlEncoded" />
+            <input type="hidden" name="returnUrl" value="$!returnUrlEncoded" />
             <table class="table">
                 <tr>
                     <td colspan="2"><h4>登录</h4></td>
@@ -42,7 +42,7 @@
                 <tr>
                     <td colspan="2">
                         <div class="navbar-form">
-                            <a href="https://login.alibaba-inc.com/ssoLogin.htm?APP_NAME=rapauto&BACK_URL=$homeUrlEncoded$returnUrlEncoded&CANCEL_CERT=true&CLIENT_VERSION=0.3.9&CONTEXT_PATH=%2F">
+                            <a href="https://login.alibaba-inc.com/ssoLogin.htm?APP_NAME=rapauto&BACK_URL=$!homeUrlEncoded$!returnUrlEncoded&CANCEL_CERT=true&CLIENT_VERSION=0.3.9&CONTEXT_PATH=%2F">
                             <span class="btn btn-warning other-login-btn sso-login">用阿里域账号登录</span>
                             </a>
                         </div>

diff --git a/src/mysql.local.properties b/src/mysql.local.properties
@@ -1,7 +1,7 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://localhost\:3306/BosnAutoPlatformDB?useUnicode\=true&characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull&noAccessToProcedureBodies\=true
 jdbc.username=root
-jdbc.password=
+jdbc.password=880622
 jdbc.maxPoolSize=2
 jdbc.minPoolSize=1
 jdbc.initialPoolSize=1