diff --git a/FengHuang/pom.xml b/FengHuang/pom.xml index c281c12..db9d458 100644 --- a/FengHuang/pom.xml +++ b/FengHuang/pom.xml @@ -7,29 +7,6 @@ FengHuang 1.0-SNAPSHOT - - - - - - - - - - - - ali-maven - http://maven.aliyun.com/nexus/content/groups/public - - true - - - true - always - fail - - - 1.8 @@ -37,11 +14,12 @@ - - - - - + + + org.apache.shardingsphere + shardingsphere-jdbc-core + 5.3.2 + com.jfinal diff --git a/FengHuang/src/main/resource/application.properties b/FengHuang/src/main/resource/application.properties index d221eaf..e4c87c8 100644 --- a/FengHuang/src/main/resource/application.properties +++ b/FengHuang/src/main/resource/application.properties @@ -2,7 +2,8 @@ driverClassName=com.mysql.cj.jdbc.Driver user=root password=DsideaL147258369 -jdbcUrl=jdbc:mysql://10.10.14.169:22066/FengHuang_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +#jdbcUrl=jdbc:mysql://10.10.14.169:22066/FengHuang_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +jdbcUrl=jdbc:mysql://10.10.14.169:22066/db0?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # redis ip redis_ip=10.10.14.169 # redis port diff --git a/FengHuang/target/classes/application.properties b/FengHuang/target/classes/application.properties index d221eaf..e4c87c8 100644 --- a/FengHuang/target/classes/application.properties +++ b/FengHuang/target/classes/application.properties @@ -2,7 +2,8 @@ driverClassName=com.mysql.cj.jdbc.Driver user=root password=DsideaL147258369 -jdbcUrl=jdbc:mysql://10.10.14.169:22066/FengHuang_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +#jdbcUrl=jdbc:mysql://10.10.14.169:22066/FengHuang_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +jdbcUrl=jdbc:mysql://10.10.14.169:22066/db0?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # redis ip redis_ip=10.10.14.169 # redis port diff --git a/dsssoserver/pom.xml b/dsssoserver/pom.xml index 395f725..b8ef720 100644 --- a/dsssoserver/pom.xml +++ b/dsssoserver/pom.xml @@ -7,27 +7,6 @@ dsssoserver 1.0-SNAPSHOT - - - - ali-maven - http://maven.aliyun.com/nexus/content/groups/public - - true - - - true - always - fail - - - - - com.e-iceblue - e-iceblue - http://repo.e-iceblue.com/nexus/content/groups/public/ - - 1.8 @@ -39,12 +18,12 @@ com.jfinal jfinal - 5.0.7 + 5.0.8 com.jfinal jfinal-undertow - 3.3 + 3.4 diff --git a/dsssoserver/src/main/java/com/dsideal/Start.java b/dsssoserver/src/main/java/com/dsideal/Start.java index fa46d1a..14c394e 100644 --- a/dsssoserver/src/main/java/com/dsideal/Start.java +++ b/dsssoserver/src/main/java/com/dsideal/Start.java @@ -83,34 +83,13 @@ public class Start extends JFinalConfig { druid.setTimeBetweenEvictionRunsMillis(60000); druid.setMinEvictableIdleTimeMillis(300000); druid.setValidationQuery("SELECT 'x'"); - druid.setTestWhileIdle(true); + druid.setTestWhileIdle(false); druid.setTestOnBorrow(false); druid.setTestOnReturn(false); druid.setMaxPoolPreparedStatementPerConnectionSize(20); //增加回收机制 - druid.setRemoveAbandoned(true); druid.setRemoveAbandonedTimeoutMillis(300); druid.setLogAbandoned(false); - // 4、配置log插件 - if (PropKit.get("showFullSql").equals("true")) { - Slf4jLogFilter slfLogfiter = new Slf4jLogFilter(); - slfLogfiter.setStatementExecutableSqlLogEnable(true); - slfLogfiter.setResultSetLogEnabled(false); - slfLogfiter.setConnectionLogEnabled(false); - slfLogfiter.setDataSourceLogEnabled(false); - slfLogfiter.setStatementCreateAfterLogEnabled(false); - slfLogfiter.setStatementPrepareAfterLogEnabled(false); - slfLogfiter.setStatementPrepareCallAfterLogEnabled(false); - slfLogfiter.setStatementExecuteAfterLogEnabled(false); - slfLogfiter.setStatementExecuteQueryAfterLogEnabled(false); - slfLogfiter.setStatementExecuteUpdateAfterLogEnabled(false); - slfLogfiter.setStatementExecuteBatchAfterLogEnabled(false); - slfLogfiter.setStatementCloseAfterLogEnabled(false); - slfLogfiter.setStatementParameterSetLogEnabled(false); - slfLogfiter.setStatementParameterClearLogEnable(false); - slfLogfiter.setStatementLogErrorEnabled(false); - druid.addFilter(slfLogfiter); - } me.add(druid); // 配置ActiveRecord插件 ActiveRecordPlugin arp = new ActiveRecordPlugin(druid); diff --git a/dsssoserver/src/main/java/com/dsideal/baseService/Listener/FixTomcatServletContextListener.java b/dsssoserver/src/main/java/com/dsideal/baseService/Listener/FixTomcatServletContextListener.java deleted file mode 100644 index ecccc6a..0000000 --- a/dsssoserver/src/main/java/com/dsideal/baseService/Listener/FixTomcatServletContextListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.dsideal.baseService.Listener; - - -import com.mysql.cj.jdbc.AbandonedConnectionCleanupThread; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.Enumeration; - -@WebListener -public class FixTomcatServletContextListener implements ServletContextListener { - public void contextInitialized(ServletContextEvent sce) { - } - - public void contextDestroyed(ServletContextEvent sce) { - Enumeration drivers = DriverManager.getDrivers(); - Driver d = null; - while (drivers.hasMoreElements()) { - try { - d = drivers.nextElement(); - DriverManager.deregisterDriver(d); - System.out.println(String.format("ContextFinalizer:Driver %s deregistered", d)); - } catch (SQLException ex) { - System.out.println(String.format("ContextFinalizer:Error deregistering driver %s", d) + ":" + ex); - } - } - AbandonedConnectionCleanupThread.checkedShutdown(); - } -} diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/CommomController.java b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/CommomController.java index 822a40e..bf3f986 100644 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/CommomController.java +++ b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/CommomController.java @@ -11,29 +11,22 @@ public class CommomController extends Controller { /** * 根据全局变量的key获取value */ - public void getGlobalValueByKey() { + public void getGlobalValueByKey(String key) { JSONObject resultJson = new JSONObject(); - try { - String key = getPara("key"); - if (StringUtils.isBlank(key)) { - resultJson.put("success", false); - resultJson.put("msg", "key不允许为空！"); - renderJson(resultJson); - return; - } - - String[] keys = key.split(","); - for (int i = 0; i < keys.length; i++) { - String _key = keys[i]; - String _value = Login.dao.getGlobalValueByKey(_key); - resultJson.put(_key, _value); - } - resultJson.put("success", true); - renderJson(resultJson); - } catch (Exception e) { + if (StringUtils.isBlank(key)) { resultJson.put("success", false); - resultJson.put("msg", "获取数据异常！"); + resultJson.put("msg", "key不允许为空！"); renderJson(resultJson); + return; + } + + String[] keys = key.split(","); + for (int i = 0; i < keys.length; i++) { + String _key = keys[i]; + String _value = Login.dao.getGlobalValueByKey(_key); + resultJson.put(_key, _value); } + resultJson.put("success", true); + renderJson(resultJson); } } diff --git a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java index 4b674c8..ae0f598 100644 --- a/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java +++ b/dsssoserver/src/main/java/com/dsideal/sso/server/controller/WebLoginController.java @@ -19,6 +19,9 @@ import com.jfinal.kit.PropKit; public class WebLoginController extends Controller { + public void index(){ + redirect("/html/login.html"); + } public void login() { boolean flag = true; if (flag) { diff --git a/dsssoserver/src/main/resources/Sql/Login.sql b/dsssoserver/src/main/resources/Sql/Login.sql index eebe347..8e7264c 100644 --- a/dsssoserver/src/main/resources/Sql/Login.sql +++ b/dsssoserver/src/main/resources/Sql/Login.sql @@ -86,7 +86,4 @@ select t2.person_id,t2.person_name,t2.identity_id from t_sys_account_mount t1 inner join t_sys_loginperson t2 on t1.person_id=t2.person_id and t2.b_use =1 where t1.main_person_id = ? #end - - - #end \ No newline at end of file diff --git a/dsssoserver/src/main/resources/application.properties b/dsssoserver/src/main/resources/application.properties index 06c0aad..bf7548c 100644 --- a/dsssoserver/src/main/resources/application.properties +++ b/dsssoserver/src/main/resources/application.properties @@ -15,21 +15,11 @@ qq.redirect.uri=http://10.10.6.179/third/qqLogin wx.app.id=wx3e0449144386938a wx.app.secret=15a37979f34791ca8b920c386afaa0d5 -showFullSql=true # Sql配置文件的物理路径 WindowsSqlPath=D:/dsWork/FengHuang/dsssoserver/target/classes/Sql CentosSqlPath=/usr/local/tomcat8/webapps/dsssoserver/WEB-INF/classes/Sql - -#default.redirect.url=http://10.10.6.19/baseService/html/main.html - -SmsSignName=教育云平台 - -#OSS -accessKeyId=w5c4HJfSXoegx74M -accessKeySecret=qeIiYsq8ec6KYvB3DqpnDX03MUSvtI - # 记录登录日志的范围 loginLogIdentity=1,2,3,4,5,6,7 diff --git a/dsssoserver/target/classes/Sql/Login.sql b/dsssoserver/target/classes/Sql/Login.sql index eebe347..8e7264c 100644 --- a/dsssoserver/target/classes/Sql/Login.sql +++ b/dsssoserver/target/classes/Sql/Login.sql @@ -86,7 +86,4 @@ select t2.person_id,t2.person_name,t2.identity_id from t_sys_account_mount t1 inner join t_sys_loginperson t2 on t1.person_id=t2.person_id and t2.b_use =1 where t1.main_person_id = ? #end - - - #end \ No newline at end of file diff --git a/dsssoserver/target/classes/application.properties b/dsssoserver/target/classes/application.properties index 06c0aad..bf7548c 100644 --- a/dsssoserver/target/classes/application.properties +++ b/dsssoserver/target/classes/application.properties @@ -15,21 +15,11 @@ qq.redirect.uri=http://10.10.6.179/third/qqLogin wx.app.id=wx3e0449144386938a wx.app.secret=15a37979f34791ca8b920c386afaa0d5 -showFullSql=true # Sql配置文件的物理路径 WindowsSqlPath=D:/dsWork/FengHuang/dsssoserver/target/classes/Sql CentosSqlPath=/usr/local/tomcat8/webapps/dsssoserver/WEB-INF/classes/Sql - -#default.redirect.url=http://10.10.6.19/baseService/html/main.html - -SmsSignName=教育云平台 - -#OSS -accessKeyId=w5c4HJfSXoegx74M -accessKeySecret=qeIiYsq8ec6KYvB3DqpnDX03MUSvtI - # 记录登录日志的范围 loginLogIdentity=1,2,3,4,5,6,7 diff --git a/dsssoserver/target/classes/com/dsideal/Start.class b/dsssoserver/target/classes/com/dsideal/Start.class index 80bea3d..386ad54 100644 Binary files a/dsssoserver/target/classes/com/dsideal/Start.class and b/dsssoserver/target/classes/com/dsideal/Start.class differ diff --git a/dsssoserver/target/classes/com/dsideal/baseService/Listener/FixTomcatServletContextListener.class b/dsssoserver/target/classes/com/dsideal/baseService/Listener/FixTomcatServletContextListener.class deleted file mode 100644 index c92a0ef..0000000 Binary files a/dsssoserver/target/classes/com/dsideal/baseService/Listener/FixTomcatServletContextListener.class and /dev/null differ diff --git a/dsssoserver/target/classes/com/dsideal/sso/server/controller/AppLoginController.class b/dsssoserver/target/classes/com/dsideal/sso/server/controller/AppLoginController.class index a146c32..01f2666 100644 Binary files a/dsssoserver/target/classes/com/dsideal/sso/server/controller/AppLoginController.class and b/dsssoserver/target/classes/com/dsideal/sso/server/controller/AppLoginController.class differ diff --git a/dsssoserver/target/classes/com/dsideal/sso/server/controller/CommomController.class b/dsssoserver/target/classes/com/dsideal/sso/server/controller/CommomController.class index 627c99d..7885205 100644 Binary files a/dsssoserver/target/classes/com/dsideal/sso/server/controller/CommomController.class and b/dsssoserver/target/classes/com/dsideal/sso/server/controller/CommomController.class differ diff --git a/dsssoserver/target/classes/com/dsideal/sso/server/controller/ThirdLoginController.class b/dsssoserver/target/classes/com/dsideal/sso/server/controller/ThirdLoginController.class index 75c0920..ae6ce67 100644 Binary files a/dsssoserver/target/classes/com/dsideal/sso/server/controller/ThirdLoginController.class and b/dsssoserver/target/classes/com/dsideal/sso/server/controller/ThirdLoginController.class differ diff --git a/dsssoserver/target/classes/com/dsideal/sso/server/controller/WebLoginController.class b/dsssoserver/target/classes/com/dsideal/sso/server/controller/WebLoginController.class index 25dc20f..ff2f141 100644 Binary files a/dsssoserver/target/classes/com/dsideal/sso/server/controller/WebLoginController.class and b/dsssoserver/target/classes/com/dsideal/sso/server/controller/WebLoginController.class differ