From 55ccae57f800b5e337f8a93ca20e6035cd474557 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 28 Apr 2018 21:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96JS=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- ...cx => 若依环境使用手册v1.0.1.docx} | Bin 426865 -> 426685 bytes .../user/controller/LoginController.java | 1 - .../resources/static/ruoyi/monitor/job/add.js | 2 +- .../static/ruoyi/monitor/job/edit.js | 2 +- .../resources/static/ruoyi/monitor/job/job.js | 4 ++-- .../static/ruoyi/monitor/job/jobLog.js | 2 +- .../ruoyi/monitor/logininfor/logininfor.js | 2 +- .../static/ruoyi/monitor/online/online.js | 2 +- .../static/ruoyi/monitor/operlog/operlog.js | 2 +- .../resources/static/ruoyi/system/dept/add.js | 6 +++--- .../static/ruoyi/system/dept/dept.js | 2 +- .../static/ruoyi/system/dept/edit.js | 6 +++--- .../static/ruoyi/system/dept/tree.js | 2 +- .../static/ruoyi/system/dict/data/add.js | 2 +- .../static/ruoyi/system/dict/data/data.js | 2 +- .../static/ruoyi/system/dict/data/edit.js | 2 +- .../static/ruoyi/system/dict/type/add.js | 4 ++-- .../static/ruoyi/system/dict/type/edit.js | 4 ++-- .../static/ruoyi/system/dict/type/type.js | 2 +- .../resources/static/ruoyi/system/menu/add.js | 8 +++---- .../static/ruoyi/system/menu/edit.js | 6 +++--- .../static/ruoyi/system/menu/menu.js | 2 +- .../static/ruoyi/system/menu/tree.js | 2 +- .../resources/static/ruoyi/system/post/add.js | 2 +- .../static/ruoyi/system/post/edit.js | 2 +- .../static/ruoyi/system/post/post.js | 3 +-- .../resources/static/ruoyi/system/role/add.js | 6 +++--- .../static/ruoyi/system/role/edit.js | 6 +++--- .../static/ruoyi/system/role/role.js | 2 +- .../resources/static/ruoyi/system/user/add.js | 6 +++--- .../static/ruoyi/system/user/edit.js | 4 ++-- .../static/ruoyi/system/user/user.js | 6 +++--- .../resources/static/ruoyi/tool/gen/gen.js | 2 +- src/main/resources/templates/error/404.html | 6 +++--- src/main/resources/templates/error/500.html | 6 +++--- .../resources/templates/error/unauth.html | 6 +++--- src/main/resources/templates/include.html | 15 +++++++------ src/main/resources/templates/index.html | 11 +++++----- src/main/resources/templates/login.html | 20 +++++++++--------- src/main/resources/templates/main.html | 12 +++++------ .../resources/templates/monitor/job/add.html | 2 +- .../resources/templates/monitor/job/edit.html | 2 +- .../resources/templates/monitor/job/job.html | 4 ++-- .../templates/monitor/job/jobLog.html | 4 ++-- .../monitor/logininfor/logininfor.html | 2 +- .../templates/monitor/online/online.html | 4 ++-- .../templates/monitor/operlog/operlog.html | 4 ++-- .../resources/templates/system/dept/add.html | 2 +- .../resources/templates/system/dept/dept.html | 4 ++-- .../resources/templates/system/dept/edit.html | 2 +- .../resources/templates/system/dept/tree.html | 10 ++++----- .../templates/system/dict/data/add.html | 2 +- .../templates/system/dict/data/data.html | 4 ++-- .../templates/system/dict/data/edit.html | 2 +- .../templates/system/dict/type/add.html | 2 +- .../templates/system/dict/type/edit.html | 2 +- .../templates/system/dict/type/type.html | 4 ++-- .../resources/templates/system/menu/add.html | 6 +++--- .../resources/templates/system/menu/edit.html | 6 +++--- .../resources/templates/system/menu/icon.html | 2 +- .../resources/templates/system/menu/menu.html | 4 ++-- .../resources/templates/system/menu/tree.html | 10 ++++----- .../resources/templates/system/post/add.html | 2 +- .../resources/templates/system/post/edit.html | 2 +- .../resources/templates/system/post/post.html | 4 ++-- .../resources/templates/system/role/add.html | 6 +++--- .../resources/templates/system/role/edit.html | 6 +++--- .../resources/templates/system/role/role.html | 8 +++---- .../resources/templates/system/user/add.html | 12 +++++------ .../resources/templates/system/user/edit.html | 12 +++++------ .../templates/system/user/resetPwd.html | 4 ++-- .../resources/templates/system/user/user.html | 14 ++++++------ .../resources/templates/tool/build/build.html | 12 +++++------ .../resources/templates/tool/gen/gen.html | 2 +- .../resources/templates/vm/html/add.html.vm | 2 +- .../resources/templates/vm/html/edit.html.vm | 2 +- .../resources/templates/vm/html/list.html.vm | 4 ++-- src/main/resources/templates/vm/js/add.js.vm | 2 +- src/main/resources/templates/vm/js/edit.js.vm | 2 +- src/main/resources/templates/vm/js/list.js.vm | 2 +- 81 files changed, 182 insertions(+), 184 deletions(-) rename doc/{若依环境使用手册v1.0.docx => 若依环境使用手册v1.0.1.docx} (94%) diff --git a/README.md b/README.md index fd4a50b46..22451956e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ 12. 在线构建器：拖动表单元素生成相应的HTML代码 13. 连接池监视：监视当期系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 -## 系统演示 ## [www.ruoyi.name](http://www.ruoyi.name) +## 系统演示 ## [www.ruoyi.club](http://www.ruoyi.club) ![登录界面](https://static.oschina.net/uploads/space/2018/0425/110329_Ftsu_1438828.png) diff --git a/doc/若依环境使用手册v1.0.docx b/doc/若依环境使用手册v1.0.1.docx similarity index 94% rename from doc/若依环境使用手册v1.0.docx rename to doc/若依环境使用手册v1.0.1.docx index 6e7c1a0be0f7df8f839e11b8c781351b30aec7c8..7cd906bdf77cbc7d7c98386db7d29ae1a19c1d0b 100644 GIT binary patch delta 18725 zcmZU4V{o8d&}Hn2Z95a&wr$&Xp4hgHiEZ1SBoo_CCY~hwe!Kf)tM*o%s@uPB-P5N} zci)HO_J-j$#K9pl?K#oUm)@wsomunI(^8MF*^L=43XSY=Lyijlq@S6jZ)ZwAqdS<%a+fyTP%?l;~AyZkRo^?e>)D{>69T}3w6m23t3OEhKrYq&PP z4z$4M30|vc%6Y2s)OGmQ?~N(7_gIrsL%Pp*&HA4hcsl+?Wi7MliB@={WeWbZ{Epdq z2P2`%1)4fdN!FF_`m8P5tg34|Xd72GI+~Q}Y`x4RPJ9vHmuEWq%m`Zbr0rPdWcDex zKU9}_WbjtASN^8k;o`^_~h?$t%Ef z;EYvOQ5rl-BhmL)Ngab5)Ro)sPi5XE0rtW$Fjgo_Jw!=DhHR9W0i`p-f(%|6o|P)B zgqc=$eSvj|`1DshIB&Bqh{=P}Rj!aP4;5K)DULW(RqOca=*|r{?rS|BxT0}q)?_t0 zbSNy#RBi7f>taucAiC44IbO-i9A@CSgy;RygJ6PTYPQmiz$K-)f@(oMug5yqeFq)# zA>6smq+yNns(art!Vhk_mFA4S*1lMArrO>}Ch3RkhLU*%wyaI%nPNbtRl3K|I?sZg z3!r~{x9^j-#xi}uu?b%ZZc#P;P^@^%`Obphpsmht0r(Dj8r}8Lyw%;*?FCw6R^Mb1 z3Zx_#YiQ+N{X8}rx0$D^YS4_TH#k)_uJJkN*)Sx#`IKMsD|4o5&MmFx8h@Bu`TeNG z#leO(#@kTlxfhF$GyaC9fIkr{tFdxB;t>;-)I<_aoq-4s|iAq|wN}=Gw3GU>uD02c$G|bIH-T6+#bT zi-&voX>}``x;H9@fq~k_%)=sCJ5x$d-Hg}qK3@S^#rg%UJUll^#3<0fN}dyO%m*vc zx*doRo_wdq!wah$S$0rUg?Cc0(x#G?;Vy)ACH^-%?zZ=ce(&lAWp=UkT+*)ogk__I z6oMO3H!(g*$LNv)hp=W-cf0l_#4B^|bTk)zI4D>wz<hA%1hgl=R^)lqjQqxN z>)epP-}iL|!{3YK{xLWrKPx>q+SBD2nAAT+ypll(M5!v!?%S8)Y_5&qk`&PBkQa*t+0S zxa*C@BhV==JQw|${@AP_C4;E4d6V~jwet?PLCA}zNb;nU^L^oHxPIxUCwMv@(=PKe zIN1Q20<)$QRFCOZv5`QdS9!I)8h??^0pIPlx1&%^(25x06(bH#5SeYsBO_xkSEiU7 z4zs6_=}nVYW$V;t|I2b;N@~v){{{LVZ{E^gApo;cafVq76CsYQV^(N{a>KSvlj)dQ zAk&U$i6krkI{Fv^f0W^-BVA#!Vxbz8X0g~3UYAGuZK`lL{d+ST?(2u8m5^v_f;d); zRjNr54c^(v!1+H!ec;Fwd3>YsSmt}Uf~7`$%OE+~aU zj7y#F+TZd=I;z$LU!uh}qvaZcX*yzTdw^V5(NJyEVvwhMs`-LsQih5H_nq=p!D?K^ zXREpr-m}P*sd_%z0Li3Hf6?}z=Q4^TtkIeQ^9Pl2KXXF7GU}tS*gylus&M{P)sb(G zG)m-Uz0!;`_Pan&BeqKRWi4t}>z=$EgNld}orlOn#*p@+)EvvN3_8@xTaf zH2(uCI3Kjj+q37tad^Hd{;(WGOrGQ{7}_@_-(Z*p6p<~y@)kU$Iy_0?X>gkM`n?u#x3hu^SD6L|wE-Itw0~)_cePa63gL~M#!wXQdd%|J53Ip=ggFQa zacJ>Aw}dH486yjWa6IKOm~0q=EYzOk#HH(eGKKF2xDi&`g2{@;EvESd$$i6CRJyP2@yE8}&5J;P^T!X~qsVa0D2FPqxiBjz zP#fw;MGpckPK8c2V6^1|{DOrw5wk$?OXk%A1n!E*`q z36jp{;dJAeslX=WWIzOhNTM|>J~@Y*T%E+5qfO?|*lwS}Ut_{*jD*S7OUJT4-hJ$u zRpId=j-NuaAU4Bj3>1iPI+*T+de+#6A%%_7SrnIphYJSX_CKra!T|_3IZTeV4?{z< zWQ){>a?(FgpC3qT$eqEcD>n~Md6w0&=xWcS_IY+3j1=r-Xy!E}lTSULOu51~FDLw(&^>=2p*rGzse|f)NW^j!ftWXzGegn6X zw(gtq;|AD*Kh=Iky#ZTnH`<{QO!6BWJ!}5&>d5Ch+EbR3od$eMW~D1#E#}*VKB3U( z1N4KXd^`;BI=!Sv&1TpY441*`-Fv z>v|ipDS-t3#ue^z&ZcYXSO#nDhVc(O+I4q*xT0)ok1bzsSK|E8HnGfkm2G4L)Tob} z7pqXLuPVg7=1^T`#544oW5EFa(5-#V zI6u>9BCmdKIE!g(x!)T_49CA}bu3z8K*f3t+)!yC`8xdVMMDWjg^K5Sfi&eO8k$dGu7OFUvaWl{0ISb04lG*J~`VM87hTum2A|YQ}e(iv03?tPq zW{yAb;Z`9-M!g8Pbu(&DvC{LF)B6SkGyr+_ucBh7k*Qb7P-&v(-~Mfj-Or}CB@w;T zcvb;N>z2JQ>m+;BL5k`&3B8&Md$joHBV5NBUOvE<3_*jYle=Eym7Bq(;Fs6wIkba1 zYa4=1I*yP3(5LaZ0yW(uMx~1U1uXktaj~0GQditC`3TnoWAxi3j>Dg?4!~AM`E~18 zn}j{1ROUu7V)H(z%kB6(Cr1qxkuZRUTI35E;cO;R36;{mpaF)m*p9gV6ss3&1A0rH z!3*S->x@IEMc}>%Z%pI{)vLHZiqtkDS^E;zd$a=}EjMrumnWi^t4+T0l3L`z&y4y3 zB{vqktA8K)?&i%OR|>b=&^O{K+9XQ~qN(JtMHZXoYE>q?gZ9N(BOvehFrfy@%iS7?r2)1hOR&-L%FiI$lr`a9j7TEKKNo*S#Sl9LaG*dw zq>NO+IHI(HlLZk#SXLvAi7JqVNq~=?B36u3aD+(Mqvh`7Kr0cFSi=hz{@Z-vz&)Ib z1BQLTe86med7h_|R;^|{!JS_4?uNT_yjXyXTP{EN z-KCOOuxw$1FDYL*yAS%lCQdL`BlVP(IWS&6sX56@hV)ovUrTxk%vs-WnWbuI-8=8%&X^)zGh$3NPl!b8W~`Oy`cD zHo6gC@8JwNtd8r7nLON=c-cAb%`*gcd*|%H$=5|5+plJcxiMLCm88b6B&m+XEA^pI zT=lr8Gn#rnEfDzu8H$dFDEb}GX;hrI>dHCmsxGNXd^93VEPot`+F{vM`M_rmc{)AJCUYNeW}-Zl z^E@&uzm8G)h_I3w4!z_x(rqN-Pg$M+&SQvcVy1SP)STP_<6V9|Mb+ax*}r+hsV2?= zYgt@uQ2IKy!15|HDODZBq(Xm#V`CC_OKK<`IJz!zG7WDLc4j=q^q43$?=~Y=k9-qu zIs~fe#x(7BOe0z=^C54t{(jf~{x`GR6psSz83$hx$wvOm<0K4f@`E(yS{{( z^ULViZTD`LU>;|CTQ^=p_hr93k-@qC`i+CZHsA%ceN1~JGffl%Z>L{}mtu7atDv66 z_k!s6p0`iC0mG4Dd7A~$Qq%6WEChGQAmO1XtBL3tABAoBa_KRYx}16jFCk8wB%7^j z0xT~Gor_hnW2M2d=V{@p=63hQ%ko&EYT*emF~&MV4L3)&B6m#{itFIAXtLU{M=#dZG2IQDS9&K(=B7?hLQ!V zoPQNZAT^C}+nivG5XIGZdV0+bwwWCDx4(fmAK+521GZFVQl!!BlI@T^%LrbUQ5Utj zSg1q7+IIlaPMCOH*veF@_<$x9JS=ts!xDM~Sy>xt(MKYnul7qj>&HCDuk~;$wg4TS zq~J3-^w8w8QBm=Eo6*X+eJsGTw!~P_kdRyK5a~`DHqHwkao%py zcu#KDZ>DuWD{N1|VYupFc6XQ=zhIK6$m}9kD7=^_QRvwo*oUo-%PTHz#H-fSwkOQF z`fpJm>0LoeX<}g|^5bOq(xQ*Y`2g0ai1Nna@j#JJTft|>o^yc@%iH_%w`qN*=$#OP zUx8PG0iFF{;Bdq3fH-(VT%zV(q92pv?$xf3)lNqY2xbBm>ww)!wdPs3Ez-b3*Nfw` zgF}{}-q}uo#Z3>TD);c)*^D%-UJ|d6_!PqQs8}PHRIZee2ozasQ*&A)6~JMPf<2ix zTPxcudCJFfW<^WX6p557vl70PI|e+61TSt;BUE@@7I{_HB+4gW`D^X?{LGgw@4O<; zFZE~q2#0yTi)mih4{S%=_wMWdU~nNtD#*FC92N?TN@HMc2eXm^4R+;$kLAfz(6g~Wvw{dImBFs81KVT=gQ9>{AujW2)QU!%oiDNrEhNKkA+TfexLy(IDK!T2C9uvW|TC` z>$K9F!Yjpl@ld><;z7>kxgne%MDNTOX~v^g34=puMXnGuR3RDE0Gu&_&pziNxMIuV z*?>Cw#dVvg+k_z-;n=+W`wENO$pM0zcYM2dd>fZHqfqPT%BM%c!5c+lAPnh+lwga6 zEty&lFqdeIl?KK&R4GIJSIk__&+q&Y<^#Z=ASkf%nOKW{bIo8xh7NxP2E+4m@#$FzxJmz@g(!mlQW9ydvaY=1LVRZ}Nn6eg9h(CF=^LfX z3Y%}l-#d|?o^asZeeXhcrC=Yl2rV;sS{w~R!U1f2}W5p#%%%^8Cu_m$-+PnTnQR&l2(6&{)+oQS)vh3V z2~Xa4vB4dv9?_7ePwKnU+f4-gSON$DxxO8Ud>=GW^m z{KuF!3yE^1d+0gP4&$xJLOm1)Yt|vE4ad)W1AN5r#<+NNu%Q<%ln*n-vy>)Dg$jIq zDV~yIup!Nd*Y~|2dUYVz5=1c!EALDi`t$v?z&F9HnM~K3H2flAT=KKEVuLBih|!zL zj1(!{B%HsANR5|J32RIuIKX*?aDUhR=3uPLvQ5ZMBP0(ZX|T*Z=;&74XK;AoDx~>U z3V=d?8&kyn7FN#1VmT7o`o*~i;ZW)#k*)|&GmqzVg@ zdvkbIeeJsUkeo+~Knlu}J}b4m*bgH2yo=)8*+iyWTE!eS(YL+uRnTG&IUI?l7XW}-wy zk{nf27b2%V?$D2k_(M62_*03>&}I@mdqZ($p>4(VFJ4zrx;8jhg2S!~jM;qb4&X;G zlt%|*u{8V8n<0wm+juD6exK7{cCMxZF`BgF(J1zzBup+aS%iP2)nds=QwFfaZ`IB; zWSC1GPk8P=ChUYorh+aGIGDVi^?Z<)rU8!@j;GR6%X|gW79C)-{@*pw=YO#fkO+$1 z6gfct6af??o0fwN+?rg*K@)r`<^U(;;O5)>IVSKMCN z2oWFabLm%9lgPwlmgXZcY5DX$Pu`Pb@z?u!3&?GN;zrCMDW@@nXa*T#seGTaM<&2M z^h+Yx&lF`2rT z4^|Ia;unM0&*(&&AeoX~q9DM6>!0Esi&7+?SKPY>(hlm+*%20L1aLD&)ZhN6w9I=XRdq~8^@_~e3%F^Qj1H$ zTF&0#qj1T-(h*XPxM((Pa|ftPsVkRAs??5QsIS?xLi`QK4H$*w_oWmJ!in0N>?X?oA`c8H`RFSBG5l-l zK(kth)`uc+kusBbGwBumL@b1Zc_!l@%V4Nne97Z&-#G6g4xJTU>`E?UFjmZft{%1J z>&6xgl6vE;5arzUN5O}(Ma;xmqv9&(I%^G;x+i37v!pjvgpxWi2I33vow0Gj6 z>SyLJa#p>l2(iEr&Q(FmU@$_L+KnHXFA)3~jJM|eJiO8zI*n#$Z!P;lT3Mwm%^MsJp6W5-}j=pSyaX(Y!W{i%_8FK@elhG)QF1D5vM z&2U~Ie5dh+NXxsWP3AkO!y-}rj&Kv0NVzeS{-0m&uD3wVS)!cKMT&QeXJ89|A?%Jg z#xfm)xa}X6hM^HN>+>I#d(}K`$rM}bbOuPg_AlmU;JTcAoaTJ6CnXKc)5+^KBf@NW zVXChhOC9hW0*K|)nzm|K|7T9}n<<1mn+eA9Uq%%#8->x3BnbeUQJVxjv!)H@^VA zzdZ=0pg=%0P(VPC|1&E*9bL>At;~(h%w1T1dfD66XiYk7Ng($^PYAME5m#tS&CM~J z`=po>2SM_NC#5Ws`dVy|uDf~8lllv}FdbmS?CByOC03)5OOj3YLujPVOR2jq)+C!t zLPyoyY*ZUyxPOk3Moq>_kBVRDDhvZ{FtVa3_ik6Z3H=-OFAT+O@?^L%sc);ys;hCm zih`X2FO*5-19`NL`C)zRi#(6n@)!zQBI;!OMd&iIZe-}vs<9G$X0x4%%FC?;n|$Uf zp>i}z?m6YGRW%}dO*Ham^pN^wBxqIYq7%-nMGsclE5be!?1D$kYvaV5H|c;$sH433 z1qRd#T}a~S^bgvvRD74=7zQ8LIbPCSO8ONEQ`IJHJLJmjyQ{4@q%^3X3Nk4cSlrCA z2M;@Zt{Zsov>Cfp(4ORZqO^064w0LvvDB6_2YiT`yN@+>vTj!~xil=nq_lWD=Mlx-%x@m#cC~bx2N=oX4ensW~%dqLt-u1!hs7-N>h_`56b8iOhZ4q#B zj|Z{ECj51t*}I4x>l4@2K&xaCO#L8TfkVVme=k4y-LBB@`!;{+xC``tUjChp`B%q7 z)49!|k`2lGZx)VOmQ>Z5I1HO%JH(dnx9^%|z6j@&^B7Em-{tvGctOR6HRwhtn2g3f z+TEsmSDQX-KLaUWT9D-lVqE@U%62=bA!r?CUm8TO4*p+T>4iz0gTfp^rpUn=(O)@Z zYFU;;`QSX&)*^N5Ba}cVaRXZ2vE+gqN`B{vupk{z6Siw0-5)*?FoG_R-%$5zw&b0Na^=cV0p;T98^A>8lY%VyMc8z${E#L4%9#C&q*O6&X1W~1RLjJh#Nx$aYS9pEo|yortL#ZwK5lQ+{mEHt zS$Z~tafHk*!mZoQ)*yX45$y{~t}x-ZNLy9sSCa?sAQXh2%njJd&;u?9zsqcWUUXap z--&UwJzc2<&{dD_o5GV8X#Nz}yS4)?LhJxB3qr3;UHXH8u#LElsww#10j(sZR&Qnk zC*l)1!V%S{P#b`|2OE zvPH9*&pHa0UMi>7BbWx;IFvHKWv`#268}LogpC=%fae2~`r}W27xS4JISoEY9<;N= z1R_(z?kL#oxZ_|@&J!jey(sA-_z|R-4Y|~W;8Z`&RPdPxij)yCoI)aF!y7=~G)kSSLD!3fdzkbk`6kE;)zti`+m|y1jnv zB;Pz)P@H-g#uU2|vn&zSPYR~?5C!~}qO=g}s)K7ymHJ!_Q9P|
y9iwt7~f$RzS;o?(`4Ixpa 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 diff --git a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java index 2ff6f2417..61183aa6b 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java @@ -17,7 +17,6 @@ import com.ruoyi.framework.web.domain.Message; * * @author ruoyi */ -// @RestController @Controller public class LoginController extends BaseController { diff --git a/src/main/resources/static/ruoyi/monitor/job/add.js b/src/main/resources/static/ruoyi/monitor/job/add.js index c5438a1d6..660c0a47c 100644 --- a/src/main/resources/static/ruoyi/monitor/job/add.js +++ b/src/main/resources/static/ruoyi/monitor/job/add.js @@ -16,5 +16,5 @@ $("#form-job-add").validate({ }); function add() { - _ajax_save("/monitor/job/save", $("#form-job-add").serialize()); + _ajax_save(ctx + "/monitor/job/save", $("#form-job-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/monitor/job/edit.js b/src/main/resources/static/ruoyi/monitor/job/edit.js index f1c85d444..fab7e860e 100644 --- a/src/main/resources/static/ruoyi/monitor/job/edit.js +++ b/src/main/resources/static/ruoyi/monitor/job/edit.js @@ -16,5 +16,5 @@ $("#form-job-edit").validate({ }); function edit() { - _ajax_save("/monitor/job/save", $("#form-job-edit").serialize()); + _ajax_save(ctx + "/monitor/job/save", $("#form-job-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/monitor/job/job.js b/src/main/resources/static/ruoyi/monitor/job/job.js index e89861c90..03cd71880 100644 --- a/src/main/resources/static/ruoyi/monitor/job/job.js +++ b/src/main/resources/static/ruoyi/monitor/job/job.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/job" +var prefix = ctx + "/monitor/job" $(function() { var columns = [{ @@ -114,6 +114,6 @@ function batchRemove() { //调度日志查询 function jobLog(id) { - var url = '/monitor/jobLog'; + var url = ctx + '/monitor/jobLog'; createMenuItem(url, "调度日志"); } diff --git a/src/main/resources/static/ruoyi/monitor/job/jobLog.js b/src/main/resources/static/ruoyi/monitor/job/jobLog.js index cd9ccb426..a5c713a9c 100644 --- a/src/main/resources/static/ruoyi/monitor/job/jobLog.js +++ b/src/main/resources/static/ruoyi/monitor/job/jobLog.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/jobLog" +var prefix = ctx + "/monitor/jobLog" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js index 3aa99e0f4..7cb34ebdc 100644 --- a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js +++ b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/logininfor" +var prefix = ctx + "/monitor/logininfor" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/online/online.js b/src/main/resources/static/ruoyi/monitor/online/online.js index 10b3f90da..432461e99 100644 --- a/src/main/resources/static/ruoyi/monitor/online/online.js +++ b/src/main/resources/static/ruoyi/monitor/online/online.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/online" +var prefix = ctx + "/monitor/online" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js index 2647c9db9..aa4f3bd49 100644 --- a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js +++ b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/operlog" +var prefix = ctx + "/monitor/operlog" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/dept/add.js b/src/main/resources/static/ruoyi/system/dept/add.js index c11df1da9..7c0bde110 100644 --- a/src/main/resources/static/ruoyi/system/dept/add.js +++ b/src/main/resources/static/ruoyi/system/dept/add.js @@ -3,7 +3,7 @@ $("#form-dept-add").validate({ deptName:{ required:true, remote: { - url: "/system/dept/checkDeptNameUnique", + url: ctx + "system/dept/checkDeptNameUnique", type: "post", dataType: "text", data: { @@ -33,12 +33,12 @@ $("#form-dept-add").validate({ }); function update() { - _ajax_save("/system/dept/save", $("#form-dept-add").serialize()); + _ajax_save(ctx + "system/dept/save", $("#form-dept-add").serialize()); } /*部门管理-新增-选择父部门树*/ function selectDeptTree() { var deptId = $("#treeId").val(); - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dept/dept.js b/src/main/resources/static/ruoyi/system/dept/dept.js index 14a6ad8f0..998ea1772 100644 --- a/src/main/resources/static/ruoyi/system/dept/dept.js +++ b/src/main/resources/static/ruoyi/system/dept/dept.js @@ -1,4 +1,4 @@ -var prefix = "/system/dept" +var prefix = ctx + "system/dept" window.onload = function() { loading(); diff --git a/src/main/resources/static/ruoyi/system/dept/edit.js b/src/main/resources/static/ruoyi/system/dept/edit.js index be3383784..4cce1924a 100644 --- a/src/main/resources/static/ruoyi/system/dept/edit.js +++ b/src/main/resources/static/ruoyi/system/dept/edit.js @@ -3,7 +3,7 @@ $("#form-dept-edit").validate({ deptName:{ required:true, remote: { - url: "/system/dept/checkDeptNameUnique", + url: ctx + "system/dept/checkDeptNameUnique", type: "post", dataType: "text", data: { @@ -36,12 +36,12 @@ $("#form-dept-edit").validate({ }); function update() { - _ajax_save("/system/dept/save", $("#form-dept-edit").serialize()); + _ajax_save(ctx + "system/dept/save", $("#form-dept-edit").serialize()); } /*部门管理-修改-选择部门树*/ function selectDeptTree() { var deptId = $("#treeId").val(); - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dept/tree.js b/src/main/resources/static/ruoyi/system/dept/tree.js index dcfdc32ca..a17bd13a0 100644 --- a/src/main/resources/static/ruoyi/system/dept/tree.js +++ b/src/main/resources/static/ruoyi/system/dept/tree.js @@ -7,7 +7,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ $("#treeName").val(treeName); }} }, tree, loadTree = function(){ - $.get("/system/dept/treeData", function(data) { + $.get(ctx + "system/dept/treeData", function(data) { var treeName = $("#treeName").val(); tree = $.fn.zTree.init($("#tree"), setting, data); // 展开第一级节点 diff --git a/src/main/resources/static/ruoyi/system/dict/data/add.js b/src/main/resources/static/ruoyi/system/dict/data/add.js index b620b0909..45bedf829 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/add.js +++ b/src/main/resources/static/ruoyi/system/dict/data/add.js @@ -13,5 +13,5 @@ $("#form-dict-add").validate({ }); function add() { - _ajax_save("/system/dict/data/save", $("#form-dict-add").serialize()); + _ajax_save(ctx + "system/dict/data/save", $("#form-dict-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/data/data.js b/src/main/resources/static/ruoyi/system/dict/data/data.js index fbb044a8b..96ea91cb0 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/data.js +++ b/src/main/resources/static/ruoyi/system/dict/data/data.js @@ -1,4 +1,4 @@ -var prefix = "/system/dict/data" +var prefix = ctx + "system/dict/data" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/dict/data/edit.js b/src/main/resources/static/ruoyi/system/dict/data/edit.js index 64415723f..2815e37e0 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/edit.js +++ b/src/main/resources/static/ruoyi/system/dict/data/edit.js @@ -13,5 +13,5 @@ $("#form-dict-edit").validate({ }); function update() { - _ajax_save("/system/dict/data/save", $("#form-dict-edit").serialize()); + _ajax_save(ctx + "system/dict/data/save", $("#form-dict-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/type/add.js b/src/main/resources/static/ruoyi/system/dict/type/add.js index 26460537d..c5b0dfde6 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/add.js +++ b/src/main/resources/static/ruoyi/system/dict/type/add.js @@ -7,7 +7,7 @@ $("#form-dict-add").validate({ required:true, minlength: 5, remote: { - url: "/system/dict/checkDictTypeUnique", + url: ctx + "system/dict/checkDictTypeUnique", type: "post", dataType: "text", data: { @@ -33,5 +33,5 @@ $("#form-dict-add").validate({ }); function add() { - _ajax_save("/system/dict/save", $("#form-dict-add").serialize()); + _ajax_save(ctx + "system/dict/save", $("#form-dict-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/type/edit.js b/src/main/resources/static/ruoyi/system/dict/type/edit.js index 1c93cdf19..9964744f8 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/edit.js +++ b/src/main/resources/static/ruoyi/system/dict/type/edit.js @@ -7,7 +7,7 @@ $("#form-dict-edit").validate({ required:true, minlength: 5, remote: { - url: "/system/dict/checkDictTypeUnique", + url: ctx + "system/dict/checkDictTypeUnique", type: "post", dataType: "text", data: { @@ -36,5 +36,5 @@ $("#form-dict-edit").validate({ }); function update() { - _ajax_save("/system/dict/save", $("#form-dict-edit").serialize()); + _ajax_save(ctx + "system/dict/save", $("#form-dict-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/type/type.js b/src/main/resources/static/ruoyi/system/dict/type/type.js index 1a2249238..103020894 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/type.js +++ b/src/main/resources/static/ruoyi/system/dict/type/type.js @@ -1,4 +1,4 @@ -var prefix = "/system/dict" +var prefix = ctx + "system/dict" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/menu/add.js b/src/main/resources/static/ruoyi/system/menu/add.js index d119f6e02..37958dfc4 100644 --- a/src/main/resources/static/ruoyi/system/menu/add.js +++ b/src/main/resources/static/ruoyi/system/menu/add.js @@ -3,7 +3,7 @@ $("#form-menu-add").validate({ menuName:{ required:true, remote: { - url: "/system/menu/checkMenuNameUnique", + url: ctx + "system/menu/checkMenuNameUnique", type: "post", dataType: "text", data: { @@ -64,7 +64,7 @@ $(function() { }); function add() { - _ajax_save("/system/menu/save", $("#form-menu-add").serialize()); + _ajax_save(ctx + "system/menu/save", $("#form-menu-add").serialize()); } /*菜单管理-新增-选择菜单树*/ @@ -72,12 +72,12 @@ function selectMenuTree() { var menuId = $("#treeId").val(); if(menuId > 0) { - var url = "/system/menu/selectMenuTree/" + menuId; + var url = ctx + "system/menu/selectMenuTree/" + menuId; layer_show("选择菜单", url, '380', '380'); } else { - var url = "/system/menu/selectMenuTree/1"; + var url = ctx + "system/menu/selectMenuTree/1"; layer_show("选择菜单", url, '380', '380'); } } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/menu/edit.js b/src/main/resources/static/ruoyi/system/menu/edit.js index 129b767eb..4e1a096c7 100644 --- a/src/main/resources/static/ruoyi/system/menu/edit.js +++ b/src/main/resources/static/ruoyi/system/menu/edit.js @@ -8,7 +8,7 @@ $("#form-menu-edit").validate({ menuName:{ required:true, remote: { - url: "/system/menu/checkMenuNameUnique", + url: ctx + "system/menu/checkMenuNameUnique", type: "post", dataType: "text", data: { @@ -78,7 +78,7 @@ function menuVisible(menuType) { } function update() { - _ajax_save("/system/menu/save", $("#form-menu-edit").serialize()); + _ajax_save(ctx + "system/menu/save", $("#form-menu-edit").serialize()); } /*菜单管理-修改-选择菜单树*/ @@ -86,7 +86,7 @@ function selectMenuTree() { var menuId = $("#treeId").val(); if(menuId > 0) { - var url = "/system/menu/selectMenuTree/" + menuId; + var url = ctx + "system/menu/selectMenuTree/" + menuId; layer_show("选择菜单", url, '380', '380'); } else diff --git a/src/main/resources/static/ruoyi/system/menu/menu.js b/src/main/resources/static/ruoyi/system/menu/menu.js index fa44f8635..651d7c9db 100644 --- a/src/main/resources/static/ruoyi/system/menu/menu.js +++ b/src/main/resources/static/ruoyi/system/menu/menu.js @@ -1,4 +1,4 @@ -var prefix = "/system/menu" +var prefix = ctx + "system/menu" window.onload = function() { loading(); diff --git a/src/main/resources/static/ruoyi/system/menu/tree.js b/src/main/resources/static/ruoyi/system/menu/tree.js index 3207e2303..a9a372a25 100644 --- a/src/main/resources/static/ruoyi/system/menu/tree.js +++ b/src/main/resources/static/ruoyi/system/menu/tree.js @@ -7,7 +7,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ $("#treeName").val(treeName); }} }, tree, loadTree = function(){ - $.get("/system/menu/menuTreeData", function(data) { + $.get(ctx + "system/menu/menuTreeData", function(data) { var treeName = $("#treeName").val(); tree = $.fn.zTree.init($("#tree"), setting, data); // 展开第一级节点 diff --git a/src/main/resources/static/ruoyi/system/post/add.js b/src/main/resources/static/ruoyi/system/post/add.js index 9412877e3..781aeac35 100644 --- a/src/main/resources/static/ruoyi/system/post/add.js +++ b/src/main/resources/static/ruoyi/system/post/add.js @@ -17,5 +17,5 @@ $("#form-post-add").validate({ /** 岗位管理-新增岗位 */ function add() { - _ajax_save(ctx + "/system/post/save", $("#form-post-add").serialize()); + _ajax_save(ctx + "system/post/save", $("#form-post-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/post/edit.js b/src/main/resources/static/ruoyi/system/post/edit.js index be65a4c6b..bbf240407 100644 --- a/src/main/resources/static/ruoyi/system/post/edit.js +++ b/src/main/resources/static/ruoyi/system/post/edit.js @@ -17,5 +17,5 @@ $("#form-post-edit").validate({ /** 岗位管理-修改岗位 */ function edit() { - _ajax_save(ctx + "/system/post/save", $("#form-post-edit").serialize()); + _ajax_save(ctx + "system/post/save", $("#form-post-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/post/post.js b/src/main/resources/static/ruoyi/system/post/post.js index f4c06c516..1d9e92d40 100644 --- a/src/main/resources/static/ruoyi/system/post/post.js +++ b/src/main/resources/static/ruoyi/system/post/post.js @@ -1,5 +1,4 @@ -var prefix = ctx + "/system/post" - +var prefix = ctx + "system/post" $(function() { var columns = [{ checkbox: true diff --git a/src/main/resources/static/ruoyi/system/role/add.js b/src/main/resources/static/ruoyi/system/role/add.js index d8ea9b09d..8d4b4fe86 100644 --- a/src/main/resources/static/ruoyi/system/role/add.js +++ b/src/main/resources/static/ruoyi/system/role/add.js @@ -11,7 +11,7 @@ var setting = { } } }, menuTrees, loadTree = function(){ - $.get("/system/menu/roleMenuTreeData", function(data) { + $.get(ctx + "system/menu/roleMenuTreeData", function(data) { menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true); }, null, null, "正在加载，请稍后..."); };loadTree(); @@ -21,7 +21,7 @@ $("#form-role-add").validate({ roleName:{ required:true, remote: { - url: "/system/role/checkRoleNameUnique", + url: ctx + "system/role/checkRoleNameUnique", type: "post", dataType: "text", data: { @@ -75,7 +75,7 @@ function add() { $.ajax({ cache : true, type : "POST", - url : "/system/role/save", + url : ctx + "system/role/save", data : { "roleName": roleName, "roleKey": roleKey, diff --git a/src/main/resources/static/ruoyi/system/role/edit.js b/src/main/resources/static/ruoyi/system/role/edit.js index 29871ed7f..6a0ac8ba1 100644 --- a/src/main/resources/static/ruoyi/system/role/edit.js +++ b/src/main/resources/static/ruoyi/system/role/edit.js @@ -11,7 +11,7 @@ var setting = { } } }, menuTrees, loadTree = function(){ - $.get("/system/menu/roleMenuTreeData?roleId=" + $("#roleId").val(), function(data) { + $.get(ctx + "system/menu/roleMenuTreeData?roleId=" + $("#roleId").val(), function(data) { menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true); }, null, null, "正在加载，请稍后..."); };loadTree(); @@ -21,7 +21,7 @@ $("#form-role-edit").validate({ roleName:{ required:true, remote: { - url: "/system/role/checkRoleNameUnique", + url: ctx + "system/role/checkRoleNameUnique", type: "post", dataType: "text", data: { @@ -79,7 +79,7 @@ function update() { $.ajax({ cache : true, type : "POST", - url : "/system/role/save", + url : ctx + "system/role/save", data : { "roleId": roleId, "roleName": roleName, diff --git a/src/main/resources/static/ruoyi/system/role/role.js b/src/main/resources/static/ruoyi/system/role/role.js index e1fff7732..e6484d745 100644 --- a/src/main/resources/static/ruoyi/system/role/role.js +++ b/src/main/resources/static/ruoyi/system/role/role.js @@ -1,4 +1,4 @@ -var prefix = "/system/role" +var prefix = ctx + "system/role" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/user/add.js b/src/main/resources/static/ruoyi/system/user/add.js index 4135cc0df..23579f4c0 100644 --- a/src/main/resources/static/ruoyi/system/user/add.js +++ b/src/main/resources/static/ruoyi/system/user/add.js @@ -4,7 +4,7 @@ $("#form-user-add").validate({ required:true, minlength: 5, remote: { - url: "/system/user/checkUserNameUnique", + url: ctx + "system/user/checkUserNameUnique", type: "post", dataType: "text", data: { @@ -57,7 +57,7 @@ function add() { $.ajax({ cache : true, type : "POST", - url : "/system/user/save", + url : ctx + "system/user/save", data : { "userId": userId, "deptId": deptId, @@ -91,6 +91,6 @@ function add() { function selectDeptTree() { var treeId = $("#treeId").val(); var deptId = treeId == null || treeId == "" ? "100" : treeId; - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } diff --git a/src/main/resources/static/ruoyi/system/user/edit.js b/src/main/resources/static/ruoyi/system/user/edit.js index d2e965816..53b0c5760 100644 --- a/src/main/resources/static/ruoyi/system/user/edit.js +++ b/src/main/resources/static/ruoyi/system/user/edit.js @@ -33,7 +33,7 @@ function update() { $.ajax({ cache : true, type : "POST", - url : "/system/user/save", + url : ctx + "system/user/save", data : { "userId": userId, "deptId": deptId, @@ -64,6 +64,6 @@ function update() { /*用户管理-修改-选择部门树*/ function selectDeptTree() { var deptId = $("#treeId").val(); - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } diff --git a/src/main/resources/static/ruoyi/system/user/user.js b/src/main/resources/static/ruoyi/system/user/user.js index 8eb4a12b0..670fb25ef 100644 --- a/src/main/resources/static/ruoyi/system/user/user.js +++ b/src/main/resources/static/ruoyi/system/user/user.js @@ -1,4 +1,4 @@ -var prefix = "/system/user" +var prefix = ctx + "system/user" $(document).ready(function(){ @@ -76,7 +76,7 @@ function queryDeptTreeDaTa() $('.bootstrap-table').bootstrapTable('refresh', opt); }} }, tree, loadTree = function(){ - $.get("/system/dept/treeData", function(data) { + $.get(ctx + "system/dept/treeData", function(data) { tree = $.fn.zTree.init($("#tree"), setting, data); //.expandAll(true); // 展开第一级节点 var nodes = tree.getNodesByParam("level", 0); @@ -108,7 +108,7 @@ function queryDeptTreeDaTa() /*用户管理-部门*/ function dept() { - var url = "/system/dept"; + var url = ctx + "system/dept"; createMenuItem(url, "部门管理"); } diff --git a/src/main/resources/static/ruoyi/tool/gen/gen.js b/src/main/resources/static/ruoyi/tool/gen/gen.js index 608eff1ae..170b5ad04 100644 --- a/src/main/resources/static/ruoyi/tool/gen/gen.js +++ b/src/main/resources/static/ruoyi/tool/gen/gen.js @@ -1,4 +1,4 @@ -var prefix = "/tool/gen" +var prefix = ctx + "tool/gen" $(function() { var columns = [{ diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html index 8c4385a82..e5e000226 100644 --- a/src/main/resources/templates/error/404.html +++ b/src/main/resources/templates/error/404.html @@ -4,9 +4,9 @@ RuoYi - 404 - - - + + +

diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html index c6ea065c4..678020c0c 100644 --- a/src/main/resources/templates/error/500.html +++ b/src/main/resources/templates/error/500.html @@ -4,9 +4,9 @@ RuoYi - 500 - - - + + +
diff --git a/src/main/resources/templates/error/unauth.html b/src/main/resources/templates/error/unauth.html index 4f7089a6e..56217dead 100644 --- a/src/main/resources/templates/error/unauth.html +++ b/src/main/resources/templates/error/unauth.html @@ -4,9 +4,9 @@ RuoYi - 403 - - - + + +
diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html index b0d9f1dd1..1d9d6d9b9 100644 --- a/src/main/resources/templates/include.html +++ b/src/main/resources/templates/include.html @@ -5,14 +5,14 @@ - - + + - - - - - + + + + +
@@ -35,5 +35,6 @@ +
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 78d3d3c28..ecab3f91b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -11,13 +11,12 @@ - - - - - + + + + + -
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 7854ef024..eb8e203d4 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -8,14 +8,14 @@ 若依管理系统 - 登录 - - - - + + + + - + @@ -60,12 +60,12 @@
- - + + - - - + + + diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html index b2728ea30..9444326f8 100644 --- a/src/main/resources/templates/monitor/job/edit.html +++ b/src/main/resources/templates/monitor/job/edit.html @@ -64,7 +64,7 @@
- diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html index c4140d872..8b95633f8 100644 --- a/src/main/resources/templates/monitor/job/job.html +++ b/src/main/resources/templates/monitor/job/job.html @@ -21,8 +21,8 @@
- - + - + diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html index 30990c1aa..a186be27b 100644 --- a/src/main/resources/templates/monitor/logininfor/logininfor.html +++ b/src/main/resources/templates/monitor/logininfor/logininfor.html @@ -15,6 +15,6 @@
- + \ No newline at end of file diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html index 36c4458a8..aad3f0282 100644 --- a/src/main/resources/templates/monitor/online/online.html +++ b/src/main/resources/templates/monitor/online/online.html @@ -16,8 +16,8 @@
- - + diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html index b8c89e22a..001c16ef7 100644 --- a/src/main/resources/templates/monitor/operlog/operlog.html +++ b/src/main/resources/templates/monitor/operlog/operlog.html @@ -16,8 +16,8 @@
- - + diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html index 4717c76db..0e26d5155 100644 --- a/src/main/resources/templates/system/dept/add.html +++ b/src/main/resources/templates/system/dept/add.html @@ -65,7 +65,7 @@
- diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html index 8d867c2e5..cb554b131 100644 --- a/src/main/resources/templates/system/dept/dept.html +++ b/src/main/resources/templates/system/dept/dept.html @@ -15,8 +15,8 @@
- - + diff --git a/src/main/resources/templates/system/dept/tree.html b/src/main/resources/templates/system/dept/tree.html index da59d70d0..10996dcff 100644 --- a/src/main/resources/templates/system/dept/tree.html +++ b/src/main/resources/templates/system/dept/tree.html @@ -2,8 +2,8 @@ - - + + @@ -156,10 +156,10 @@
- - - - + + + + \ No newline at end of file diff --git a/src/main/resources/templates/vm/html/add.html.vm b/src/main/resources/templates/vm/html/add.html.vm index 663a28ecf..1ed22b9a5 100644 --- a/src/main/resources/templates/vm/html/add.html.vm +++ b/src/main/resources/templates/vm/html/add.html.vm @@ -23,7 +23,7 @@
- diff --git a/src/main/resources/templates/vm/html/edit.html.vm b/src/main/resources/templates/vm/html/edit.html.vm index 721566538..1ca5db8d3 100644 --- a/src/main/resources/templates/vm/html/edit.html.vm +++ b/src/main/resources/templates/vm/html/edit.html.vm @@ -25,7 +25,7 @@
- diff --git a/src/main/resources/templates/vm/html/list.html.vm b/src/main/resources/templates/vm/html/list.html.vm index 502317cd9..aeed28c7a 100644 --- a/src/main/resources/templates/vm/html/list.html.vm +++ b/src/main/resources/templates/vm/html/list.html.vm @@ -16,8 +16,8 @@
- - + diff --git a/src/main/resources/templates/vm/js/add.js.vm b/src/main/resources/templates/vm/js/add.js.vm index c1a9ee2ca..269a99dfb 100644 --- a/src/main/resources/templates/vm/js/add.js.vm +++ b/src/main/resources/templates/vm/js/add.js.vm @@ -10,5 +10,5 @@ $("#form-${classname}-add").validate({ }); function add() { - _ajax_save("/${moduleName}/${classname}/save", $('#form-${classname}-add').serialize()); + _ajax_save(ctx + "${moduleName}/${classname}/save", $('#form-${classname}-add').serialize()); } \ No newline at end of file diff --git a/src/main/resources/templates/vm/js/edit.js.vm b/src/main/resources/templates/vm/js/edit.js.vm index 6e63bc387..39a9e9127 100644 --- a/src/main/resources/templates/vm/js/edit.js.vm +++ b/src/main/resources/templates/vm/js/edit.js.vm @@ -10,5 +10,5 @@ $("#form-${classname}-edit").validate({ }); function edit() { - _ajax_save("/${moduleName}/${classname}/save", $('#form-${classname}-edit').serialize()); + _ajax_save(ctx + "${moduleName}/${classname}/save", $('#form-${classname}-edit').serialize()); } \ No newline at end of file diff --git a/src/main/resources/templates/vm/js/list.js.vm b/src/main/resources/templates/vm/js/list.js.vm index 89d8daf22..473b7d3ab 100644 --- a/src/main/resources/templates/vm/js/list.js.vm +++ b/src/main/resources/templates/vm/js/list.js.vm @@ -1,4 +1,4 @@ -var prefix = "/${moduleName}/${classname}" +var prefix = ctx + "${moduleName}/${classname}" $(function() { var columns = [{