From 312af71673fef5440118205a34a1c3ffebfdca2a Mon Sep 17 00:00:00 2001
From: wubin <kgdxpr@163.com>
Date: Thu, 6 May 2021 09:10:30 +0800
Subject: [PATCH] update

---
 ...04各级各类民办教育学生情况.rpx | Bin 22869 -> 22873 bytes
 .../005各级各类学校女学生数.rpx     | Bin 26472 -> 26470 bytes
 ...04各级各类民办教育学生情况.rpx | Bin 22779 -> 22779 bytes
 .../005各级各类学校女学生数.rpx     | Bin 26378 -> 26374 bytes
 .../接入示例/JavaDemo/.idea/workspace.xml |  15 +++++++++++++++
 .../com/demo/index/IndexController.class      | Bin 3133 -> 3133 bytes
 .../java/com/demo/index/IndexController.java  |   6 +++---
 7 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Report2019/004各级各类民办教育学生情况.rpx b/Report2019/004各级各类民办教育学生情况.rpx
index 18a655d78de5afb17b069fd5b2dbab9766ccd159..5f45781184089d20b5b67494a92bc3a215b8c9ee 100644
GIT binary patch
delta 126
zcmcb*iSgzpMvkDsz#s;ONY9NNT>6vm$;M4Ckd@<AW?<A{WRQKjcG=U;-pT7kjVCYA
xoX7^{X3DLfyujFG@&exU$q9;_lNC5PCr@CX0A}M5-@L$htt!udAOKkh!T^*>Fd+Z{

delta 109
zcmcb)iSg<tMvkDsz#s;ONY{-VT>6s>1zIMb)pG^Xag%N2<R-rr-~jVi$Q4XpU~DpZ
h0dM-`1Vzrt3LKo1C$LWdvvG)TUSPad6>K`l1^`w>CG7wJ

diff --git a/Report2019/005各级各类学校女学生数.rpx b/Report2019/005各级各类学校女学生数.rpx
index c8442e3183c56e632dcfc54a9b48f2795d2b703a..685596606a66eb8b593170ae87d04672e2ed5f31 100644
GIT binary patch
delta 63
zcmaEHj`7(!MvkDsz#s;O^stQ_Cd`c2CfhQb3d=p6(DHoOauB(3_tUk@o-J6oxtsZF
MGS7b?0I3II0DyrWaR2}S

delta 90
zcmaEMj`77gMvkDsz#s;O^oWfdCd`a?CfhQbDycl3(DHoOauB(3_p=QXpLWfAHg)EU
rrcF<mZhpFU+4Cv$CqLjbo-AM^J^6zu&*Xia@|)RNf|J2Ufs6wHpxr6x

diff --git a/Report2020/004各级各类民办教育学生情况.rpx b/Report2020/004各级各类民办教育学生情况.rpx
index 2b047bb56bf602ab353b8274bfbcfe228cf827b1..70d9baabd38350629052d63151aadeb0fdf12a65 100644
GIT binary patch
delta 72
zcmeypk@5FN#tp~xCeM?Nn`|H}$E(c1sKLk}`*iKHr=7i%3q*}4e-PlCoTb^!1{Ip9
ZCOSD!Xx8Ka<I9^9SUQ+CE1TR<0RTX_9lZbm

delta 34
ncmeypk@5FN#tp~xCO;ObnOv#o3#8*Fztfiku{TE;EY<)3E$0u<

diff --git a/Report2020/005各级各类学校女学生数.rpx b/Report2020/005各级各类学校女学生数.rpx
index 321c4f2e1d95d78358f9929e7ef1ec38dc0a6551..5b62a847fa4f6fc2b51a011b07995d3406730749 100644
GIT binary patch
delta 65
zcmeA=$Jlm`ks~NDFo=O6?b}8U7G}n4lX;m<h2@@3XnDSCIf&f2`{~+c&lW749L=1-
U#=yY9#K16FkyU2%ZD##s095xGHUIzs

delta 64
zcmZoW$Jlj_ks~NDFo=O6?bk*Q7G}m<lX;m<B~_kIXnDSCIf&f2``LzxPrK$ln>zDF
U)27Lx%n6ep2q|p7&a9sd0D+wz4FCWD

diff --git a/dsSso/接入示例/JavaDemo/.idea/workspace.xml b/dsSso/接入示例/JavaDemo/.idea/workspace.xml
index 7c1e7c5b..61dc819a 100644
--- a/dsSso/接入示例/JavaDemo/.idea/workspace.xml
+++ b/dsSso/接入示例/JavaDemo/.idea/workspace.xml
@@ -5,7 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e8f146ac-f507-4bd7-9ea5-679097c20d1c" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../../../Report2019/004各级各类民办教育学生情况.rpx" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Report2019/004各级各类民办教育学生情况.rpx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Report2020/004各级各类民办教育学生情况.rpx" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Report2020/004各级各类民办教育学生情况.rpx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -118,6 +121,17 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <recent_temporary>
       <list>
         <item itemvalue="Application.Start" />
@@ -139,6 +153,7 @@
       <workItem from="1612597219020" duration="2993000" />
       <workItem from="1615347379769" duration="21000" />
       <workItem from="1615347415032" duration="8000" />
+      <workItem from="1619600842667" duration="3844000" />
     </task>
     <servers />
   </component>
diff --git a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class b/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class
index f07afd2fe7226fc0d9118f1e561a1f52f442f6c9..cf778b406005224a579f8ecdf10feaa815269c59 100644
GIT binary patch
delta 84
zcmdlhu~%Y)9y3pQdAVM4a&cCrUUJ@KE9OMAWCL@Hw8DbIq{1{y!=&`|qN02Q9tKMW
nGe!m}1H;tv@?_KUl&p+0LzBGh0;4>$jO4PU;-t+NnR7S*n9Liw

delta 84
zcmdlhu~%Y)9y5=jfgT8%=owm=Pqt!CG)pQqE=W!@PtGwhElsybDJ`(bPv>E<WH4i7
lkTNh#&CM+_EljB_uF9~?OGzq7N;j#>HYv&5e33ba0|5LN8NUDk

diff --git a/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java b/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java
index adc20560..c746e2e5 100644
--- a/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java
+++ b/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java
@@ -10,13 +10,13 @@ import java.util.Base64;
 
 public class IndexController extends Controller {
     //服务器的位置信息
-    String OAuth2Server = "http://10.10.14.187";
+    String OAuth2Server = "http://www.ccsjy.cn";
     String authCodeURI = OAuth2Server + "/oauth2/authorize";
     String authTokenURI = OAuth2Server + "/oauth2/access_token";
 
     //在服务器注册生成的用户和密码
-    String clientId = "bu3pcf7cl45ug8dup8og";
-    String clientSecret = "01emmt5qdyszh9ndbpbg4zk4tn";
+    String clientId = "c078fqpqbqf91bggrro0";
+    String clientSecret = "01ewwc5wdjhv14nkp2n6hcvbsb";
     String redirectURI = "http://127.0.0.1:8003/code";
     String oauthCallback = "http://127.0.0.1:8003/success";