From c4c8e9989b34652341fc11ec4b12d869d5cfef46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Sat, 19 Jul 2025 10:24:08 +0800
Subject: [PATCH] xx

---
 database.md                                   |  52 ------------------
 gateway/.idea/workspace.xml                   |  11 ++--
 gateway/target/classes/application.properties |  15 +++++
 .../tuoheng/gateway/GatewayApplication.class  | Bin 0 -> 748 bytes
 .../gateway/config/SecurityConfig.class       | Bin 0 -> 3453 bytes
 oidc/src/main/resources/static/login.html     |   5 ++
 .../target/classes/application.properties     |   1 +
 .../resourceservice/HelloController.class     | Bin 0 -> 1223 bytes
 .../ResourceServiceApplication.class          | Bin 0 -> 788 bytes
 .../target/classes/application.properties     |   1 +
 .../resourceservice/HelloController.class     | Bin 0 -> 1223 bytes
 .../ResourceServiceApplication.class          | Bin 0 -> 788 bytes
 12 files changed, 26 insertions(+), 59 deletions(-)
 create mode 100644 gateway/target/classes/application.properties
 create mode 100644 gateway/target/classes/com/tuoheng/gateway/GatewayApplication.class
 create mode 100644 gateway/target/classes/com/tuoheng/gateway/config/SecurityConfig.class
 create mode 100644 resourceservice/target/classes/application.properties
 create mode 100644 resourceservice/target/classes/com/tuoheng/resourceservice/HelloController.class
 create mode 100644 resourceservice/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class
 create mode 100644 resourceserviceb/target/classes/application.properties
 create mode 100644 resourceserviceb/target/classes/com/tuoheng/resourceservice/HelloController.class
 create mode 100644 resourceserviceb/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class

diff --git a/database.md b/database.md
index 5de1a7d..327e189 100644
--- a/database.md
+++ b/database.md
@@ -65,55 +65,3 @@
 > 主键：id
 > 外键：tenant_id 关联 tenants.id，subsystem_id 关联 subsystems.id
 
-
-## 二、子系统（如订单、支付等）表结构
-
-### 1. 业务用户表（users 和 统一认证网关（主工程） 用的不是一个数据库,表名可以重复）
-| 字段名         | 类型           | 说明                       |
-| -------------- | -------------- | -------------------------- |
-| id             | BIGINT         | 主键，自增                 |
-| user_id        | BIGINT         | 关联统一认证网关 users 表的 id 字段，外键->users.id |
-| username       | VARCHAR(50)    | 业务系统内用户名           |
-| ...            | ...            | 业务相关字段（如地址、类型等）|
-| create_time    | TIMESTAMP      | 创建时间                   |
-| update_time    | TIMESTAMP      | 更新时间                   |
-
-> 主键：id
-> 外键：user_id 关联统一认证网关 users.id（users 表为统一认证主工程的用户表）
-
----
-
-**主外键关系说明：**
-- users.tenant_id → tenants.id
-- users.subsystem_id → subsystems.id
-- tenant_subsystem_permissions.tenant_id → tenants.id
-- tenant_subsystem_permissions.subsystem_id → subsystems.id
-- 子系统业务用户表 user_id → 统一认证 users.id
-- 业务数据表 user_id → 统一认证 users.id
-
-
--- 插入租户
-INSERT INTO tenants (id, tenant_code, tenant_name, description, status, create_time, update_time)
-VALUES (1, 'test-tenant', '测试租户', '测试用租户', 'ACTIVE', NOW(), NOW());
-
--- 插入用户
-INSERT INTO users (
-    id, username, password, user_type, tenant_id, subsystem_id, email, phone, real_name, status, create_time, update_time
-) VALUES (
-    1,
-    'testuser',
-    '$2a$10$wH6Qw6Qw6Qw6Qw6Qw6Qw6uQw6Qw6Qw6Qw6Qw6Qw6Qw6Qw6Qw6Qw6', -- 密码123456的BCrypt加密
-    'TENANT',
-    1,
-    NULL,
-    'testuser@example.com',
-    '13800000000',
-    '测试用户',
-    'ACTIVE',
-    NOW(),
-    NOW()
-);
-
-租户ID：1 或 租户名：test-tenant
-用户名：testuser
-密码：123456
diff --git a/gateway/.idea/workspace.xml b/gateway/.idea/workspace.xml
index 353192a..fc978c1 100644
--- a/gateway/.idea/workspace.xml
+++ b/gateway/.idea/workspace.xml
@@ -4,12 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b713637a-3b19-4c5b-9e88-95e35dd83d2e" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/../oidc/src/main/java/com/tuoheng/oauth/oidc/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../oidc/src/main/java/com/tuoheng/oauth/oidc/config/SecurityConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../resourceservice/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../resourceservice/target/classes/com/tuoheng/resourceservice/HelloController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../resourceservice/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class" beforeDir="false" />
-    </list>
+    <list default="true" id="b713637a-3b19-4c5b-9e88-95e35dd83d2e" name="更改" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -109,7 +104,9 @@
       <workItem from="1752745264222" duration="2832000" />
       <workItem from="1752751160098" duration="1320000" />
       <workItem from="1752798688493" duration="8426000" />
-      <workItem from="1752886146802" duration="618000" />
+      <workItem from="1752886146802" duration="788000" />
+      <workItem from="1752887366989" duration="14000" />
+      <workItem from="1752887418038" duration="62000" />
     </task>
     <servers />
   </component>
diff --git a/gateway/target/classes/application.properties b/gateway/target/classes/application.properties
new file mode 100644
index 0000000..83f1639
--- /dev/null
+++ b/gateway/target/classes/application.properties
@@ -0,0 +1,15 @@
+server.port=8080
+
+spring.cloud.gateway.routes[0].id=resource-server-a
+spring.cloud.gateway.routes[0].uri=http://localhost:8081
+spring.cloud.gateway.routes[0].predicates[0]=Path=/a/**
+spring.cloud.gateway.routes[0].filters[0]=RewritePath=/a/(?<segment>.*), /api/${segment}
+spring.cloud.gateway.routes[0].filters[1]=TokenRelay
+
+spring.cloud.gateway.routes[1].id=resource-server-b
+spring.cloud.gateway.routes[1].uri=http://localhost:8082
+spring.cloud.gateway.routes[1].predicates[0]=Path=/b/**
+spring.cloud.gateway.routes[1].filters[0]=RewritePath=/b/(?<segment>.*), /api/${segment}
+spring.cloud.gateway.routes[1].filters[1]=TokenRelay
+
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:9000/oauth2/jwks
\ No newline at end of file
diff --git a/gateway/target/classes/com/tuoheng/gateway/GatewayApplication.class b/gateway/target/classes/com/tuoheng/gateway/GatewayApplication.class
new file mode 100644
index 0000000000000000000000000000000000000000..0e4fc1f970846a280ba821c5de9cb097ce7c3213
GIT binary patch
literal 748
zcma)4O;6iE5PcgG986juP$;w<xS)_j_eKw?kZ7d#Vkjag9C})tjkDC=jn?Y|KdYx!
zJ@g0gqfloJ5|)}n51#RS?3*`l_x|Dc9{}&M8=%3kpO~Dx(oCgJc`BT|5qJFaqd%U_
zGL;CYj1JIbSiKhC1<wR^eu=MT;usb`D6QNP!$R+1%+MT~D;Z(|OC7YZ$gmPAEl<ll
zmi9u#nPlijCK1_KSmooVWYbMm!O)BTkIjH4<w9wO&ED7OnbpWyrPIN|IK&#(19Tbs
z#-_ZO`TWF+T;3S_jmO3~KB|(n9Xr^-E84`C1RVEjxWh~o#bDl~XdZlGw3D}v4~?Fv
zw6uQF+8j#zvR^{jl-6FKgG_3lNH;ZCXTsBV(o$nMGNn!AC*_6Q`uCRJc_|pS&r9u8
zF2|}+ezexcRkuhGM{^lhf{4-?qFzy!Px5>urE1g%*aIm<?+0kmAKfw8fFe$wk#F^X
zqWz;Phh%*j)UZsp^VmTC1w~7Ei4_9zhYu?-pxtHtUs%0-J|9xW_XY@S7;S7~i}J7O
UYtbVh*T8mVckqV1ANv;g3qYmAQvd(}

literal 0
HcmV?d00001

diff --git a/gateway/target/classes/com/tuoheng/gateway/config/SecurityConfig.class b/gateway/target/classes/com/tuoheng/gateway/config/SecurityConfig.class
new file mode 100644
index 0000000000000000000000000000000000000000..1ce7696ad23842e46d66d7a3d14d7b9135ff960e
GIT binary patch
literal 3453
zcmcImX;&Ln7=A8<2GVH>&<&SrE7$;Srv<G`>JlQ|45c;|>|*Q9a3KSenK*O9;&=a#
zeo4>iIePr;@i%#VCNnV!4J`_M$lN9Geed&b&wKy;`^E17KEjVl^axB?Ud7ZkudLiv
zb5&}!DYs3_b64zDv#6|^Z|m)RW0^!kAiX9xr0GZsFO=4lr3H>$w_RI*F3_8qSQJR)
zy=9d`F9r<s;fTOs!FJW%TBW4?2eRZSf#HH@NoP^|cDRl=6S`~%0#k)O1Ih}V3Sx*$
zs&vD4wDR+1X}bbHX9}LbY6ex`c2`$?Sy7vwziu|gn-*@W68HQK<<r=3xTSTqX?Awv
z)jB#3N1p10L4c$8Yp%8{YS9jC+M07+PfKlkE=|4ERXu&L)s{BpzoO=>l5TdGK^rk}
z0w)CqtXiPGiv1IvIh}b8%s80&<`F-e!fA{qaYi7wZzmae18)ip$(k;EJ`v4rS!JdN
zk=6DVgEnA$v!uiCF9mHF0wbY?XAQg)LObDw*rxBRz^nO|isBp!oHKA9?+NskYPPd1
zF#9@Bc3iwmz!PO=kU+j`Z2w#OvD)Spy}Eo)h6&8%X43RKvQk=>V^;*8?9IO&sCT++
zEVnam#j3Kh6N^bqc2s*&hn3Wii}aT%&B@6WF5^lProhs^lc+li16MIEU{s|p&r5BU
z8xFXTd0c3bPy~yW+S-bEDVxLx0#6SK+E~uAR1l;vgKGx4^kaczVU{TtyG0UZHa&h_
zHpO-Mf5Ov`Ps1>j;xJq{@EJ(JN2R;nD!<a<0f@~fk<8#r1G&)tfvWN=w$3>Y=PD)v
zChWugS3>vnAiFk;;i|y1gD8fDuo`wSMO+Ul+{Eo9ZV5cve@^XokAXY*nvHaAlYMpN
zK;pOCRbzKHb;C3^@Q5HuC<hR#-R@(wQpE-Vvrn@*j5ND!^tiYj)~~>|t_Zrc#OPGb
zZ}d{?E_OY*lW*I4YFKu@l9skNlsV^y50NFlA)MM)6BxCoXFX2`+LzUch*|ItKx+I}
z;Czd4Y<I(3S7xC>%oLO>RO|WM2A1$0tCG~++!FXJ(?(VC$w>Jv=`K4e7%O<*daasm
z6N^c%ZKvblgYBwn7vKAz(Uq@0+fJ>q=Dc*AqODbS@Cb?mC)-Vm*>_?wjYlcA;_nSy
zK!$=((#XVnB?Dh!j(akVITHMB*X6^_kwKt>Bvu8+Uvh3Y7bRf}oPD(@vpe!9VRmhG
z6o|N7;LL8hn}jD&I=r%P)}lZ%u1cJv>w5X(0}`C^9nEi&E0d$(*f;qc{l9Y3gA~8v
z-{9;hzeXg$@fcSE$1zA%=~!xrW2k6}Cwn-ao_Ya3E$cY-0&j)m+e=e*y!#9Pic}91
z0jMfeG=LEbpJ-fjDmortLq!<FIHlgFbf4e?=~NhcZiV-iXhewd;$-4COg!uzo+{RH
z=?~1*@nO94No%K$Y#m>;?2AAgr=~%S(w1=ywb^<Rv&c8@V_L=cwH#H)jh3RwQ6p`K
z`%u6<fhBO4-ySS9T$SSN9@pRScb~t|+J|)GV?4#P#_R`JScc+%lQeAwWvmg}W%^;A
T5N0@Y2=XS^6|P;*su2GGNsum7

literal 0
HcmV?d00001

diff --git a/oidc/src/main/resources/static/login.html b/oidc/src/main/resources/static/login.html
index 73cc932..f754b8f 100644
--- a/oidc/src/main/resources/static/login.html
+++ b/oidc/src/main/resources/static/login.html
@@ -161,6 +161,11 @@
                 <input type="password" id="password" name="password" required autocomplete="current-password">
             </div>
             
+            <div class="form-group">
+                <label for="tenant-code">租户代码</label>
+                <input type="text" id="tenant-code" name="tenant-code" placeholder="请输入租户代码" autocomplete="off">
+            </div>
+            
             <div class="checkbox-group">
                 <input type="checkbox" id="remember-me" name="remember-me">
                 <label for="remember-me">记住我</label>
diff --git a/resourceservice/target/classes/application.properties b/resourceservice/target/classes/application.properties
new file mode 100644
index 0000000..bafddce
--- /dev/null
+++ b/resourceservice/target/classes/application.properties
@@ -0,0 +1 @@
+server.port=8081
\ No newline at end of file
diff --git a/resourceservice/target/classes/com/tuoheng/resourceservice/HelloController.class b/resourceservice/target/classes/com/tuoheng/resourceservice/HelloController.class
new file mode 100644
index 0000000000000000000000000000000000000000..f5ffdcf30f8a079c5d90e338de7c091abba1275a
GIT binary patch
literal 1223
zcmb7D?M@Rx6g|@xc3a9<!77Sc@Pk5y^#cSgAu%LM$RY_P7~`*L8QQ`9%IqwJ2k?FL
z7pRF3;6oYjZi_AO2Y>9&%$+;;o^$WHzyJLB1z;Jg22u=_hVNQB@>{}dT1td|q#7a=
z>PR+(wILkGU-vz&e8&;WK!#!DkRNf&;pDzuKNJnk(7!4@sn;0N<=H)k%(}lXa!4ba
zM<4nbhHdGI_mNu{YM0j?!BDXM26y(jlJU7?%;=U38RqT(fK+AZYsDxTM$5Byf-Tb0
zv9@?XciEb3dR#|}axP!KUv0Z5RBBpDuUYM}w8>T1D9Xf6<Z0=OJsC=Z`^NKp&9(GB
zLc3`Ds%eEm{QN+1R~-B5vvn-$R$Y4g7XRmKy%U;11#ubzeZ-xJK;<kRNGoAr;3kpi
zGT7i@iyq`qMApP@2E!F$$eY5%B*SFVo6>>u-O^5{ZKYbfZ&L%fhmwK&41?Wx6f2J@
zOjDbJh`P2?zRLEhrBl<MepgLAq{_wx2{m^K;A4~x%v_L0?IhH~&0`jGM5+-fB|N=L
zPqw7v#9bz-Z07I;3kK#HhPtA%eXp5^g{MR~Dbn@<!&rH<7f9?wFrJf3N2(?kDgWg{
zFqkCifEq=m9&VHCQAhEj3QvM_B`#fby|z$twPbwW%2?y$m!@YS=166~wqS^j?hap-
zdPilW(FIbpqsgMbK_`n=Mr+^PDa>!lb&me=HIT&s{qt=HS_kPw^~NxT8lim(qbSfi
zMAk9-#y^3DxRC_@f(+eLf}bdUJjE@$QkW>*`Hs73e5e#2oZ-<KD(A;%g%_ReS9+30
z453IU<K!l#9itS}ly;ud#*m8b&>cu7X0U{p1YkLNL7hu1D`ZLG71>gFodAt#Re`_W
Ch&Y%4

literal 0
HcmV?d00001

diff --git a/resourceservice/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class b/resourceservice/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class
new file mode 100644
index 0000000000000000000000000000000000000000..c558287df0153a799a7d02790457f71c97c70ff6
GIT binary patch
literal 788
zcmbVKO;6iE5PcgG986juv`{D&;udn~-T)~TQX7erp@^XLz-etZ&Qg0fTCZvU7N=G{
z^au1uRh>1F@F84!@Qml{&CHwq^Y_<p0LOS2puupIn4G)POr=h_m4zv7A`5BnRU-M-
z+#WsJA7`^nCBiAA12h@d@5H^}nV`zg@tsT@!}15El{;lv>K%?5nnQCdLo8vXgBF$<
z)*_|lMVZIaUW+)B4Bf~iA{z^<yghd|-Bc9}C(-{+H=xeBP?}+@cN0BLIdWF%bZ|Hh
zv4PD1U537~DKBQ;Kd~a0-;DjrV`Cg2RnFSZ9lXM8+RT;&9QSIt!%P&#U{R-N5qx5_
zliwX58a+{IY5n50KIHaczl5+U(XhDynb<#<Zfb5Xg&*5VONrsAI^UV{#O^<Tz4x9H
zhMlWYJC)0^DwH2VYvZcx64dF!$tz++=?tw<jV|XjeImwcD-3V|Vv61w(4arMJ;{J9
zPMVQ!^?#uKP=!O1J`74&CE0mQApL@@6}-e6f%xL13Jhp>S^p>2zdY546!EzM!Wu>!
aTi7Q58~R%G7)Uj+Q^{StCGFep0sjE6K-3-p

literal 0
HcmV?d00001

diff --git a/resourceserviceb/target/classes/application.properties b/resourceserviceb/target/classes/application.properties
new file mode 100644
index 0000000..8d51d0c
--- /dev/null
+++ b/resourceserviceb/target/classes/application.properties
@@ -0,0 +1 @@
+server.port=8082
\ No newline at end of file
diff --git a/resourceserviceb/target/classes/com/tuoheng/resourceservice/HelloController.class b/resourceserviceb/target/classes/com/tuoheng/resourceservice/HelloController.class
new file mode 100644
index 0000000000000000000000000000000000000000..59c413afafee72fb47bfc1155472e569d315d3d5
GIT binary patch
literal 1223
zcmb7D?M@Rx6g@*rcUww<f>ji?;0J{Y>jwy0LSjgikRk~s7~`*L8QQ_^?q+rt!UOm|
z`U}*=2k@bccc(?5{J|!j*?aHIJ?EZ#=l7o<zW^*@C4)XBEF`n&M~Y$ifFE+l<zCa-
zsvn4kW=O3_PwG{ML}_N%g3T~u4n<nJ&N>fUn>@(CLc+!XgVh#c$eY5(Aj8DEa9zK+
zul#m#TZDe38lqSe>QFYs<N$^+Y+)peJVqG?&y!L@LJJ}SUoKU98C9-&X0Ezy++av+
zNpv)C6TzFfWnnyv+qiS7%-V6NMVpFhL`n%y@6eS^>AEsB6>ns47xygO&!UJ)hTJ)w
zs_!+a;6v_4Vr!paw6t-NNF1)%ctA(OPRTYN5p=H*7N!}>4ZrQ^$ZrW!UUjAFUUQ6!
zYrdzI@47-UB-i{s!7x;no_HU%>q71Dx=WsX)o*Zjmn#|DU1w6a;$r5i|AA3q=x@c%
zBVkJ2s!YSFHx#ppV&HqBA#tg36f9gOaU7fxS?sjwEYHe?uGO@XB-aH`XZ$LwlrUYB
zO^@qH5!_NQn`>to-;TU^9(H9YNt`#H=WDJdRl%@O^;OdegP6p=;%#x{tIy7ns5^D(
z?K%A4S?8V5Bta09C5cS$88QwJq|?<aQ!{h^R>ln(>*?KmEEbLRwee_L^m*$mn8agx
zvGK1DL;xvTOJq5;Gur!SPr$yJ@C>bS7)WE5)@<hh%6LK+4Fu+qFqgj|X_7iWVSPM7
zx?0X>^4agmCGeq~A3H_i6ccCWRQ_T2^DCuEAciRrlNf+rJw}nk6us>^3>(-&Cv_Lr
v#x!w#O7PFj4Voq6c}|`e<mtl#7HQ9s{gVDmpTI&almC^8zBbXgtP1cKvI99D

literal 0
HcmV?d00001

diff --git a/resourceserviceb/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class b/resourceserviceb/target/classes/com/tuoheng/resourceservice/ResourceServiceApplication.class
new file mode 100644
index 0000000000000000000000000000000000000000..022f4b02713d096bfc0d265da49bba4fec12986a
GIT binary patch
literal 788
zcmbVK%T60H6g>_J6VmVsE#*;!*o7?W9aIWJqLI3qmWrUT=*lygiRp|Tc|5>xbp>L<
z2k=o9*F&Ua5jI%zy}EDvocsL$@d>~ob{eQ)E<m-38s-^RuEmYusn7{Ojjm<v80L?Z
zR_>T#uDw49P-i%ZO~zeehLX~(%uQiqnM-@4V#&|OcK_8r8I4jE3#W{3pn(qonoTTX
ziJ@a`!t;?;I=QkUlefnH<&iOt_e<wgCC#>lW{BG1<bAzV<azhcl&9}}v+jO4t8;9$
zlXs5yjJ{GyVMUb6sS)J%;Vwh9XD%hfa;UWYRb-L0=RTLA6`EM217Vf7$Ihx7s+{3l
z_&!Yhyi6$i+j@J}R|XUpHlYb?Gs48zPw9r{^0)8^I%z4f(J%S<q5PY7-=^cMhmv9Q
ztk6zna-eeMA<^2nk}hg>JQK;1BT+a*kd{!&F=O9}yeUY#*h4_;<xd67FBr*XvN&l*
zy4JY|`&WinNcu3SWR+y|H32QGk+p!2_(V;7@j=-PsJDX70~RhO^?sLqZa|AR=~2fz
YK9hfgZjEpzRl#N{x3EpxkNpC?0Js6vHvj+t

literal 0
HcmV?d00001