From 9bb0d17fb8f6dd7f2ec9217ef926d5ea553523ef Mon Sep 17 00:00:00 2001
From: ktianc <2445667550@qq.com>
Date: Wed, 6 Mar 2024 19:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=BE=9D=E8=B5=96=E5=8C=85?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kinit-admin/src/config/axios/service.ts |   2 +-
 kinit-api/application/settings.py       |   2 +-
 kinit-api/apps/vadmin/auth/views.py     |   2 +-
 kinit-api/requirements.txt              | Bin 1788 -> 3762 bytes
 kinit-api/utils/response.py             |   3 +--
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kinit-admin/src/config/axios/service.ts b/kinit-admin/src/config/axios/service.ts
index 192d44d..e86ab9c 100644
--- a/kinit-admin/src/config/axios/service.ts
+++ b/kinit-admin/src/config/axios/service.ts
@@ -113,7 +113,7 @@ service.interceptors.response.use(
       case 401:
         // 强制要求重新登录，因账号已冻结，账号已过期，手机号码错误，刷新token无效等问题导致
         authStore.logout()
-        message = '认证已过期，请重新登录'
+        message = '认证已失效，请重新登录'
         break
       case 403:
         // 强制要求重新登录，因无系统权限，而进入到系统访问等问题导致
diff --git a/kinit-api/application/settings.py b/kinit-api/application/settings.py
index 9cc2aad..a615ce5 100644
--- a/kinit-api/application/settings.py
+++ b/kinit-api/application/settings.py
@@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
 """
 系统版本
 """
-VERSION = "3.7.1"
+VERSION = "3.7.2"
 
 """安全警告: 不要在生产中打开调试运行!"""
 DEBUG = False
diff --git a/kinit-api/apps/vadmin/auth/views.py b/kinit-api/apps/vadmin/auth/views.py
index d756330..c0ed602 100644
--- a/kinit-api/apps/vadmin/auth/views.py
+++ b/kinit-api/apps/vadmin/auth/views.py
@@ -246,7 +246,7 @@ async def put_menus(
 
 
 @app.get("/menus/{data_id}", summary="获取菜单信息")
-async def put_menus(
+async def get_menus(
         data_id: int,
         auth: Auth = Depends(FullAdminAuth(permissions=["auth.menu.view", "auth.menu.update"]))
 ):
diff --git a/kinit-api/requirements.txt b/kinit-api/requirements.txt
index 3cfa304cff12d015810b94344bb0f78b1624c331..6d65bda5798bb6eb9a3a927df31281de0d4f82f6 100644
GIT binary patch
literal 3762
zcma)<UvFAR5XJYoQa=iofjCJY`jE#~jg-o*+CD`XFs6ii=>=l!58w9u<}mCfvFplO
z8+-nrGc&vX=kG~bmbTpL`=>H5+w#4>F3UxEt8-btE#DMt+?AcaHX$EN_MOhKC*MeK
zSMKCxS#C~VuD<ZnDaK41jx!4Bxu30k?B$7k$Ym&<aWBqRl0|70tuL=WsA8=QmSuXf
zAId{tgA6Bert;D%-mDCy@9gICPJAL%Jn%3&=HVK@_Ao0CvRLa(gw#^{m&*T*zF+C{
zRpgU3kIJhTyphLDep-1Vqrn+2aKuS$p37;WTz10bUOyk?V;h+z%Xml@pYzblf?QnF
z*I7`}OURJHB<gq07ed3m^;}e23{-tTdgcuqZ~v!<em7<G;fqyg{Db&(r(w(K*ZLq%
z8lk!owse0Rziq|aDmto-o+4{d8jABeRaE}p_N(ZnYW=zwy-}oAG0iUhyOTGtsy&N-
z&Tu0sla4pgd!v)gZ#7ZN$n^G1o|SH8+h{(Bu~bfT`2kgYxuV*Ksk@d9awEpRFyCyE
z?wI2!GVw$py@?s5igVx2bE>#qWWcsEDwo35v(27h*6=gcK1&_{y&^FcOOwc8E?<K{
zu~SV<`?5SnjKrwUJbQwTvWmFuM*L>9R#KRrgrBS$WL_WhX(c)52YdH~Gw$SlEibc(
z(D&X2uRF;W5o4nYjP0w)0)#zH-mKtjp7Fw-b`Q){E7M;))fip`hvs^&EN0TGvpVeE
z1V+pgkv9fDh{JK5c{#|-JXoaTn#h}u@$G?T<@{E$w!+5SC9z{ZJ#V0M8x_G#6Fi`w
zaY5Pr0Xp-e4w<3>gZS~5T*S1(BWyLHF^bG<K6m<k7!vII6Pq`nt>>ZRs&gl#23*k-
z=ac9xQ|EAsF;bT#c1xkprp?^lKg=BW0Nw9>InZCIaUy*-fGwD5XANpkS%J`2p7!zu
zN6wJ=<`BC-!#ADc8@+N;8KK`nv(rgA(cMMwWx0|D68xG4d?V>3qZh9A`Bpig<w;1M
zm;*5ELWXsn#I<ZcNeWUhX`YQBolKNQIw0mLalfJAE~qz(w+M10fNe^#J}45|5#3&_
z(Fr3^bO#~zYsgdBO14!+wJ!FBGXqn$$Rsu{lVPn|9~#)3XQV_1+w{Q82>kEE)^k$(
zm%Q=N$PQ~b;}z!aLplv+*}?47%#t~vI&0LOGgBmb4L##fUw-J)e||6dy+tO(GuB^f
zd{lIJ?XzC@<OlitvHVtkIb~H}p?IP%z|5UxyQ~b`_d3_*=kin7gB!<N3Hy3OQx!LS
zQ$C+`Yj>aP){cW4W-xKZ!uJ}{|0wU2fn#Ss8dJY3^VRD&apsNeFZC<4xYJ2K#=YF(
z$`ek_j>tRMJH&N5A`HU)@^}M2HG@XzoqCA7kk_*3#683eyN{pJ8<by_B^_9In{Odk
zdM*5a5DJ6xK|d=GAjK|qe(bAGKG<Neka&(`4&6CBp)yl$$jo$|(Y#6By=EbKwu~3^
zqI{I^Lqy=_^Ihb;jbqyEl@D*Yd>2%|{o9Xi$K>(f!}!Eg?XbOKFi`{fS?Ci}QTePB
zx>wJg-$7IW>X{F3^<A(-ulq%S4%6TbdoTYt^4>~orOz2@D0%e)3S<3+S3f#zOTXVh
z^?W{l4^9u7zD_!@Via=sx$D?1ppf?L0<-!ktBt;p*v7XJj6W(*UZxj1pLIY6y;^bA
Q@c%kQ=Vibhg=XdcUq$mKu>b%7

literal 1788
zcmZWq%W~T|5WMqW$RbER>;n%uW@}yLEhm-TQwjnh3K0n)0BDK+`t1f~uadoSFqoO1
zo*qydcQm7pT~}8RRb5EqPAU1WYpcgf(DX8$MswhW?Rp{T-XNf<>h(rE&B=^iC#seK
z(F|6uCjFzH4o1-{+H9MHJV-UVxi1w`X`753Gk~^gaR1KVFL8>}o2C}~dfRN*qRr;l
zTiW*C8Jo%#Mh#p5a-V0ANnhkrMsL_h#(nR1UR#v;NYMNaBx%XOw%Y!h80Y0Jc=bR0
z-~WyZ-II>H_85JgKoue7)|c6qen}^1%h;bw<$`9<VngOf^PBrT<uQmIgRON5ZT4ka
z{5sDagY04)r@1HhaWFw2R}&#|v8qgF(r!*&hZ^LKhton#P4!sFlmd%jG{|;PVez-C
zqEI>{a|EMJ4ZpyE_k}w00G}+bPBKKDO6$S|^lv(_G^eaaqt0FTP>BjLZgfFTnc+>f
zgFW4P5U7eeK~1h_R@@~3Hw5WVz_<~>ye}Zf6wsxBX6vH2aix&VZBR_BKIY_t3I`r=
zPSIzaJh>|ElW}$kZie((wJwe_CTN00h?;@N;NG+yQHxhL05$}T0}Z>)+zqoe7@0-k
zHOEPa9MAD_t=4%Gbd&Am+^YN?vhl(-^G@zeZ-Kc59cJ<_B<QA`bdtSHINu|Mxbp-Z
z-5eC>j#O~{m~`akuJDm>bi*8GntK#~lIP49aN|3iXa6FPtJI)@$tCwOs%ajR>5W2{
zz*TJuJ5L_mqr)BUX7%Thvj<v!xkAzq1nRi(BRcSrUz56UF*ckE2C*r;RA)IDJK%(x
z@G?ep$;^AY%{aOXEDEtM{34^xY;IA<FUnI}K#5(=b{0nOCUk+?e7yY9OFS-kdm21l
z?T7vSZmo93^YX{HFTBDT`(=U*Kn-+=4A0Bc^77Z8goL5Nn>Vv}N!wQ*VsGCMGflt*
znz+r(`_HE*gpxE-+}=#QpxO92>zMNLwoDwT&kfcs8YtklJ<%F0)5n;A<I|{4n!CxT
zx7il|9hG140wW*h!|A`ge10mQKWE@5xG5mz0HG$3gC%FUcQJ_~{p_dQEW72>fzUc{
z5e$sxyS}2=h}}SP00h=qmhaRfHA$Pph`F_d#b#!VrIZ8S_1qwbH^1KYg0Nv<WKySr
zJI%jNQ(W{RI(62J5Dd5&+cqWM4#nr`o&Uebc>NYkTHg_Dd$FJ`dLJQ}H{<hvOJF&Q
YHz={vuK>|?te9>5BXl@Qg@o+)UxltA*#H0l

diff --git a/kinit-api/utils/response.py b/kinit-api/utils/response.py
index 28d236f..920e9fc 100644
--- a/kinit-api/utils/response.py
+++ b/kinit-api/utils/response.py
@@ -8,8 +8,7 @@ class SuccessResponse(Response):
     """
     成功响应
     """
-    def __init__(self, data=None, msg="success", code=http.HTTP_SUCCESS, status=http_status.HTTP_200_OK
-                 , **kwargs):
+    def __init__(self, data=None, msg="success", code=http.HTTP_SUCCESS, status=http_status.HTTP_200_OK, **kwargs):
         self.data = {
             "code": code,
             "message": msg,