From d8bd45ede8737b637fbd55d24d1fe58baef8e246 Mon Sep 17 00:00:00 2001 From: Shaun Chyxion Date: Mon, 26 Jul 2021 21:39:20 +0800 Subject: [PATCH] jdbc config --- pom.xml | 26 ++++++++++++------ src/main/resources/WEB-INF/cas.properties | 7 ++++- .../WEB-INF/deployerConfigContext.xml | 27 +++++++++++-------- .../view/jsp/default/ui/casLoginView.jsp | 4 +-- .../WEB-INF/webflow/login/login-webflow.xml | 9 +++---- src/main/resources/log4j2.xml | 8 ------ 6 files changed, 46 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index f19ccb2..69e0769 100644 --- a/pom.xml +++ b/pom.xml @@ -17,10 +17,11 @@ 1.8.9 3.1.5 + 1.8 1.8 1.8 false - yyyy-MM-dd HH:mm:ssa + yyyy-MM-dd HH:mm:ss.SSS UTF-8 UTF-8 @@ -31,6 +32,22 @@ emtomcat-core 0.0.1 + + + mysql + mysql-connector-java + 5.1.6 + + + com.alibaba + druid + 1.1.2 + + + org.jasig.cas + cas-server-support-jdbc + ${cas.version} + org.jasig.cas cas-server-webapp-support @@ -66,13 +83,6 @@ cas-server-core-audit ${cas.version} - org.jasig.cas cas-server-core-tickets diff --git a/src/main/resources/WEB-INF/cas.properties b/src/main/resources/WEB-INF/cas.properties index c1954c9..3ea4e04 100644 --- a/src/main/resources/WEB-INF/cas.properties +++ b/src/main/resources/WEB-INF/cas.properties @@ -206,6 +206,10 @@ server.prefix=${server.name}/cas # yubikey.client.id= # yubikey.secret.key= +datasource.url=jdbc:mysql://172.16.4.6/yobr-daily?useUnicode=true&characterEncoding=utf8 +datasource.username=yobr_query +datasource.password=yobr_query! + ## # JDBC Authentication # @@ -217,7 +221,7 @@ server.prefix=${server.name}/cas # cas.jdbc.authn.query.encode.iterations.field= # cas.jdbc.authn.query.encode.iterations= -# cas.jdbc.authn.query.sql= +cas.jdbc.authn.query.sql=select password from br_auth_user where account = ? # cas.jdbc.authn.search.password= # cas.jdbc.authn.search.user= @@ -244,6 +248,7 @@ server.prefix=${server.name}/cas # cas.principal.transform.upperCase=false # cas.authn.password.encoding.char=UTF-8 # cas.authn.password.encoding.alg=SHA-256 +cas.authn.password.encoding.alg=MD5 # cas.principal.transform.prefix= # cas.principal.transform.suffix= diff --git a/src/main/resources/WEB-INF/deployerConfigContext.xml b/src/main/resources/WEB-INF/deployerConfigContext.xml index 1596b19..0001176 100644 --- a/src/main/resources/WEB-INF/deployerConfigContext.xml +++ b/src/main/resources/WEB-INF/deployerConfigContext.xml @@ -1,20 +1,25 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd"> + + + + + + + + + @@ -29,7 +34,7 @@ - + diff --git a/src/main/resources/WEB-INF/view/jsp/default/ui/casLoginView.jsp b/src/main/resources/WEB-INF/view/jsp/default/ui/casLoginView.jsp index ebf5a33..f407292 100644 --- a/src/main/resources/WEB-INF/view/jsp/default/ui/casLoginView.jsp +++ b/src/main/resources/WEB-INF/view/jsp/default/ui/casLoginView.jsp @@ -113,8 +113,8 @@
- <%----%> + diff --git a/src/main/resources/WEB-INF/webflow/login/login-webflow.xml b/src/main/resources/WEB-INF/webflow/login/login-webflow.xml index e4bd281..c1f6b97 100644 --- a/src/main/resources/WEB-INF/webflow/login/login-webflow.xml +++ b/src/main/resources/WEB-INF/webflow/login/login-webflow.xml @@ -2,13 +2,12 @@ - - - + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> + + diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 2ff6a01..bf6cb67 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -112,14 +112,6 @@ - - - - - - - -