From e4f53430a6772c7cb1674653b9bd0342d6d55990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 18 Apr 2023 11:18:04 +0800
Subject: [PATCH] 'commit'

---
 FengHuang/pom.xml                             |  34 ++++--------------
 .../src/main/resource/application.properties  |   3 +-
 .../target/classes/application.properties     |   3 +-
 dsssoserver/pom.xml                           |  25 ++-----------
 .../src/main/java/com/dsideal/Start.java      |  23 +-----------
 .../FixTomcatServletContextListener.java      |  33 -----------------
 .../server/controller/CommomController.java   |  33 +++++++----------
 .../server/controller/WebLoginController.java |   3 ++
 dsssoserver/src/main/resources/Sql/Login.sql  |   3 --
 .../src/main/resources/application.properties |  10 ------
 dsssoserver/target/classes/Sql/Login.sql      |   3 --
 .../target/classes/application.properties     |  10 ------
 .../target/classes/com/dsideal/Start.class    | Bin 7445 -> 6340 bytes
 .../FixTomcatServletContextListener.class     | Bin 2128 -> 0 bytes
 .../controller/AppLoginController.class       | Bin 3929 -> 3929 bytes
 .../server/controller/CommomController.class  | Bin 1649 -> 1488 bytes
 .../controller/ThirdLoginController.class     | Bin 6765 -> 6755 bytes
 .../controller/WebLoginController.class       | Bin 9729 -> 9522 bytes
 18 files changed, 29 insertions(+), 154 deletions(-)
 delete mode 100644 dsssoserver/src/main/java/com/dsideal/baseService/Listener/FixTomcatServletContextListener.java
 delete mode 100644 dsssoserver/target/classes/com/dsideal/baseService/Listener/FixTomcatServletContextListener.class

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 @@
     <artifactId>FengHuang</artifactId>
     <version>1.0-SNAPSHOT</version>
     <!--https://blog.csdn.net/duchao123duchao/article/details/71480106-->
-    <!-- 使用阿里 maven 库 -->
-    <repositories>
-        <!--spire.doc.free:jar mvn clean install下载失败-->
-        <!--https://blog.csdn.net/qq_37676492/article/details/106942764-->
-        <!-- mvn clean install -->
-<!--        <repository>-->
-<!--            <id>com.e-iceblue</id>-->
-<!--            <name>e-iceblue</name>-->
-<!--            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>-->
-<!--        </repository>-->
-        <repository>
-            <id>ali-maven</id>
-            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-        </repository>
-    </repositories>
     <!--使用jdk1.8进行编译-->
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -37,11 +14,12 @@
     </properties>
 
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>e-iceblue</groupId>-->
-<!--            <artifactId>spire.doc</artifactId>-->
-<!--            <version>11.2.3</version>-->
-<!--        </dependency>-->
+        <!--https://mvnrepository.com/artifact/io.shardingsphere/sharding-jdbc-core-->
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-jdbc-core</artifactId>
+            <version>5.3.2</version>
+        </dependency>
         <!--jfinal主框架-->
         <dependency>
             <groupId>com.jfinal</groupId>
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 @@
     <artifactId>dsssoserver</artifactId>
     <version>1.0-SNAPSHOT</version>
     <!--https://blog.csdn.net/duchao123duchao/article/details/71480106-->
-    <!-- 使用阿里 maven 库 -->
-    <repositories>
-        <repository>
-            <id>ali-maven</id>
-            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-        </repository>
-
-        <repository>
-            <id>com.e-iceblue</id>
-            <name>e-iceblue</name>
-            <url>http://repo.e-iceblue.com/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
     <!--使用jdk1.8进行编译-->
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -39,12 +18,12 @@
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal</artifactId>
-            <version>5.0.7</version>
+            <version>5.0.8</version>
         </dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-undertow</artifactId>
-            <version>3.3</version>
+            <version>3.4</version>
         </dependency>
 
         <dependency>
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<Driver> 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 80bea3d2470304463999c4086a4e23a2f127acba..386ad54707d4097b2844a9d065e490e25a78a2cb 100644
GIT binary patch
delta 2135
zcmZ`)33yCb6#ma7GxyD#+mMlD3?YaJHIgC;q6m@168kdJQl=72j4U%DsG7EPqt(`{
zF0_g+N?S#Aq}H^hE!`JY-RZ6ix~d{QcLraYubuCk|DAL1IsZBLy#Ic0MfSd~!Gq^_
z>;aHLZXF)16<DX?Q5}!raRpE4SdS+)Y|yb0Pw99X&j@VNq2pOAHe-v9t*Ftl4bKUL
zbTq+Q9otc>;dvc9uv5b>f!#XxV6TQcffqEqDDaYoeFFOhUe*wNMFqa9;edvNI$p!;
z8s5;+3U3O$r6WZVrr>P_@0hty{zZMKymwX5djjw4=z_Hx4yoq{YVojw4;37VWLQ({
zl=snv{Nq!U_i@AvMjKx!_Y)1Ds^@14K35Q4KB}x^7ZS;(ye}1erQ>USBk-+`LEwJ2
z;(IHO;|C2tT4BOZ8h+Ms0w*<`((sF#*RKkG)9|}G<R1cm>KM;`r{c6S{!(y8k^QaV
ztcG(M&g-Zr&N)FO$W$XtolP}W(dm@1PEZujj_1Rt=N9;d2rM&d%!i_iQDQ8$xPsA=
z%w&-yP$Ec^WF?(oD-L*zOFX``s<~ByY?35hCMZTy6KYD3rJgySbZ>cjzSmbGQB1Ld
z?2?*MoS=9~3FHveT#}Pw3C&0PW>5E)r5Bb@AK;lflOOq>sa56vd4gI<YDw)92??Hx
z3ZHkXr^;JimR8{}uPE_Xc}oI<T1je6NyY@x$I?bpTWV*l5~nhfsXZZjcA&&h&?-EE
zKy|slSWt?j4ywB*#eVOc5`V6bcZPdrg&RyY>a;HQj?_ug<qA5JOHvm~GwQXpiRlz8
z=?dy9shfiC3Nk2DQkH@ql*ywVlUJCRJGM>g+*C<Dsh6Z|>MiL?1$`9sRZ0C+d=B;I
zp{s8D6S^9{xFq99yuG6u(*Q}iG*D2Uq<kzQ#JIg>#pTt3F_pfNo~juV*J7%%Q159e
zkTi&5ja~X6$6y*FX{b6^bXuU&C#jHz5gbNYyu(2-r*m$)q~SC|(nxA5X%vk%2HRTO
z#z-2g&NYt48-81|VUJ6sPR1!)r<%RCLuO+`Y=)_4N29;FSxs(Syvga|%c2y-9k8Xd
z&H7-RW>h95q)z8G3wuCw%wUvZ+YB#C*|TCMe5~YY#-@bCEETJ>2PE>dRfBjNW}%GN
z%lU66c2voVNSWo1?gc8-j%dbqh(R(OXpgpheO1LahzhSqD#joVmGE=A12zOu#q|iY
zF(=%`d`I#?#T66IadAW!#3C)slMwFAexY+!uNreX_d-wAoJN?3`C+1?j;x>}N`Si6
z8GO)8PRK$_^x)QdHXuy7M3};a*EJ?wfa?_@lVtK=&4#vw4aFWAZ0`nabcu~pnQmcY
zx*%?d(3!Szww2jRjor<c1fxRe=XNpXgt5Qd)if@I0d7|uazn@qFXp>DyFw^%@5G=Y
z*LDofHrHavRt#N(#GTNK?1i;R+74T`Wh;i+hlem?J)Gf<kqtLS@rKh9!su)fm8HdN
zPO)blX7zH4c&%FqW9(x?7`Gb9PV-KTFWL^beL@ID7kAkV;i?d>b}!awef|E<PIIKA
zNa#c^#3A-c3a*Jb9AAscYGzSTGh2xc#^x49!Ht;6pO#4oVKVAiya!mmhgrJEc-SX7
z@-$Df9;KwiM=damvf0i-B^4k*UY3oL)-;ysVHU}a>|4l$zPJgCpsA@|d=G3@V==#m
zBpQmFaSKmBm2z=w5Vvtd1(b~2v4oXd$6vmsxP#?#k|h)-<nl9dCze6rE-vPRxt_bT
z2;41jkHB&PL*QP46~I}<3*2`OR)PDe#~Eh%mnt8?gN;QLY^<UM|E(hKer013t-?c%
z=^C>w`d_w(BWyY99;-W}VRhslv)z{W)X!=+)nZBwhACPKzqW|fo$NirYbLDu2PHs>
AqyPW_

delta 3196
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
R`!Cmt`Iukhn;H1}e*s{L-)#T@

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 c92a0ef6edfb246cf8b2b3179d2ff6b628a07a2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2128
zcmbtVZC4vb6n+Lm7Q$iz1qyvpv@HcJtWr=5NXtvmYC>s)R9dx8c86r>W;bpo2>ug)
zK|j|I6!qxwvp>Lp<IA1h4J5!hdX68mGkfQ`FVB7MY<~air(XfgK&H@znG|O6UN_#y
z2l{cxz?`<scVPh^c4E=M-4yO&DTQUM7+5usO`!)fomkWBN1gasulM!ilN3Hh&OqM4
zIzw_ndQvSiw2zH%F(g)eM=+#w(i7|TN>K!xyy%jpFX!9b-Qt1N@3AqV%Cg3=oU{Fk
z<<z7jxN8-8O%z11Cv9QnWK9WA1lF3|-}EasSNg;iYQ^`I*jJ77c}ieMru$Tm<gWZq
zI1Hm>xm~`;_pMswX0^I!_k^eBb=~bXn~J>lAJ7b$yijG|+28@M2qgkykcpG8ikb@i
z1D(1}>@!>p16s9jT&wUfm)*BTRY~8Yat$Ytd!cWPsVnJPS+8CZ0go|^!t|a*SPebM
zcd)gW2h~PDCnE6aPzz^bEK-!7g5vh`Jg<gg7<fQKLDDm%3VuDX#hTQ*UH_NPPwD<L
z3_q%SN>;>{tVz;$$@6>_(xB#yhUrf<;Kzs7V^KVo(8NUy8Q3uK5Ra%F69sIV_zWaZ
zT4xE{7&XDfV|;F4+r$$*Ww;rS!<zI$<%78hHgcmj;)p<$^cV$Nl}s4O<zC5pP}~)^
zGVq0oFY%RuXC}S|Q5iVS)hroldE#17f%Hntb?H)chN&~@vq9hoO{obz5(!QvnJB_$
zU~_uom=M@8P%=@*5W~Iydlg7BUFb=>TSvap?gr1(vqIB#%s*;ko_oBcX{Jg-MJ5t;
zcx?RqVWY`Pmw7Gk2O{f=3SBTl)5qZnL$^m)Ha0T!HzG8tLC%>I!J=dud1iq1oo&*x
za6kfAD34!P#4LhK-`XIZ6saY6MTb7EAbq}e{Gh_g=T4j>EGE)-{%I7axxScmGm7Ct
z7`HVY-SDbT?s`<uIk7c?B(GM5M^ia@9-t|C%e)bh7JM|v^JgoI=acZA%8x>v?s`m=
zVOoz}<v@R^>|JZuDcaUjk$aBs35TZJqnkqCtrb^ruU_3OQ$wljv|SeVbKw-qb>;Zq
zdUz89^k+jOME^YPw9<v9=P<olv@%*dCSHNPq)i(x(K8tu)3{7~GXmfWuF@OB>v)4u
z+Ig0KZQ6F)u{U%aj1FT*?K(o0FuX-B9r{I^t~H{uei-N=+s+Z%@@)Oqk7#H39$U0Y
zF#Lv&^~ob7e}K`~nfL`=+wGHuBcu+|{o?OG<`QK889m#t@LFHG<v7#Vdx*?%;t+j@
zxDdi$9HIXu<xb-r+$MgBkn=R{fPQ)#ApV1NIz%joiS;GIT_xmYVtfV9XkVnN1u@Y5
znW3s@F@fv2LB3S~G2xw<aDwooxJm6u(x+?;<0QfaA$4b?v$yH&7FjZA{}V|AlLn?-
W1J+b?v)ZT(-SBrYO{<pZHt-Mf<}^hB

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 a146c32394edc344af754f4308bb83853cae96ac..01f2666c1cc0686227a6f1d5e5e99f5197484544 100644
GIT binary patch
delta 123
zcmca9cT;YIHeaGY0~bR810O>mgD67~gC;{TgFZtDg9$?@gFQnSgEvD2kc?!AV~AoX
zWQb;HVTfUv&JfG63MjIdA)es^Ln6aHh9rg;49N`t7*ZL<88R8A7_t~u8L}Dm81fj6
Z8S*Fh@Xg~aXJBWjVBlt`oNUam1^^!W8PWg%

delta 123
zcmca9cT;YIHeX@@0~bRe10O>WgD68VgC;`=gFZtjg9$?zgFQnygEvDYkQK!c#}Lg>
z$PmNO!Vt?a9mre75YMoeA%WonLlVP1hGd2p3@Hr%7}6NU8L}9q7_u2v8FCo)81fm7
Z844!%@Xh0_U|?scWZ-6~nrzIk1^^|Y8SVf8

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 627c99dd8a070c0a7fad40e9a90fcd6ddf25537c..788520575aa06f32d80620e5c908fbb92d6fc5cd 100644
GIT binary patch
delta 636
zcmXYtOHUI~7>3_7m!9b`NEv9cl+s#+(spXOt5vby5h*b#(bV0vGzcP^wz?%I`~fm6
zS0-*)>!K1(_yMl;2lxwgp<Cnaoyy{T`R?!coFCSwo|TV(-X8&&!>Wl8vJyEH3bG~~
z<PDrLQNWa+nKm$EVAez*<_yf6SispJ&f&aCQ<S(MadH2FC&FGx8x;5Uzs`GAG3_Nq
zJl$JqyY)w9_vxBj+ip-nVoV@ZZnPghS-<Nx-N%h~quKHfL|W~K?R^%hgv2Eai?}Qx
zThHqCMyn-JvTy}gEnLHOZ%9dw+`vr%;Yi%Fu!P$Z%NFin#llIHy%)-w7gN9Whqm13
zZeiQq*(g-n&CQ(+PuKRm?@A_uQ)CH|9mEr$GVOr(N{j3cG8bS31QDjSy1tGGh8PJ7
zL^(4+HwhJzxvdXSs_&qdbBEAgBJS9_dWb*=^1fpmcF=dSP6y_joZZubwW=;?VJ(03
z8mW9(n<?sV(Hqq}I8h8Z(Oo^-o!ryJ!QU@jr5&&OzkzZp{1X=m06v2leFPXL!Whq*
zWHrN6r+8?Qr<Pb*Mhq3kRm8E5QEVd7MO)(eCC&`9uCptM5!7O&pTz`QN1^$2$K<}3
vV56X94N3l>LXjd;lvQz>oi@~8$ViO;Mo?lx{KPoY%<F=K{?|>?D#-i;NBCcR

delta 836
zcmZvY%TE(g6vn^Xnf6YHL11XnqD3rE+hPkSDELAI1Y6`K2yQG*LlA-$s&Qk8gy_Oo
z$V4M66F2URxG0Sh_PX*PFmVHMrEz6qg8H?PuyJ$FJ+I$A-}#*P(-`~o=lwc>qZrlU
zLcK(T4jbw<_;eJbQD^0th9(`&IG(MX(9oixHCsHX;gpWkIOD`wwCObGB-%Bcm*|k_
zT#8srzZ$Kp!dog50`AE5*zH(oIyN&A>bMh6BvX?&W?HRU(df+|OvU0;(O7aQHa?x;
z3KCrsl{rki^-|O*Zj@Lbg|E`U1$0aF7`TXtfSkJ(k0<8lB%%g-amhd*`Yqj7-ZOwf
z0TCp~zz{A=3>z516$1y*El~WQRk-1|C#xGzpKm^UyZQLd#@fP0Ci7$Mp4Dj^Dl6O_
z7);Gh&P?#{iA1U|HX9SDUi#{?8dTGIVf$_^D+}{D#Ot_tRq$ZsqJ(xYqY%BIxBFKi
zR&wQiw2oZT2@l`Kb^}VWpON6cJHz4u6iDVCeSmFr6-vZ!s%hAx!3-SB@CHn&WT2(t
zoF568x|zq<h(C~qu@W@%)7aCiG^uX2Zv7Q}b#Aqx#r_Tj9(x*vEslW4?r~)M7gh24
z?-!!fZPX4Rx(m;-&0RJXYSeWTMF=CA^YaR_s)i{XC}6pW)})SN9>xVf^C3oI>TRaZ
zHfrpG7yT&17~^Xw#}qr0@DW#mSybXKs&F6Gc!=8El?F)dBG1biJ13nu$d>~x>?zL<
ztNe1DfHLma%yb1I3Q-<{s+r>%cTTKf5jDgL9A>r(>K4Kheu=;qoDxCt8&!W%2%AJ5
O^AHk8*c@WB4dH)#3z2I8

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 75c092051c86a728b4aefff834cd4ecbbc60b30d..ae6ce67b3531ed84500519d1c339a8bfb8d73779 100644
GIT binary patch
delta 979
zcmXYwdu)z(6vsd3r(LO3r%GFERpVY}=u2c-Q<u@9UYAZWW!^Db_qnbc-ep2$bIJAy
z+EBMY>QYlmH`cAl%>A~FR4Z|*#4T1fGrJ_+7t518&ztw0=XXBmbI$X?SK}*L)hO7E
zP-2K6j%b?edWF`+(}4thv>=s4`qPp@B$1)W+q7XkZONfMbCk7^WLDFWt#sxXT{uN|
z&eD~0bmIys+|((z>46^@PJPuV(=(HLs#K!WGD{;Or(56+L8J;IO$oge>a9|JbbMdE
z{-z@R1kqm*>4F%b*9Hn=kRS#N!Y_y+f*2}@VHA<YPL<fDB4x^~U<5xf(yM;Cpuv1X
zgn-Q|UEJ7j*2+5@mE_e%bq!XD5XLI_E|CNTks~MX5z7R*m`FR`S8tQl+hk?t3TUeE
zW(#YYkfsZ21|yj%s9DPVK$&y(&wS>wh!0u7N4f{e<1_v8_?Y!V&gT=h@hLl4lFdGr
zQqD3?u$+s0&Sh3`gO%K46}9T^Az$(o&q7#Z5v;XX)>#tk%}2haQ(zfvu_0`*VQjQ4
z3N64Uo5E(B$yTqfNqR~PMlo8B)w^5`RkQUihitWML@GO1wj8OJ!j$L3nPJY$i(U|u
zsQ5IQHnm7dvHXRD^OuG-?d0Uo7n9^=#f;Vt_0y5tRbYpPxKsXi$y>38_?33!fOcb#
z{FTVxUX6F3Mp&w`?H9^78rMM?KcvFn%3!$+elJ@UEa9*u9N`O&s`+E`b%qW6NFm4N
z?SxJ~$=BMqa!v>Nj`Ip#(ETEn{KO-E=3joXP%c?Gm#ra{Hij!Ui7Gj%wz*ujd0ev~
z*UjUG6>`&xsIg*h*=}yz5$@O-?%E~pSrzxKnqRGkTD#9fd%`2D<2M(@@2(AxT{3Zh
zyI1+cy~Y#g<4>2yQ}-5sxxxJ7or+CQeIfs)XX5^sAL<714r8P>!u5VW21m4eUA;g1
yGU8n~?NFv<w|2>%KQ3U2UP;`z1k=zQjjSF~T7(2O*WSWNu?F<CaIa(YKK}uPq1uc9

delta 997
zcmXYwdrZ}37{@=)3n*$_Jb?$8BqU8m%#>5=9J3LL8bW$h6w8V8N+~Lk=IwM@t993(
zn_5Qm$}BArC2yIQ<Sj)@ok8l9oTjocTXW8`uhu`m^X|OA_jx|g=llMe0?mQV??;FH
zM36`n9f>2EBpxD-PIM!M0I6j0Fazn#Gx|4=E{vcn<Fz}L?v#<i0($TPkFuIx)RD<y
z`f^k!kMTG^^8^>^!)5xB4-6+#J!<tEBut$)t6H!oDrUMB4-mwYg2>hjPiZSh?VeVf
zfhv_Nh(THn7Q_%i<muQ@LF5bKSwRdF#Bf0b1u=pu#_$;<`J7Q|RmeAtW<Nz<W9&z5
z<`XUiY*x*p_W5RM-cetw*X-*ZIwwk0GLi|zFi{XM;AavEOqQ1^ntLjbF-<d-Xr}1`
zDi!KWLYyhQSwfnvR%NPCu2U5{^)fS<uhnbJ72Z4+5@Hc=>*?_d%XyU*yuljYWCL%F
zXN$IW^9~1jj}v^zX%=&VC0y0(zq6DUmT`;a7S0Nb;$ur-rKR$T1*o)KKD9imtbkQE
zjMX-ZHCD`8D`B0LvfgI0!MpunZe}N$7$eV`p8}bKNSnrUJdY7$6Et2BN0w@q+z)7m
zg?Z(1bNngVe^KsDV-j91hi$<X)VTNz=k<*Dx67&Jfx`5RT4Jlc0)J5`Nnyd4YE`XB
zYh-h)EN)YzU+LED(QVl-n>%E4r$XPQV0SCbuLZSFp?ym+-w9#A9M{S30U12V>m1@;
z-LAzPk(Oh!cZ!wNQ^|2zJi!<IsOmqd(#eoYo#A_3zj_+9YUBpLaEG%N!8vQod27c7
z8_PwTOp^@#YUNzA3a(g)-^}BxRdUU$xNaM1woSCyK5p0#{9&iKX$|~ojoh*(Zre5P
z*kAl@clpQpxa%G<T)HK<c0J5oPjfC{VQzqhyFnJ=hFU9^Z;{^KgxswEqG)wb<Nr}a
zxFHlVR+6J!_We*Cajw7SzxS<lbeXzkL8(u3-MyT|VoUMXCyq;wR)jG`TP!|nPqO*w
QYH?&*2l|@dOHIoD7n`cvcK`qY

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 25dc20ffd802b0565e7791909808619f54d3aa44..ff2f1412a79174de4ac9e2cd0392ca2e02dbd0e4 100644
GIT binary patch
literal 9522
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
a7s94PJ41l>=7k*=$hraTB`T7E@BSaR$5|Nw

literal 9729
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
OgRC9U8VTMcH2p7zWTb8Y