Datasets:
susnato
/
java_PRs

Dataset card Data Studio Files
xet
Community
repo_name
stringclasses
5 values
pr_number
int64
1.52k
15.5k
pr_title
stringlengths
8
143
pr_description
stringlengths
0
10.2k
author
stringlengths
3
18
date_created
timestamp[ns, tz=UTC]
date_merged
timestamp[ns, tz=UTC]
previous_commit
stringlengths
40
40
pr_commit
stringlengths
40
40
query
stringlengths
11
10.2k
filepath
stringlengths
6
220
before_content
stringlengths
0
597M
after_content
stringlengths
0
597M
label
int64
-1
1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/java/com/ctrip/framework/test/tools/AloneClassLoader.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.test.tools; import java.net.URLClassLoader; /** * @author kl (http://kailing.pub) * @since 2021/5/21 */ public class AloneClassLoader extends URLClassLoader { private final ClassLoader appClassLoader; public AloneClassLoader() { super(((URLClassLoader) getSystemClassLoader()).getURLs(), Thread.currentThread().getContextClassLoader().getParent()); appClassLoader = Thread.currentThread().getContextClassLoader(); } @Override public Class<?> loadClass(String name) throws ClassNotFoundException { if (name.startsWith("org.junit.") || name.startsWith("junit.")) { return appClassLoader.loadClass(name); } return super.loadClass(name); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.test.tools; import java.net.URLClassLoader; /** * @author kl (http://kailing.pub) * @since 2021/5/21 */ public class AloneClassLoader extends URLClassLoader { private final ClassLoader appClassLoader; public AloneClassLoader() { super(((URLClassLoader) getSystemClassLoader()).getURLs(), Thread.currentThread().getContextClassLoader().getParent()); appClassLoader = Thread.currentThread().getContextClassLoader(); } @Override public Class<?> loadClass(String name) throws ClassNotFoundException { if (name.startsWith("org.junit.") || name.startsWith("junit.")) { return appClassLoader.loadClass(name); } return super.loadClass(name); } }
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./doc/images/local-development/ConfigAdminApplication-Run.png
PNG  IHDR. iCCPICC ProfileHT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&62z,@؜LGhh@53Uhrm:Y߯Ws29@('r39(B#es\2]6ININ;Ss"¼P@aE)?yf6'Cl!({ᱹ(ltlOuRR3QZNL񿕑.y? դ- q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,,܃ӟ1C9^7g:3H@$pĢf$toӁ2PgvB@@l@9p -,  (!CT)C.d YA+AaP,@H CP Tj_ =F` L`=v=@8^<UQ߀<0Mq@$IFDj)E Bn#50L)㏉p0011L36f3bUX', M` jl2.v1p8{?.[یۋkuzq1<7ƻCl|߇& +/! #> 8QKt"ĭ6Mq$O'"H2R21=L";|r8*y@1xQ)bJ=JգSY-ZESg K+FBYO,QVWCvllIٛrzr^rlrri!+|  .* 6͋ơ] qt}:J/Gms+)JCb32N01Q1'iΦ9 s|R䮔TԨtW2SG9Myr}*U^ϥu˙[4܇j Cݪcjj~jB=j^3Swh4\5;5kd*2=2%樦Xf渖V:F'$mdڝڣ:::+uuutyut?EmkWg?6,32c3t0L3kx65U4{{M&&*~Sii,lYs8]?,l--[<T \gfȊcUauǚjkƺM>4`ۍDv v#: tPWk:~qsr:ss<yItrat2]\J4nUnܵݹ/< =R=zy6y~rZxyy(D<M[RcqXU)ςDAmpp@u 淄VȎ'B,-]PyeʰpZ[#ED#;dj>E{GDKbcV܈UǶ,ܵp(60"E-VY%%' u !*X"+2qyu$$$HvI.INqIّ2s^S?IHNo d$d(/]+4 %˜Z6* UgB2[7]+?D̕v/7Zi<߼_V`VpVt\v*UWCWw^Sf(/f-imY+Ya} ~ e E7 M֛lQ-^lQ\Zm3g-.ybK򖞭v[mmlm{M|I^;;v~صd׵RIŻ%eAe{tlW~³RrS姽ܽ}5W_6WU>p_~V.~DpDRVs־Nnk=\/91c q&zDΓ'N鞪l55C˛G[x-;ۜۚΘ9rVl9s[IΏu;^_H0عŘw.-s9+W.vytr5k;\oaw۶7ߚzzolxw^o{[߅޷aݹqw{Ks?HaG=)}w%vsŸ= #oCϩK_h>;;r—C_Moo ޜјѡ6W~͇αб3>*×__|+nGB=e4d#;5-H2yJд"xGO u.D1i,DZPft-r jMJ'&ޣo񖉉hQqڛOJ*,,64UeESoIDATx] pTGzf41:A:@Bqˀk;6ݤjv6!UIm6q\Immmycg77ml,X\  45:͌Č{>FUWWg (P$p%ZwJ:E MQ|A"/|̕ ( (.5P$HH@|ؕJ (P4VIm*zVs_=N1$@P-5)͘PbHwow_H@kBǎ}{ZDO_:<b0g??=1%<xSOlFՋN@h4 )I$~8 k@ $U<tEE25w3J.=g Qafg8e!>Ǩ' ]-s4appPpů:,gJE{2$&9?X? (GKaUZ[;#000 Z8G[텿V * pUlgg'$88AAA"3@8tt`0@#,,lD[ɩV\='M @aنzCN/fFa^Y/,PS6l1uoR[hP[6 +$@@#4aﱯ1@B%?W7Pq3%%}IqߩQ,ZNwĺfa'-eo "E~ co&),~%g2bCPpdb7~?&0knɳ~CyXi}Jz \iBU!:: _X0/KJ[X ĄiH uAi) 7랼n|CJ=RfoJn" M\F*<Cx`b-:E %|³EVYhHLg ^KMRo >.M-H15qHe ~Q5lm(_.*uZ!JHӻ4 2>|݋K[#MY,*F@^ >Qf T|`ݧ6՘KWDyxԙsn}2Ϙ=SvSw0CrORn)]x~lJ.o¾CfsbY6bC襛2J%"-+3p@!u@ùC7Lw1i #1S۟EܢB>S¡ ҶJ5F]xO/]Cm̆1 ~m8 C&3QdxHy1"ܕkΙAh?q6_xׄVl߆z8 V?Snnc/_ -Yy/\ҦK"va F룑G.W^n挙HZN><icʝCDA7|ʂu=G"HLT(Z,vf<]gQp8|t="thV$cɢ5ֈ"n& d;Yj%;GUdi!ke?\t ,銛MJCXyoc9vΰƓNMˤA%ȥcY !t "Fe\cN8/E3hAcˈ:"66|\D2Z#;oBW/UGg@|14 !"9=kЅAɲPb|kǵiB*;eKq+*"-# ж P504*W=7 ͫɖ>@-Ed (~IV/e΅0{up_%4]=혙?SsP)xp k_Kd-Bye1l„!hnwVT)h0{^6N$ߡ.At\fvs2&=K'Z˱]N^b<^EKy2acI~ /tWe 4wp;n^xt\Çۂ&g-ߟG]bfxnbvj>T|HLѨoÔ#![ke۽6W,CPmahݛ/4 ;nBm>6C)Mn^a~F_Pne{ejh:SnC64܇_ݎ !X:ehrHtǣlN<_H3XV]9/MpC<' xN~؃vP؅9  g4?iI>TUX&4Żv7y7`5uMSg##}‹TM昼X<[Tr.XܘaxHI`䲙(S0tsBS)#eHDVL3!xxQ2srw{9v>?r<3rL^x6+`Dj <\m`5HH_p70/l>^Xu<dtYU6#"cV:^e_$S9NcN9ċr࣏ Ɠ$qҰi8D]s'SJ-u8z1/6:Ggw K*P_ VKg ZPU]'hS$Pi^J*Du\RѥEGe"gG2˞<e+P\Nj{Y '>_Uc(Svt؉j{M8N"Eߠʄi\99R.z\{U--UȤg뼊Ad?Xd~ԁ5>q9܆KIvl'ۉoq)L2XSuiw#xicwUvՓ*>3w$ƙ-.[M/":l><$ҬWe ~FrW3Pʗktyw^?vtDM[zH4$8gKItj]Di^٦"ܰ QTi_v'm<p980dGgM$cN*ߥΆd_,|3*P-&az]ExC&NkqRC"gOTJd!xNs87G]]ܣ^Thu6%S@h n?UU8q_p."<x",E%-߃wMA+. dgdX]'dAFNX335EНF|i yGf[ἓW+8W]X. 7|!3EzDl ]X c~^H[8QdZ+u5k<4: 딘|O{3#͟\W^˯5;] ,OⲭO!")?(qE* xf,,X35ofR\[[XiӅjHq>6$v[ώG"lK]Z+zn9Z.5Nj7J3mzդFl>קxm`QCt 뼱<"b~Gtu>5<UOr47W ձG%%K%#,WUGQӋ(y1DCQ;BغX9Y)Yr$WXKt>E2ŽA 0y_Þh-A.WcQ4tY'Q2-߈y8ke$aɆc7#.C6s 36e#[_(:XdSk/\SiZNJ%Y˿BOH${Zjx%vt6`|de ph>Dm}cm @S޶bcKp|H?4s:waf,xr{S @RtDwLu8| EGgx{E}C#m>N A5?6vm >ݻwۼ]Uc_~ǫXD=d=0N>s}e{0jk$KʸӓciA`Sl:'Yn'Srl(z \ LF`-3Lp4ou2Lt]qcvHh1w#M*<UG6r|[|Ǐ:Syi+4: lgy͖kV_|(E3#Ї ǝt0]ci%$&&8vpHZ,^f"ly{<⎧$\6Ӑ>ЦѮ|t Z:1.r>6<Ԍ8jdS*d|wԷIrl/F:^sxJƔ;Y 4Tv&Y\y4q >͂HwS."7# +̧MGEqysŊd#k 7QV#.)_'yZX8DOT$'̗u*k>׮B|>ـ盡I @/Z:.^qɈZ3khY&%fsXi?W3U!4 Y_&!h{PPSy@pb,VMC߆ap` C`Mp v1v+?m0O&Y|! [#W6P`:*d,6;k)v&u* i \Z|1pk8|}$فMN6ґ)NdTqYg27BMh K&dfѴ%IkQ>HYWo¨/sd8D?gD8O6aҙ:=\3߹ҺT-*>SM Tju8 f :3im}US$pIָ '&r= ;Ak^MGi/ZhѩɔãӔ{E~+x,4|v{4٦Eecd_Gv[Su]5~ViϤyfq[ hI HPJQYӪ-I#J@*.v|N}r ^% @asHKq_|$I(}) \;?xyobIENDB`
PNG  IHDR. iCCPICC ProfileHT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&62z,@؜LGhh@53Uhrm:Y߯Ws29@('r39(B#es\2]6ININ;Ss"¼P@aE)?yf6'Cl!({ᱹ(ltlOuRR3QZNL񿕑.y? դ- q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,,܃ӟ1C9^7g:3H@$pĢf$toӁ2PgvB@@l@9p -,  (!CT)C.d YA+AaP,@H CP Tj_ =F` L`=v=@8^<UQ߀<0Mq@$IFDj)E Bn#50L)㏉p0011L36f3bUX', M` jl2.v1p8{?.[یۋkuzq1<7ƻCl|߇& +/! #> 8QKt"ĭ6Mq$O'"H2R21=L";|r8*y@1xQ)bJ=JգSY-ZESg K+FBYO,QVWCvllIٛrzr^rlrri!+|  .* 6͋ơ] qt}:J/Gms+)JCb32N01Q1'iΦ9 s|R䮔TԨtW2SG9Myr}*U^ϥu˙[4܇j Cݪcjj~jB=j^3Swh4\5;5kd*2=2%樦Xf渖V:F'$mdڝڣ:::+uuutyut?EmkWg?6,32c3t0L3kx65U4{{M&&*~Sii,lYs8]?,l--[<T \gfȊcUauǚjkƺM>4`ۍDv v#: tPWk:~qsr:ss<yItrat2]\J4nUnܵݹ/< =R=zy6y~rZxyy(D<M[RcqXU)ςDAmpp@u 淄VȎ'B,-]PyeʰpZ[#ED#;dj>E{GDKbcV܈UǶ,ܵp(60"E-VY%%' u !*X"+2qyu$$$HvI.INqIّ2s^S?IHNo d$d(/]+4 %˜Z6* UgB2[7]+?D̕v/7Zi<߼_V`VpVt\v*UWCWw^Sf(/f-imY+Ya} ~ e E7 M֛lQ-^lQ\Zm3g-.ybK򖞭v[mmlm{M|I^;;v~صd׵RIŻ%eAe{tlW~³RrS姽ܽ}5W_6WU>p_~V.~DpDRVs־Nnk=\/91c q&zDΓ'N鞪l55C˛G[x-;ۜۚΘ9rVl9s[IΏu;^_H0عŘw.-s9+W.vytr5k;\oaw۶7ߚzzolxw^o{[߅޷aݹqw{Ks?HaG=)}w%vsŸ= #oCϩK_h>;;r—C_Moo ޜјѡ6W~͇αб3>*×__|+nGB=e4d#;5-H2yJд"xGO u.D1i,DZPft-r jMJ'&ޣo񖉉hQqڛOJ*,,64UeESoIDATx] pTGzf41:A:@Bqˀk;6ݤjv6!UIm6q\Immmycg77ml,X\  45:͌Č{>FUWWg (P$p%ZwJ:E MQ|A"/|̕ ( (.5P$HH@|ؕJ (P4VIm*zVs_=N1$@P-5)͘PbHwow_H@kBǎ}{ZDO_:<b0g??=1%<xSOlFՋN@h4 )I$~8 k@ $U<tEE25w3J.=g Qafg8e!>Ǩ' ]-s4appPpů:,gJE{2$&9?X? (GKaUZ[;#000 Z8G[텿V * pUlgg'$88AAA"3@8tt`0@#,,lD[ɩV\='M @aنzCN/fFa^Y/,PS6l1uoR[hP[6 +$@@#4aﱯ1@B%?W7Pq3%%}IqߩQ,ZNwĺfa'-eo "E~ co&),~%g2bCPpdb7~?&0knɳ~CyXi}Jz \iBU!:: _X0/KJ[X ĄiH uAi) 7랼n|CJ=RfoJn" M\F*<Cx`b-:E %|³EVYhHLg ^KMRo >.M-H15qHe ~Q5lm(_.*uZ!JHӻ4 2>|݋K[#MY,*F@^ >Qf T|`ݧ6՘KWDyxԙsn}2Ϙ=SvSw0CrORn)]x~lJ.o¾CfsbY6bC襛2J%"-+3p@!u@ùC7Lw1i #1S۟EܢB>S¡ ҶJ5F]xO/]Cm̆1 ~m8 C&3QdxHy1"ܕkΙAh?q6_xׄVl߆z8 V?Snnc/_ -Yy/\ҦK"va F룑G.W^n挙HZN><icʝCDA7|ʂu=G"HLT(Z,vf<]gQp8|t="thV$cɢ5ֈ"n& d;Yj%;GUdi!ke?\t ,銛MJCXyoc9vΰƓNMˤA%ȥcY !t "Fe\cN8/E3hAcˈ:"66|\D2Z#;oBW/UGg@|14 !"9=kЅAɲPb|kǵiB*;eKq+*"-# ж P504*W=7 ͫɖ>@-Ed (~IV/e΅0{up_%4]=혙?SsP)xp k_Kd-Bye1l„!hnwVT)h0{^6N$ߡ.At\fvs2&=K'Z˱]N^b<^EKy2acI~ /tWe 4wp;n^xt\Çۂ&g-ߟG]bfxnbvj>T|HLѨoÔ#![ke۽6W,CPmahݛ/4 ;nBm>6C)Mn^a~F_Pne{ejh:SnC64܇_ݎ !X:ehrHtǣlN<_H3XV]9/MpC<' xN~؃vP؅9  g4?iI>TUX&4Żv7y7`5uMSg##}‹TM昼X<[Tr.XܘaxHI`䲙(S0tsBS)#eHDVL3!xxQ2srw{9v>?r<3rL^x6+`Dj <\m`5HH_p70/l>^Xu<dtYU6#"cV:^e_$S9NcN9ċr࣏ Ɠ$qҰi8D]s'SJ-u8z1/6:Ggw K*P_ VKg ZPU]'hS$Pi^J*Du\RѥEGe"gG2˞<e+P\Nj{Y '>_Uc(Svt؉j{M8N"Eߠʄi\99R.z\{U--UȤg뼊Ad?Xd~ԁ5>q9܆KIvl'ۉoq)L2XSuiw#xicwUvՓ*>3w$ƙ-.[M/":l><$ҬWe ~FrW3Pʗktyw^?vtDM[zH4$8gKItj]Di^٦"ܰ QTi_v'm<p980dGgM$cN*ߥΆd_,|3*P-&az]ExC&NkqRC"gOTJd!xNs87G]]ܣ^Thu6%S@h n?UU8q_p."<x",E%-߃wMA+. dgdX]'dAFNX335EНF|i yGf[ἓW+8W]X. 7|!3EzDl ]X c~^H[8QdZ+u5k<4: 딘|O{3#͟\W^˯5;] ,OⲭO!")?(qE* xf,,X35ofR\[[XiӅjHq>6$v[ώG"lK]Z+zn9Z.5Nj7J3mzդFl>קxm`QCt 뼱<"b~Gtu>5<UOr47W ձG%%K%#,WUGQӋ(y1DCQ;BغX9Y)Yr$WXKt>E2ŽA 0y_Þh-A.WcQ4tY'Q2-߈y8ke$aɆc7#.C6s 36e#[_(:XdSk/\SiZNJ%Y˿BOH${Zjx%vt6`|de ph>Dm}cm @S޶bcKp|H?4s:waf,xr{S @RtDwLu8| EGgx{E}C#m>N A5?6vm >ݻwۼ]Uc_~ǫXD=d=0N>s}e{0jk$KʸӓciA`Sl:'Yn'Srl(z \ LF`-3Lp4ou2Lt]qcvHh1w#M*<UG6r|[|Ǐ:Syi+4: lgy͖kV_|(E3#Ї ǝt0]ci%$&&8vpHZ,^f"ly{<⎧$\6Ӑ>ЦѮ|t Z:1.r>6<Ԍ8jdS*d|wԷIrl/F:^sxJƔ;Y 4Tv&Y\y4q >͂HwS."7# +̧MGEqysŊd#k 7QV#.)_'yZX8DOT$'̗u*k>׮B|>ـ盡I @/Z:.^qɈZ3khY&%fsXi?W3U!4 Y_&!h{PPSy@pb,VMC߆ap` C`Mp v1v+?m0O&Y|! [#W6P`:*d,6;k)v&u* i \Z|1pk8|}$فMN6ґ)NdTqYg27BMh K&dfѴ%IkQ>HYWo¨/sd8D?gD8O6aҙ:=\3߹ҺT-*>SM Tju8 f :3im}US$pIָ '&r= ;Ak^MGi/ZhѩɔãӔ{E~+x,4|v{4٦Eecd_Gv[Su]5~ViϤyfq[ hI HPJQYӪ-I#J@*.v|N}r ^% @asHKq_|$I(}) \;?xyobIENDB`
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/eureka/ApolloEurekaClientConfig.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.eureka; import com.ctrip.framework.apollo.biz.config.BizConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.cloud.context.scope.refresh.RefreshScope; import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; import org.springframework.context.annotation.Primary; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; @Component @Primary @ConditionalOnProperty(value = {"eureka.client.enabled"}, havingValue = "true", matchIfMissing = true) public class ApolloEurekaClientConfig extends EurekaClientConfigBean { private final BizConfig bizConfig; private final RefreshScope refreshScope; private static final String EUREKA_CLIENT_BEAN_NAME = "eurekaClient"; public ApolloEurekaClientConfig(final BizConfig bizConfig, final RefreshScope refreshScope) { this.bizConfig = bizConfig; this.refreshScope = refreshScope; } /** * Assert only one zone: defaultZone, but multiple environments. */ public List<String> getEurekaServerServiceUrls(String myZone) { List<String> urls = bizConfig.eurekaServiceUrls(); return CollectionUtils.isEmpty(urls) ? super.getEurekaServerServiceUrls(myZone) : urls; } @EventListener public void listenApplicationReadyEvent(ApplicationReadyEvent event) { this.refreshEurekaClient(); } private void refreshEurekaClient() { if (!super.isFetchRegistry()) { super.setFetchRegistry(true); super.setRegisterWithEureka(true); refreshScope.refresh(EUREKA_CLIENT_BEAN_NAME); } } @Override public boolean equals(Object o) { return super.equals(o); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.eureka; import com.ctrip.framework.apollo.biz.config.BizConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.cloud.context.scope.refresh.RefreshScope; import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; import org.springframework.context.annotation.Primary; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; @Component @Primary @ConditionalOnProperty(value = {"eureka.client.enabled"}, havingValue = "true", matchIfMissing = true) public class ApolloEurekaClientConfig extends EurekaClientConfigBean { private final BizConfig bizConfig; private final RefreshScope refreshScope; private static final String EUREKA_CLIENT_BEAN_NAME = "eurekaClient"; public ApolloEurekaClientConfig(final BizConfig bizConfig, final RefreshScope refreshScope) { this.bizConfig = bizConfig; this.refreshScope = refreshScope; } /** * Assert only one zone: defaultZone, but multiple environments. */ public List<String> getEurekaServerServiceUrls(String myZone) { List<String> urls = bizConfig.eurekaServiceUrls(); return CollectionUtils.isEmpty(urls) ? super.getEurekaServerServiceUrls(myZone) : urls; } @EventListener public void listenApplicationReadyEvent(ApplicationReadyEvent event) { this.refreshEurekaClient(); } private void refreshEurekaClient() { if (!super.isFetchRegistry()) { super.setFetchRegistry(true); super.setRegisterWithEureka(true); refreshScope.refresh(EUREKA_CLIENT_BEAN_NAME); } } @Override public boolean equals(Object o) { return super.equals(o); } }
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-common/src/main/java/com/ctrip/framework/apollo/common/constants/NamespaceBranchStatus.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.constants; public interface NamespaceBranchStatus { int DELETED = 0; int ACTIVE = 1; int MERGED = 2; }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.constants; public interface NamespaceBranchStatus { int DELETED = 0; int ACTIVE = 1; int MERGED = 2; }
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/UserInfoController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.UserPO; import com.ctrip.framework.apollo.portal.spi.LogoutHandler; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.ctrip.framework.apollo.portal.spi.UserService; import com.ctrip.framework.apollo.portal.spi.springsecurity.SpringSecurityUserService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @RestController public class UserInfoController { private final UserInfoHolder userInfoHolder; private final LogoutHandler logoutHandler; private final UserService userService; public UserInfoController( final UserInfoHolder userInfoHolder, final LogoutHandler logoutHandler, final UserService userService) { this.userInfoHolder = userInfoHolder; this.logoutHandler = logoutHandler; this.userService = userService; } @PreAuthorize(value = "@permissionValidator.isSuperAdmin()") @PostMapping("/users") public void createOrUpdateUser(@RequestBody UserPO user) { if (StringUtils.isContainEmpty(user.getUsername(), user.getPassword())) { throw new BadRequestException("Username and password can not be empty."); } if (userService instanceof SpringSecurityUserService) { ((SpringSecurityUserService) userService).createOrUpdate(user); } else { throw new UnsupportedOperationException("Create or update user operation is unsupported"); } } @GetMapping("/user") public UserInfo getCurrentUserName() { return userInfoHolder.getUser(); } @GetMapping("/user/logout") public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException { logoutHandler.logout(request, response); } @GetMapping("/users") public List<UserInfo> searchUsersByKeyword(@RequestParam(value = "keyword") String keyword, @RequestParam(value = "offset", defaultValue = "0") int offset, @RequestParam(value = "limit", defaultValue = "10") int limit) { return userService.searchUsers(keyword, offset, limit); } @GetMapping("/users/{userId}") public UserInfo getUserByUserId(@PathVariable String userId) { return userService.findByUserId(userId); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.UserPO; import com.ctrip.framework.apollo.portal.spi.LogoutHandler; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.ctrip.framework.apollo.portal.spi.UserService; import com.ctrip.framework.apollo.portal.spi.springsecurity.SpringSecurityUserService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @RestController public class UserInfoController { private final UserInfoHolder userInfoHolder; private final LogoutHandler logoutHandler; private final UserService userService; public UserInfoController( final UserInfoHolder userInfoHolder, final LogoutHandler logoutHandler, final UserService userService) { this.userInfoHolder = userInfoHolder; this.logoutHandler = logoutHandler; this.userService = userService; } @PreAuthorize(value = "@permissionValidator.isSuperAdmin()") @PostMapping("/users") public void createOrUpdateUser(@RequestBody UserPO user) { if (StringUtils.isContainEmpty(user.getUsername(), user.getPassword())) { throw new BadRequestException("Username and password can not be empty."); } if (userService instanceof SpringSecurityUserService) { ((SpringSecurityUserService) userService).createOrUpdate(user); } else { throw new UnsupportedOperationException("Create or update user operation is unsupported"); } } @GetMapping("/user") public UserInfo getCurrentUserName() { return userInfoHolder.getUser(); } @GetMapping("/user/logout") public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException { logoutHandler.logout(request, response); } @GetMapping("/users") public List<UserInfo> searchUsersByKeyword(@RequestParam(value = "keyword") String keyword, @RequestParam(value = "offset", defaultValue = "0") int offset, @RequestParam(value = "limit", defaultValue = "10") int limit) { return userService.searchUsers(keyword, offset, limit); } @GetMapping("/users/{userId}") public UserInfo getUserByUserId(@PathVariable String userId) { return userService.findByUserId(userId); } }
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/img/release.png
PNG  IHDRXIDATx^mrܶǁ]Xr\qOUNPVN`VN`VN`O`٥LS!wWă7 ɇH'3@@(Юw@ S#n$Cz =P+H"F7 zV" D n)@tCD lV`~k}$ݿc11gYc] {m06:s^t}#鞷 _KykEbJ?1R !i6 HO] reb(Z`:Ŋ[ nHѳl=F8`Zu2I#6X(+$ oORMuW U`6x1ŗtąhӊĊ)шME[F &ۼ@FfEeS|}c]Zat\\AJcqewU ¢09cq~BOG䩬)V4;<us#1?N+YL!<R X0VEQe~TjS t0~nU]|V߬1 xрxсmA b"iVZB|fcU)cQ󊽙f/U`5Tloo A±CX0D0tsл# j I}|J2`m;K{><;]|:z<78<V}no.VĻu~@`o GfĒ)s1N =btQSG3 جݽtuLgri$Zox |JV"gP,g ("}KϢu9w!%S(Q:$3qo9eȾ y`,%)eȾ |V-/.9_&t+^঑跷 f< 2&qFFF<f<#(_4 Fl (XW',MbǵZ U8fUri;l$˞|ݝX-C=ˢbwr+'6p,2_| ᰠġ!M;+F%|flp@5zrC 7O;L 92'L!Cc;<]_y;#ljTNو?;0͐(gۆ^.褘#E%BI!A%%|:H _g%JZ?0XW2[k>No-Hh K10M2`?O$ .cUbP"l|z_P{`BP GAd '2U8;^#tNvADPr`&򄘱19D@.>vDժ ً;e3@`혷:o:n/})QP,@h郴^Gc脣&XML㏤Gr r4Mr5_!ΣOp_ J|MtI2]|&&Kop@u#@mU`r@um/8;"cכ&ӹmU> .ȑfP1h6w ʼQ1dجt,2ɳMm*oo5Q,@`〸WD `ɡUeT&0dzNXrD!sA 36:fW]5B2KmYю CU$Ud #YuKbA )#Y_lm ~ˬ.XC;jGjUhr<qAA Cfj!s*? CetJ?c(]@`(±Lt<3|c]R:6{ M(&(b)l]#{W/1@|Nf>b S/X b_(Uս0 N=cU92CXALn j١}ւta6wR[j:w=VYLʩLnfvsA'L'R(0XX}NT_04ZE-@VXzT&2V[(UO㏈͎ҟXD^b] -8f%9-(n[*Ә\Lƪ& rdj$e C^R'+~1ʒ44ǣI9u1AZ p9('W/@Hw /S r@V{3fY:* qˬi:/طS)`Q2ئSX(UV6R dNJXJ`0=X ;;l\w"#H׋J#] ʤ3V55]\I ۣoOlqYFYNO׺}+Gi'S'O4H5&nY"8I&#f0QZ(s4Os@GeF쁉bB3V5`|Re >6XsD+HCF,=8d8R{qmZM]Fpp+^. V`9axv5G24 !m.vyA'hre%#f85Jأ8Ae|A)N-}lap <~^{Q m+Up>4DZv,@7 ǖD?&r΂J[s"P=r㏤iHf( ~`~y@u T1MʕsM-MnF1DKx@5!ڥ-NsMDz GU e,󝱿1xTO@4<# x*uqƘZD~j8•T\ Ѵls<-% =<-^Tqߵw"%S\KRWfi-%TVK󫮛ŭDt 6TlcuBeFl%*}Pe>.TJ׈xwm H+?beboYHf5ZFX$$Pݽ- R4xq/m]o5[x@5t Q=P @<@W{UTR4r< htSWſ] =jMs!oJ\ju}E^޼D1y=xo'+i6  y ꂉ#_YO{l:rX=P_<-_j@q~▾Rȡ$@jOO]I2qmG " f?^,$346SȾ/ȑ @d <wH`^MR!P4Tuq\|) AҮ@N否]U~b9: 5 yׄMiVq&\6>:;٠'Byۀ<_ KTECs$lC6 @o'Ji =PBM&_i_eġl<Ch841 P` McH9qxV DhD-bHItqh5]@0(METkrmb) @ZJy84FDC4jU@Bݕǡ - 84fDS8J5%@ҷT&$`41ӯ6,'qhæ]ID֡T6 @F 8TNĎZ[jX.@ġ Ŭ7H9"ڦCӵ$E4,h&@ġ D]7 QkѴEE118TMče7G`á ec=w׽\$9* P69Hr&GU *jlr L(@TB əVQ)@39:QQ eS$grtXE&I谊AWIENDB`
PNG  IHDRXIDATx^mrܶǁ]Xr\qOUNPVN`VN`VN`O`٥LS!wWă7 ɇH'3@@(Юw@ S#n$Cz =P+H"F7 zV" D n)@tCD lV`~k}$ݿc11gYc] {m06:s^t}#鞷 _KykEbJ?1R !i6 HO] reb(Z`:Ŋ[ nHѳl=F8`Zu2I#6X(+$ oORMuW U`6x1ŗtąhӊĊ)шME[F &ۼ@FfEeS|}c]Zat\\AJcqewU ¢09cq~BOG䩬)V4;<us#1?N+YL!<R X0VEQe~TjS t0~nU]|V߬1 xрxсmA b"iVZB|fcU)cQ󊽙f/U`5Tloo A±CX0D0tsл# j I}|J2`m;K{><;]|:z<78<V}no.VĻu~@`o GfĒ)s1N =btQSG3 جݽtuLgri$Zox |JV"gP,g ("}KϢu9w!%S(Q:$3qo9eȾ y`,%)eȾ |V-/.9_&t+^঑跷 f< 2&qFFF<f<#(_4 Fl (XW',MbǵZ U8fUri;l$˞|ݝX-C=ˢbwr+'6p,2_| ᰠġ!M;+F%|flp@5zrC 7O;L 92'L!Cc;<]_y;#ljTNو?;0͐(gۆ^.褘#E%BI!A%%|:H _g%JZ?0XW2[k>No-Hh K10M2`?O$ .cUbP"l|z_P{`BP GAd '2U8;^#tNvADPr`&򄘱19D@.>vDժ ً;e3@`혷:o:n/})QP,@h郴^Gc脣&XML㏤Gr r4Mr5_!ΣOp_ J|MtI2]|&&Kop@u#@mU`r@um/8;"cכ&ӹmU> .ȑfP1h6w ʼQ1dجt,2ɳMm*oo5Q,@`〸WD `ɡUeT&0dzNXrD!sA 36:fW]5B2KmYю CU$Ud #YuKbA )#Y_lm ~ˬ.XC;jGjUhr<qAA Cfj!s*? CetJ?c(]@`(±Lt<3|c]R:6{ M(&(b)l]#{W/1@|Nf>b S/X b_(Uս0 N=cU92CXALn j١}ւta6wR[j:w=VYLʩLnfvsA'L'R(0XX}NT_04ZE-@VXzT&2V[(UO㏈͎ҟXD^b] -8f%9-(n[*Ә\Lƪ& rdj$e C^R'+~1ʒ44ǣI9u1AZ p9('W/@Hw /S r@V{3fY:* qˬi:/طS)`Q2ئSX(UV6R dNJXJ`0=X ;;l\w"#H׋J#] ʤ3V55]\I ۣoOlqYFYNO׺}+Gi'S'O4H5&nY"8I&#f0QZ(s4Os@GeF쁉bB3V5`|Re >6XsD+HCF,=8d8R{qmZM]Fpp+^. V`9axv5G24 !m.vyA'hre%#f85Jأ8Ae|A)N-}lap <~^{Q m+Up>4DZv,@7 ǖD?&r΂J[s"P=r㏤iHf( ~`~y@u T1MʕsM-MnF1DKx@5!ڥ-NsMDz GU e,󝱿1xTO@4<# x*uqƘZD~j8•T\ Ѵls<-% =<-^Tqߵw"%S\KRWfi-%TVK󫮛ŭDt 6TlcuBeFl%*}Pe>.TJ׈xwm H+?beboYHf5ZFX$$Pݽ- R4xq/m]o5[x@5t Q=P @<@W{UTR4r< htSWſ] =jMs!oJ\ju}E^޼D1y=xo'+i6  y ꂉ#_YO{l:rX=P_<-_j@q~▾Rȡ$@jOO]I2qmG " f?^,$346SȾ/ȑ @d <wH`^MR!P4Tuq\|) AҮ@N否]U~b9: 5 yׄMiVq&\6>:;٠'Byۀ<_ KTECs$lC6 @o'Ji =PBM&_i_eġl<Ch841 P` McH9qxV DhD-bHItqh5]@0(METkrmb) @ZJy84FDC4jU@Bݕǡ - 84fDS8J5%@ҷT&$`41ӯ6,'qhæ]ID֡T6 @F 8TNĎZ[jX.@ġ Ŭ7H9"ڦCӵ$E4,h&@ġ D]7 QkѴEE118TMče7G`á ec=w׽\$9* P69Hr&GU *jlr L(@TB əVQ)@39:QQ eS$grtXE&I谊AWIENDB`
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/FavoriteService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.Favorite; import com.ctrip.framework.apollo.portal.repository.FavoriteRepository; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.ctrip.framework.apollo.portal.spi.UserService; import java.util.Collections; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; import java.util.Objects; @Service public class FavoriteService { public static final long POSITION_DEFAULT = 10000; private final UserInfoHolder userInfoHolder; private final FavoriteRepository favoriteRepository; private final UserService userService; public FavoriteService( final UserInfoHolder userInfoHolder, final FavoriteRepository favoriteRepository, final UserService userService) { this.userInfoHolder = userInfoHolder; this.favoriteRepository = favoriteRepository; this.userService = userService; } public Favorite addFavorite(Favorite favorite) { UserInfo user = userService.findByUserId(favorite.getUserId()); if (user == null) { throw new BadRequestException("user not exist"); } UserInfo loginUser = userInfoHolder.getUser(); //user can only add himself favorite app if (!loginUser.equals(user)) { throw new BadRequestException("add favorite fail. " + "because favorite's user is not current login user."); } Favorite checkedFavorite = favoriteRepository.findByUserIdAndAppId(loginUser.getUserId(), favorite.getAppId()); if (checkedFavorite != null) { return checkedFavorite; } favorite.setPosition(POSITION_DEFAULT); favorite.setDataChangeCreatedBy(user.getUserId()); favorite.setDataChangeLastModifiedBy(user.getUserId()); return favoriteRepository.save(favorite); } public List<Favorite> search(String userId, String appId, Pageable page) { boolean isUserIdEmpty = StringUtils.isEmpty(userId); boolean isAppIdEmpty = StringUtils.isEmpty(appId); if (isAppIdEmpty && isUserIdEmpty) { throw new BadRequestException("user id and app id can't be empty at the same time"); } if (!isUserIdEmpty) { UserInfo loginUser = userInfoHolder.getUser(); //user can only search his own favorite app if (!Objects.equals(loginUser.getUserId(), userId)) { userId = loginUser.getUserId(); } } //search by userId if (isAppIdEmpty && !isUserIdEmpty) { return favoriteRepository.findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId, page); } //search by appId if (!isAppIdEmpty && isUserIdEmpty) { return favoriteRepository.findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(appId, page); } //search by userId and appId return Collections.singletonList(favoriteRepository.findByUserIdAndAppId(userId, appId)); } public void deleteFavorite(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); favoriteRepository.delete(favorite); } public void adjustFavoriteToFirst(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); String userId = favorite.getUserId(); Favorite firstFavorite = favoriteRepository.findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId); long minPosition = firstFavorite.getPosition(); favorite.setPosition(minPosition - 1); favoriteRepository.save(favorite); } private void checkUserOperatePermission(Favorite favorite) { if (favorite == null) { throw new BadRequestException("favorite not exist"); } if (!Objects.equals(userInfoHolder.getUser().getUserId(), favorite.getUserId())) { throw new BadRequestException("can not operate other person's favorite"); } } public void batchDeleteByAppId(String appId, String operator) { favoriteRepository.batchDeleteByAppId(appId, operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.Favorite; import com.ctrip.framework.apollo.portal.repository.FavoriteRepository; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.ctrip.framework.apollo.portal.spi.UserService; import java.util.Collections; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; import java.util.Objects; @Service public class FavoriteService { public static final long POSITION_DEFAULT = 10000; private final UserInfoHolder userInfoHolder; private final FavoriteRepository favoriteRepository; private final UserService userService; public FavoriteService( final UserInfoHolder userInfoHolder, final FavoriteRepository favoriteRepository, final UserService userService) { this.userInfoHolder = userInfoHolder; this.favoriteRepository = favoriteRepository; this.userService = userService; } public Favorite addFavorite(Favorite favorite) { UserInfo user = userService.findByUserId(favorite.getUserId()); if (user == null) { throw new BadRequestException("user not exist"); } UserInfo loginUser = userInfoHolder.getUser(); //user can only add himself favorite app if (!loginUser.equals(user)) { throw new BadRequestException("add favorite fail. " + "because favorite's user is not current login user."); } Favorite checkedFavorite = favoriteRepository.findByUserIdAndAppId(loginUser.getUserId(), favorite.getAppId()); if (checkedFavorite != null) { return checkedFavorite; } favorite.setPosition(POSITION_DEFAULT); favorite.setDataChangeCreatedBy(user.getUserId()); favorite.setDataChangeLastModifiedBy(user.getUserId()); return favoriteRepository.save(favorite); } public List<Favorite> search(String userId, String appId, Pageable page) { boolean isUserIdEmpty = StringUtils.isEmpty(userId); boolean isAppIdEmpty = StringUtils.isEmpty(appId); if (isAppIdEmpty && isUserIdEmpty) { throw new BadRequestException("user id and app id can't be empty at the same time"); } if (!isUserIdEmpty) { UserInfo loginUser = userInfoHolder.getUser(); //user can only search his own favorite app if (!Objects.equals(loginUser.getUserId(), userId)) { userId = loginUser.getUserId(); } } //search by userId if (isAppIdEmpty && !isUserIdEmpty) { return favoriteRepository.findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId, page); } //search by appId if (!isAppIdEmpty && isUserIdEmpty) { return favoriteRepository.findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(appId, page); } //search by userId and appId return Collections.singletonList(favoriteRepository.findByUserIdAndAppId(userId, appId)); } public void deleteFavorite(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); favoriteRepository.delete(favorite); } public void adjustFavoriteToFirst(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); String userId = favorite.getUserId(); Favorite firstFavorite = favoriteRepository.findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId); long minPosition = firstFavorite.getPosition(); favorite.setPosition(minPosition - 1); favoriteRepository.save(favorite); } private void checkUserOperatePermission(Favorite favorite) { if (favorite == null) { throw new BadRequestException("favorite not exist"); } if (!Objects.equals(userInfoHolder.getUser().getUserId(), favorite.getUserId())) { throw new BadRequestException("can not operate other person's favorite"); } } public void batchDeleteByAppId(String appId, String operator) { favoriteRepository.batchDeleteByAppId(appId, operator); } }
-1
apolloconfig/apollo
3,882
Polish log
## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-08-10T13:48:46Z
2021-08-11T00:25:00Z
2c9b4dccbcf31012913b270cc356a30ab0cab89f
2e2919d21c4590212b6b471075f81749e4606c26
Polish log. ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./doc/images/text-mode-config-submit.png
PNG  IHDR$D ) iCCPICC ProfileHWTZ ҫ.H! J A^\`EWElkdQQ,,AEEY 6T$tWλ߹wge'@/Ƅ3S$ @`Z #@UiWQpElh8"v.a7Q  !Ad)ΐc])Nc;M\Lā,0%i|f!;Q@lo؛@,xlnnT-Ҿi1YQ,E&@HÚNFP31Ҝ biEFAGf/w2š}lQ3p9p\ qv0v` e 4a^p|1gY&7lo劂bGlyaÝ+ʌKD[ y +A!ʎ }P9b#H9@6]#4sE#yall,M} 2BXW1 s8\~07 .abAN=#g차0vķn0<`Xw897 &Ò@/yO0`!\`3Ha qh_PeT+m@P @k޸'k_Xp7}ď<2*1H %-Gy!Xot\#9|GxB$<$\'HAx,2l5Hs&$0Zpvi0f nY; \N0? 3r6?'e}>z%+%ai+0jc-eQ;]:NcXvRGwcN-F-}aBz22 ~eٶcv.H쿍0.}7^t,cN<5<^8 :\Z(Ó199 |A@Hg\zbP V l;^puepoBGF7 B"$IE2>"F Rd-R@_"҉F^5 P*f8 C8t*Et%ZVZ zJ0Eb6Ea)X:&a%XVZ_$X'tl<+x-ނ_Ż~+F%X<a$BaPFM8N8NHd͉l&+[MN#D"YHQ$TLDO:M">dr09'/"OOɃ *  Q Y v)4(\QQR)^8Je!rrrFQQH]q"Oqba ݊jT+ju UL]ICmަhf4_Z VM;K{@DWU S(WTURzl<MHL>3<J*7UTQ+T^T}FR3S R-Q۩vVlb.9z:Q\=L=KTzzFLJ0c1rG7|1]ckhjr5K4i^ ZUu_׶Ҟ=C{9>uON;nlݝmzz!zMzgYO x N<gj09rf P0Plðp(h!c7t&&MԘ1U0u34hj,lY3sM0"{4 |*kDK7l-VUUkŚgźs,aXت7m6~6656ݶ Eu/ǙKf\븯vv9vګO_d`ʁPp͑8߱񕓵i-gD_\\].]z]M\S]7tSwv[v>߽G<m<=y>o>;~G^F^,^owvo˧硯/wS?K,~/x h CKۃԂ*g8i % :apjxlxEaDDt℉&ދ4GEuQͣD=rғ91bǭo/oNPNP>10qm$i\ܤɼRJBA7L<xʍSgN8M{ZδӕM%&K̊bU6/8^w-iWg^2z3}22x ޫЬmYﳣd$%-yy3:ւb$#C~0\[ UMl!I]]XYaFŒ3UggͲ|Ӣ_fٳY8{yi_2gAȂ ) nEo'.nXdG?TST,,se2޲7-Z)TjWZVy{ť.yheU.&毾g޵k>Z7q]zo7Lp̩lFFFIyDy&M7}Ȭ^_yhol6m>mm#dGmYUNOv%jڻKw#ڵzU5hw9PapX|8~уLm>N?^RΪˬ'wpoi4l<qr)ʩ%Nh48yzݳIgLji?~g[ZO_xKn.\msn;]k^phy˧篅]|=znN)ŹvWw ]ppEr;aû؏^<=ܳ IS5v<`_n~i_'z֛=o6D<xn}{?}lϤ_,4| zo(whHdW 4={%û|Q/ 7 o4_([a1 [;eXDXT!|z/¡-CC_vAhʗBwRF?ʿ<9lXA%'Y@IDATx|VE5H : "v\{ǾEײo{w[\]ꢮ`EY+EzKHw>7>- ϓ>sgݹsߜslڼ}("("("("("("(@ OSE@PE@PE@PE@PE@PE@P,JDiGPE@PE@PE@PE@PE@PE@XRE@PE@PE@PE@PE@PE@P`m [EΝ[WE@PE@PE@PE@PE@PE@,Xy \QwN IPE@PE@PE@PE@PE@PE (G2=H́UDPE@PE@PE@PE@PE@PE Q(e" Ҏ("("("("("(@C Q(e"*QAg("("("("("(@F Q(e"fçg("("("("("("P^*/Z^PE@PE@PE@PE@PE@PE %aDE@PE@PE@PE@PE@PE@P"DTy"("("("("("((&*"("("("("("%ʋWE@PE@PE@PE@PE@PE@D@@X4QPE@PE@PE@PE@PE@PE(U^"("("("("("(@ JD¢"("("("("("(E@"E@PE@PE@PE@PE@PE@PP"*MTE@PE@PE@PE@PE@PE@(/JDA-("("("("("("Qh"("("("("("(@yP"jyE@PE@PE@PE@PE@PE@P@ EE@PE@PE@PE@PE@PE@Pʋ@VE@PE@PE@Pj͖o~#RP8~l!}ztF֭>RRRRZj P^=̔f͚O* jZ"~ڣ!Q}?Tk-/@E粵W~JMN0v>7;wJ5ZFPE@PE@PE!PTR${Mn^ZZM@2hI/4|ٲeKB5SB ++Kt"(y5c>f]~6m9-nݺ~%bE@PE@PE@Px- g nP5k.)YlBF㜄`ܹjڴlZ$JZ$tʹ_X\blݺUPru=vhH&ʹHivHԌo5:Y"P\8&KDCEu)"("("PPP ҕ"^KsM\x*!PX@X( 걟k٣Giܸ\x!B_#J?vm쐨9jε3;J9]UpS"\ m"("("(UGR` Rp]XgvZK(@۶m퉹k,]P}dkgDPim>TK}"("("Tn/% _5`I4]Swcݾ}*s@ff=1wcˣ!Jo L?v쐨yj5gJx)_PE@PE@Pj@jRmf$rKJJR^UDu"yik3kcwڟ5[CͻR/%+"("("("("("PCP"^X=-E@PE@PE@PE@PE@PE@P7JD+WE@PE@PE@PE@PE@PE"Pv-͓;vDaR~}ڵԭEN:UܨC1-WZSPE@PE@PE@PE@PEP"bSO=%vjY:u䦛nH:ĉe4ѪUZID)&"("("("("("<JD%Y*Q^=k'8 (4lПdSOMs_-X9ٹs :Tڶm뒢k:&Q'?E@PE@PE@PE@PE@P D`6+ժ9sdeשSP"LfMPE@PE@PE@PE@PE@PP"*!4SMA@w%/pa*ҵ:%tnB4SD`=jY+"("("("PM[Mۭͮ$pS$An4Ť&^U='E@PE@PE@PE@PE@P}ZD 1 ~ˎ;ʴ8;;LZmHPLjUsTE@PE@PE@PE@PE@,j4yfYnl߾=_ZZ4o\4iI+FqqZJ mUUV^ު#ׯ_oe6-77מG$Cmdff-[ڵk#cQD֬Y#,ի'M6f͚Iu| 4=$??_-[&6l 1[h!pp=+R8}^71*OVd{.E@PE@PE*#0Pٱk,޲XV4A6=ƠVdێm*Ūb ٵkt޽N-Bl2J/xEx>##CX\폫F?F/n%L'?U[^1QF)_gki&(AlܸHT_PKKL{_ΛN{ɜ9s" CO "[b-z!t,B*W\qlݺU^uowMF-999IOe2A]tEҥK:u[s8餓d䔷(;V/^lvў;Oz|?ɰ'裏'4?Yz^P\?\(uF{={L2Ş˻+3g/-pb_|/ &CÇi˗/~Z ;' $sI&AҩS'9$9h)"("(#)6[7뾱Pl%5?H֩+2;ޑrF3$aY?G&-2l}(mRK V}kyw'?I~vmva!exoT?,X@X ܵkW3A}QygwL=J3Au'luA+Ro[. rmM z0gs}~B~yX@.J,f%K{ﾓo]N=@&M$7t\z,0&_0 :;}w`(~_ɴi"}1,|<ʒm۶JYy ۴i<V=5e_" -^~儮  r%\Rl 4O<r["M]+ ,MnS^.7_2LX◠4r0@/Zr cǎYyP\re~"ëj⋣&{OHoΛ'xbd*ny$"<!>#kWP9& ?Db G1bDv"P lXO~z\wY@*_[W<yeR)(~N>l޾C:̕K؃ZV%])"(@ nMKnZnj%unj[sGNKB+`\wuoZjBϨ{ /)"Vgu]g o<䓑}N)=ɞ={ڟ% 82XR@C}΀kQ,DPCBO #<K }≮l9Hӿ*B=O>G 'Z^U,z8}5YaqH;WO}˼yZpo1VɶSEkA TҡCt zQβ WH2PJ~zL#o.r׿M*~0l-/FAui@-J1D,P Db+@AL,ubo=Xzd ~vIZ讻 ; :2$@$0.~4'&k0 Cz\"ߋw;s- Un%ꫯC&L`-Gw(5 ,)%w,̏2&r2{Xrkⷫ翎Iu ʃ_KNoR(aU0#'?Wdr?5,\re؁-{likΛW_irC]Yޜ|[ez"("PQzXmyymd(PX2#,a zuIΧ ^s9i9ҸAٕO&-3KWocF[+tҰ]^NpɊ8A"Ϋ*?|yG{&:nƨ4Q`3-P;9^`aÂX>ĕs,z[J:}c xU[Qcz5t<8ʻ?^QTzV(q% H|ڷoo=|MF_cXB?ΰV;"ʸ&[XoTA^ 'C^14Q=o^ְu?8.!3f̐ /7~ñkσ$ӟ*%w 訩PboҥvPuigI^^T;_e,*<u T*fBBvP/V2EWTH$1BZ:r-I282IHTXǪ* &rOs"a~:bth)K(=밽i ɝgt;Jw/δaݚ~Tn#P&ϟbӿc˜S$Ut-C<yρml!sybvyߊ"(B3J&RlIiѦEfٹk%܎6|'6ȩO5n''$o-ze#ڏMQ;|? .u/5'ճ?)W*UH۶m-TJlC;nܸQk7U߹sZP,EPW@:(kl/,./1whrR^]ܱt^23ғ+lrNuqګ@y9yd~ <+o]TM ~gO"rg7\Fb X˄BcAN>n#Lze|^q>K '<@vَ{1c |A;.qdkX"ofUnKF k0[)ٵ Ku}uI}a\KU `B޼mtXay&,`}X{瞰e;Ru Da3'8)˳6r)uDŽxӔsڷo_KDwF(+D#P#ӧT(097|53:k2 WxV92Yf ;fe~CdÁ „6;)& a¤#!YpYV&-gއ+×v>lptþHRG[7-N**zeLj}L[hU͐6p [wNY&'"Y&B\={$kh ԵU|pˈ EjjJbx ޙlc E)'i^7Y[Rqz}mP9v)kF]Z?~EO9˷K;o`J6,8 9ϐR7&+7nO ͯ("T#Cشt$/:4v0$Ϣ-"6dhl,IgcujygZu˾b[%~SXKTy#/A'*x% މ1i$9rdD_F?^).!c_~G~I3 dIQ4 ;E>edZ>&dBe o)#GgD^AS?HQ֓6OXo@xv 1Gh$SƟ׋_m͸A?-6:% ~L*꥗^:2o<pҞJaÆ u} ѭkÊ paF_; oֆtԨQ:i?B|4 ȗfˇO,u6Yaҽs:6nS{\d%2A")B r<Z{\<t$:Loq{/?7 ޻m'˪B Գgl9X?+Q,nqw\|a=ì^=sw!]bPM|Ax`?ߤo&0F  bc ~gɛ#֬Y8A\P\#&?~1;̰ADYgau%bR4LXƋ6<_ykTnt&2sʵW{'ɠ .vB ڽ憘0_,k5l !Hhh Ƅgep'xM a@lԁevjJs-d~⵾I=RPXL9VD!f)iGCLNoQ7.}~ $cʰzڡ4_2_PE@H x*9t1鲽dl.JȦ{'h*od˳ߛ*EQx4h( }K,SLWe*,) m7ku/%Ұ^C_'|NsNkPyo)**F1xc*(^c (\8p# wzX=7X]XǪ6m&/9IubeؗޕHF;4)"N⋈7SzH˻<VP(QO8;8.s8aA,epHÝ">C\Y DB?.OG6p@Fo{ XYcj~lyoҗ2):yՕZɉ#ʰf9MLGX+\~s[(\3ƺ)U).FQC"Xrz"tO~!9{0$k,OD7D5x(k*57[/ oL5j+{w-^یRsUǾ&}mģ帣4ׂ-ܷDqt<7zb>zr rUWɉ'hux 髌A ߶Eb$Щ sJ 客i xArgDPe@reEhӦ]%k6 a(VLc6Z%H0c&6Ay*"  Yp{&9X c+Vغ8O a@4Ț_. (&\y!a0 gm->S.$ty"C2L cgB5O!^%2-B$-mO;b=T)En%`%g qFG}.zk+K>Z`e)bՄSܵ%M5cV^붘cIReuTrN 5%*P_18(?X1UsA1HWs()":buRtl':K"߾, ~om'pӉxNyybe;ewiR_{ ΐu+>ۣ,~xɦìYApQmk.? k[卥 (ֻ8gϾ :󳸖EX`Uĭ>o^AM/u{wq!d ;g 6ݻ_n;&fkvnE!p/,K\{,GP\Z \un+-!i+_E!Jy" h?[H[SaRӯX=CJ~b׳oEINw7\A<iw;tdZs9ZAg,f@0Vނ0wB,P.'w"kCUvϺg /nyrep^_̘=W|c),X\=8ԾyFE"9o euxmd~?zKB d~A `IѠ:X$!~𓪮 s5Uǎ]rZU#8a =dSҗ0%{sy˻m,xf. /1ǻp!^ D^0xU `0\h2ŸD0AF^L/{A$?_e?[ c0x*XRo^ [EċT<2х%{(Li7.%r3ӌ体7s??"&ȸ1ɳ~k͏B^ҽh[2B,%m,! U{;Xc4~J.k|ϫ<\SiDAKS;>,Vơ@Ax{n=}_>U7}~`"(@4SjվQ{ク% .O vX+%!l7jPj 6VLn_թ'w[](]"MTr d&Ks)7q A+,OXuxN!{'ӏ~#[ dJ[\a- kCldʰ=<,-1YlܴU>%bGvV#@iג~am߮ V\;"/Yx>LVZqF)=9~bd9x‚T%^z^n -])w"iπ __ޞqÖ+gt4n|g>\ 16}BcokZR"I&<x{ǽڵkgcKV*gn[s̙3-/ {ߵP< N:v\x(iJۋC!=Y^7A^~!ulqxzw11}p'x yEglfHy+#Vv,#HTcHۭSy&b*ɍk2X`Ox~vI S[Ap`mÍf$MeZ')Ipyo~6M%dۂH w| Nb`13fL2q&<-AH R U\t&CI$qx5UwewO.Lf̃)*XnlDJxؘ|zBιVߦm2dĕUфّ)ƒҭIg& WkynL8#[7Zx@$v.R,_&0ggt/jH qp!ԸA]oMI>o2/A1i-̹vk!$&=Ӎ5W-д5C*#msٶbrV`pKJXC~q5;͸vkc&m3g,p/KvPKK ݸTX?^U'r~;w}KMЬ?><W!|~BN1DwkSƲzCX֭qb<"#XߴpO]oX!8xm.Xu*H(~ml uCF]HY а2("!I [dTV]c斥RZ[$;k,㕌rA Ҽ[(uiEiy22-3gm[M=whC¢OXĔG/qH +!)vObFmݵ D]gQ^kuX(}d:z XvF׮n&yfX:fQ z７z藘ctꩧZ}D##,nן"ܠ^ܤA*-Я ė#] ͅ= /(cIo/-]Z>r 7d)#rfY'cUYr ٵcPUI9׼$m* #(xY ! = BBdX`3Ą+oOF%W^`b!"c.Eg`tbIx-dB.YPﾈeN\: X A3 iI_d?VR/ E_{wGy(,B ui R>z.?fJOI ٦Nj? qIX3 "\G9ɳz2Y *S ]V0I M<dbc?IoRf`' ?7//# ^ewo{RaGIC0.JU-dQa*UNhD:x\hH#b'A 9Z}[A9fÇvp9jk~)o/$,VnF82moB땑'^ n(m@1 Sk6Ԭܐ_ȈYr~f&.a<\|9h"gwʱVieouA崁cRWM'; K'68 XvU#JCP21˪Me'|߻smd6Ҭ^ =Wl(lKR.,„I?}e\v3c9myXMWE@PB_MMFI60~ SPvZ|vlC+[,k HFŠ 0LZeFDݿE8N8iZSA?vɑo8O/I'_xKƛx)砨[tu4ɶss-QSN9 -DW(.q,ޛ_XO.(dQO_nƸ$++* DPt;@9GKBĜY{{q"kChaAP'N/.}K:3o,eq/ +XD]8+s?Jcvmw+H7ࠞQ$âyңKyXࢴč({l~;&RY9q B]ZХc5)H%//O-Z$SL,뭷~\qg aYe{c|p/K m\oia]9QZ2<˼zlG;'l1>uF[;NAH!,O|{~]-ī?y31wǬ-DOЎEUf3qbI IGeDb'aJjxuU~J ~tI*u2`A277ן\ׇwgda}[iW " BɑQRoac%a7eFwljv˫7]$+N4.\{iEb^8EV7x񝖷vlQ|A$%*KE ـG YeEEVSX1\\}K?c[FK-;u.1Wg#75z{!_HhX+Wn<Jh; \XP?4ϼȚ>jCɋ"w0=\5cuy6Y,aRGQ^+WUE@eK ֆ _fR*Y 7JvnYP%TҹIH>Xh<3Y7n/F ݝK~;RʛVQqG#(knDꎛc8̯b͒WՊSzs;E7-6np[Ś,4E5q!q]w4qFurѭyr,a6{rx/:* e)NA<REM' A}ӛ~JÎC 1} ;O%;]}xWhbԫKp=c򽣖wyGN1bqBDAݱeL . i zPH&d]t0AZ}і9_uՌ9 Fk Xq&+23m|9mƂ']?}6Mn7,10>q\7 =/3. DdiSO==deH b?E`joZbF}%% GyDWX%{"ŰIWLD{҉Bɱ7~f>zU9^ ~y!2~S79}BX2yc6pqc1‘FWm)[w~Mޖ}yg&9^K-Rf}QXl߸;yLY}|)ibܺye!57mo^3mjh0jw0dԭS˩ g•bL#)kwo؂!ḙR$ڒ6_ |N1T֪\{.Yi/K Th⯾Ɔ8Zw0ۣ %+M3ʉMK>G`˹Dd`\WX_]YqU8"(cC 99Ou^"gsfYSZgIf̈-1R9=%apP'H 5堈b6qjr$XtkOrr/W}*U"[6AQi(ZnfI#9!>PjhXC`KVKDQ(r|M }W A&SN6,@Xn;gbmk|CT`tYcƌX'uB1p+: q+"BX,tܮdeA5YxwT(k'4wu dkZ+QE +/[i7-XEŲrZ>d}duvv>͏%&X'A ijF"/ו(Ŧ_چ^b@gذaٴiӬ?E1au ^c㖯uq_o- _yg#'}XDד{y=,3P{MLVL=Xb]u'GώoABP ~wx Թs뮋 QG<mdAejSZ69XÖgǎFxlfuNʆݔ /s/?*[8YP"$(ןV/DVx<T!~o\|{'TDz'"ng&FvSvrq) zzZOT}]2Q3ˮA}w&&S]i{H9Z42cȞZj _p8m;aD|+鉹ker6.䘍S'rf9ϟn|smUⰖgȜ?ee9~ϏVMITdȼg,!dfC\Zɦ=o^[ZS^A^rۧuĩjb9jqQ );{?H̼ZQAaM)Eng^ = gyX+bȃo͉E)"b i cZe6.TZ3P$ xqMٲ aEPEQ}5cO8( w{G;Hː6C=|rcJhFcWn/7ZH@@ l5P.sc_O&0/;tN O|"k9CAcJر4 kXek\[<cr!O< @|&ņ\D>+O{B\yppuq_\%W3<xuO.&4 ~Sr3z0ҥK<`-$wq~`{H[*?_סm+i۪fJݥ[q>9l:E*[EC+Xknȑ2fk<yސ[H/9V!a: :˦<HEh]ҧGkɔJ7l"ϖ"Cʠ~ryG;Moz"XZp$,';XIaAu;}*.7X[aa裏,~},c+~W*Wo7|Tʇ@'4H0'2wXaB2.l5u3o[@ s` 01gɱkMȽs<#ܾHz~Fe[, sC$-՗XB2 s =>\!0sr,X+SߑPiy﵌:w[vqg lޱKB>b1:)!Ȼl[!ϲ%X`m()5#>x!/WAx{ɰҔ;Or\k rF^) `;,as!qɖ]b 6ַ7%`SeI(bBk!*!⦝yLJ. ߬G/bGGY6*VޟP\1sK ƽڭE2evM}A!]Y&<C^7_뎔6n 6\nAՖIʛ;1*1mE@Pځ@N\K@lkHҠNYعڢdb*CZf21Ӣ">Զ[ܧ=*csfg˿c#/{9Ȏ#ܪ=7G.z7mI{ߓ#iwSlX;tlo >jv˓k.=3a{eYh%.'##(xu~qJ| |7bقP?1$qnP<j3], [kצ\sYf!hlGtt()8Qs$J]{F(멓U@SoY*Ɉgp&X ~x} .nyto[n9^Or<ur1˳_|["ufvXldY -r$zk4kƣr$ B?o\m;6H `}w+ zÇw?k' ̌ǩZY'zvki)MU vg!mޛ'hJq{Ƙ4aF<evmLEN=T[?c7EưH,b 8@IDATt܏?x(W|M_퉨0Vk %pbZ9iб̢n=V`EB2 0͛71 d/`C)t9YYC= w_fȝ:ujjP8o?hoʾc-W6{lm<<7 Ey:H1j`ƝWh+uREWf01\AeUo݊}aX\`sqR%JX! -. #Ȗ 9kt^ SP&:B Xra a&FU#I#YYlBqK7Q ᷿ ƦW*9ސ\Ӗ wIcEXJDpqۡSE@:d3.w6ڙG+3 4n6$nY,*,[g)ćx\zs2PiZ?wm ɝN솥1 ee]}|ciԠL]3~MFe䪋N7ʰ REypOu.+2A22ChABjB_}4"xv >h].JT֞N]c,aQO|p`297ް1UxqO>H~Wxɻ>qs ڑw~~"K/ f\^Cĝ4is=!Q{ #6TWc$K&|<Ef6B פ+V˦-dä\MElݡ^kO 2G%NЌ37MTcCXzr½b aٽ{wA,|샌 e?r! ғtHCfW 1ݳ0 WՃٻf;餓]2XQ'n+L<f9<//ώAO璒%s϶dTXksz!Rt0@.Xg/M7x V@۷Oh@`bWa qƕI'ɘ3u PɉMXcF0) 2~az V hi%|h? "61/ aUy AeۢڳȐ!=uVbyʤ<U&AА^jk!{ݟ6>Ay*3/ #m` 1nZeM[Ueo4y#m̥?bEd1#?@"ٳtR"̺3WaB\yI(Z0\ SWL\'_O~y9A`0ǣȾÐq*"(׭oJ0o+KDؽú~k 9(չp]Jp%g嶕|rp\)/;ON|યCV{8\w2m_xR&&D=sY'Bd>ζVHy'LMW^pyEeve/;36taݚtܝ>)@`W_?nl#j $}r:z[oc}uGz,܅HD⏅m׶]9{(P !Do_9}q[>pنލ8@ΪKh|_>"6E=:[);+Ӻlnc͚3Oy=9iPݽ^e5G"wa-ڴic!_^t'z\W_}U?~{ud@HT|0&rg]ޚ?/-Y2kKΐ~tz|,[ZƜcd5JW6$\|rcM9¨0 0 yHNʌIA;.DT Y^z%R>=va 1P^f_|qk_FV#OfpM- 8$Ee AM駟gQ7/!  \ j4X6#^u\!+QFE=DeXF_O 0S 09ꨣvU4b*Wrw (Ki; iq{2kT0a[j2&א psk;}~k֩e[4y?}jUE텙r]cKW3]b@a\ i!bD21ʝ̒:4ƒC4Ka<gY?[ym2W}RovQ- rg>Y~"("P-(Uh-$X5ilf,s,X7-۶X5S]ƑZƻ%䉨>H쎶}hn]e]kJKͅo7<#;tB`nѣɦo/BΉJP:=?M~cҩS'6;UW]e߳ e6~I@ %TQ3%&O!V9>V;c(T?!`nWU(HT))XQYeDbIe]~2 XDNA~0 rk71ޛhtPխ6q23Ӎ$c&YdAf2!:k%V ?v=}.6Dޛ5 })//Ͽ+7 Yq?Af9WoMԜZ"Iƍ-#NZ/a?w, +H(,П<yD53^g3dXA~HRzq,Fx.]KDTPG`։7F+W{/(LX] VrcB~` 2yc6jX7pC틉 9Ě hL!.\t4= .L ڊd(هl?ua*9& XG\3΁ca Vai7][қwo juPZaHD'#ۃozxIA C[4F{ܝ΃}b'KyRr"O}]@{+ ar+IrzǦ=3o@[ilbAm pꓓ)|.漱*?])BBӡYcK7-}H((ê-*tr/p}ek 1n:@Yfl,UXTNSETB}m5we{DۨE@PjEdMiXYhdT]Ym'}sI # TCl%C1G)Oʟ%>On]j7v[XRh܎%#O3- lw;\VٗKTڄK7{֋.dzY:bĈ1VI(0je WXr/8W,EayF[(Qc{ӆ(L ׀uɒ%AYۿ9s}zhTCn"XLG!?S S>t"Ǐ1Q "԰bs>2K{}iߦwHe,2|n {v͓A閄,b]w)X>q\ <aV-,wzcC"OY`uxByWī=t6: |%=tR9s̓1qu_ǽS>N vR?q{X/}g1Cjy䑱aӌu8c(AJoy5Ok/m_(rN81/0DA& nċJDb|U8lb-  a<8)@85777!\2l2vnx`5Dɮߜ~Bǰ '}%!v4Cܷ<;Y=Z"W0DNXO+yu[EP3Zo#ϘuNsL4#Xo3r2u\ֽq-hoj͔a,mlC( 3M.'L<!pb9''`s`5qrn\2gc@Qw0Z4+U܇&֐-:1uY 1c?}P{7fQT=Ok6uy26A*n_Q[ `w("*eSz @T4̵%Ҩ^@h}z&gMF 9ӉRN#vG Bӻ.kV% 7/g  4H0$mZ_ERI?r*y {?o%([nEN893"M 'CFLG2W:*IvJo أw1lP{o ^Qnb)8ecw\zv%?CυK%'$(t~4./ X(PG2|XAxI(Q. B.ިkG^}5P<]@ǝEWޓ3N:ZzthbG?'\dgXEݻwh[e#s}B tg }54n){!Ae XO}$dd2nǒn%rPDPr+Ju֣Au Y*R&x,p3G%W0 WȏE,ORqg׻M-<yQyyyj .hxpY:>àxO$6'K$s ^fΜHN*דxˤ/Vs sUhauT*-͸{= WM>9Qda"@ZLyݣIiRkrE!r.Wl{:᫵) r,Ciێ`S/l3O;2 )a(|؏|s> iB!3_G89 1/GkުkK6ƀ5HɜU}m2Xȹ8HgsJKӯpY> 17}[FHSd_ 3_ҫT~>l7Y/T$\KQ}KPjy4KVbN&vSj\Zd4S#CDHidǑ yX%>hK@.3eerD#{@5h.'`O[d2y6ԫ[:`ށ?مA, f*=X|Yт}+@$@wmj'XO 88묳l1cXj_*XbpҤIy` Gyz9qmǣ ;"qq&ta!(NB_QJW R~F.p焘(w?%PJLDPi(!P>V_a cѣ= }MYSwFuӏ/IBqfLgy z7%Fi(<</6G?}ǯ?EO 3x3DQ3"&[~ '!C؟< qGXHܚ<hf4٧8L[[3֞'t a2s>~5W³)?|2vبCwuWi!t|u0ָr_dÎ<!Q,>JfA +X>_U5g'$ < y3xxu :#V;0~ko]mLy&#Ą1l. ֚ _ho.AAi:o0|D2ϊwib`p.=RLVx2Wys5 &wqR%0QfIEJP]k~H",x,&,ǵˎ;;X +!{`I(}m +'9w,šz!-^Ȣ}VA@Y_\!T Riie Y 4T7YX:)920׾LC-C8eDA:-]W`-hj.ҞJߚB~!gu="D.$8\rǙIۙgUiq}9omH|jo2.0pAA]- M[ViukŊ"(5\5Ko&6eo˲^7͸6T 㲯};MLDYF3iXTWTR$] [*N%[#s?'5;Ho]RW^Ź/Qeٖg_&awc5 #ҔO;'P.K%pyy>|- J.ʣ;cd=}e=1(ı.eJG uGBGE>(krE( Z$޵{m QXQ sWHᇣ_@A&t X+[. &Xdq -E|do y0ᣯ$}9~~?̒O0d˶Smk &;.q}'㎳w\L"X+=r~r뭷t BxE6,p@|BHM20J-ZzxVmH,VKoMrq2j[vyq}zql (~\{\b^w͚RZO?_˗/^osd*ú2 qu<myu(mel=AIFɳ;~d yjYab̤?N:9cWd2(>,M uryvgPx%+0`:'f[5B:%/ 7F u\6Y:t=,ُ.nߛAD-Q2 @=npƃDU@Y kFްtWO9+W7zsbjo^nMӆTY^P,ˡ7v+ẼVGbSCܪfZ˿(CRguʑDs0m}ߜ .$z>. ?hǏSK(C]bu6 YfᏦ.F*xeP㜫x-9@j`Mcsw{rr!RQ&>a<oW8vI6ezٶǯ8TZx\qKkYuÉ=傡y ȨkFvC7de(QAWBE@P!PǼ4PL쨕VȦh6KھZ2i΍ՉuQ|PG6/[l=X@-ߺ\&.h\JpnS6+[Xn۾.=Oʌ;w:Ldk%VS˻<¢SG]7)(k;(4z /L{5kOcV^aӖm2)l9?;Ə4Yb?Pnn|)(Y @x%\b]=C`rX"=>~|QF^!^w}ԇbٝ6AhYH:puq7Ve|ݸ qB|07.Ou^~,_F>HX9!4EӓFӺĥq,0[h۶40+ /r ^awY@躐0kLw_ d@-~ 裏P;~ *_]Ӛ4qho| _h.|ibIyxz3_ƽ|5c tsqҦyNxmcI$Sݛ EAz_e+(_mfc wfg2c=ZI~sO$uP5!Φۓ|6J~>7(ѫ0!FGbc V1X$:BHo9E'`>b,){={f}: ps={la9n/?~3,\ܐ| &&Lּ7}vr3o0~&4`KKcP? tǡȠ 酩3PpaZX+tK5fGB2F4^6KEv6R!i-O4, ϿX+gRagxa!&*ܾt0qo!3AyWti#cIZTG6\J,O&~aUY& v}CV,5v7Ub"r-.$/DӸ_ &%=QTz잳Y,[Mc7ab=xkTcO"`_40bBi!|k79j_Wf \gw^+|~{yEz~e}Xo61~4ȳ;"W5EXeKD^xy9m/qT)[)"T2|=BfZUx%V_h$OU+|2=3sxT<). *,(KotSx '_2.qv/~rRubҠ3H10BkyߏuN4_1IaRok.=K>\/ ]!z{N9?,h#'s|9}QΓ"L7:yOw ;K/yGis@oĂD躸ָKD([)tbY(g0]zӰ*Ω(A?2N ._d'ۮf|+Q'Ȩ¡O6޶OLL}G\%z|u/0b\dp.~a} OX!hG 1ZђM6EǾzWd<䀶-"gol, y1Cd![lt0tEѱ&HvzMΕ1"C}>\an3rlj^Xn_ϰsC洴(^_J:;ZLgaB tSU囇 d'daNJU77aM~@>)<aҽ~+xաne]TDS/ \p[tS2Bᓊ,2 Ւ,j44N/__' A䵄"wx L0 0uz-Ĉj ^)T]Ts0ɐK~ڐoXa]ormL*o^bN7.<m,C{,oU1x:Lb<$Tu"(@@xW,۶D4 $S%M,yre$N]:ݿ'YxPT)n<@"W<[ؗߑsCʪ57ޗ۲:R-oOL~?!=Rڷke`R^Iryt% X_wo8<%uQRT0çu3{_K7<7Ǹ dō[fM}3$3Pb%'{d }ⰿQn+gt W>̔?&g;K#CvlZ8h9t@o`,C|Ku<xND*#"Fq<CT=jU )"/ OLܬ,nզc5.7Ӭ.ebƽd\݅2CPM_ޒ<~,btxeg>]($AR~*&g ;YQ(BU_<cs-CʹoV0M8ћw+3("@lRp)h֩j.B=ilj.Z4ojGz,;wܦrȆ@zBsұC$q#]}{u9J ފꏘAUFWN÷!*2 RXǠ`Wp}Xɐ۴ₕ=qHmc?ܾPSLzeE@P,H@$#.$Wsrh'/>%|fzBUc J܂(z]~icQUHeZ"(@D˅.,`I+&YBv!DH$ȤM ٔIFҹC;SҢi,wjo}J%"Ť[s@DNlRQjIWSE0qlݷwF7MV.\o+*J B |*"("(@G)d"ݟFݤzm"("jnZJP@OU;6) (8oR1 V*"("("("(%R.pc E"("P@:O]Mӌ yI̊"("("("(5%b\ӒٵkW{wŸ*...S? [EPE@؟@$&KNpJoPR jK~oܴeo^4="("("("(U %b\LKdǎQGeJǰaäs&`tP;vLͦ("T.M5r+"("("("HqY b٭[9ʿiӦGEPE@PE@PE@PE@PE@P@ݚvBz>"("("("("("(U%uV("("("("("("PP"]R=!E@PE@PE@PE@PE@PE@PJDU렭PE@PE@PE@PE@PEwR]>.UTD@DP@ذ b/X}ٰc/`EA 6l *ҥ^{[{7L&'r9g @(]Έ6qM; @@RlպUU4'? RJٺuRc{!&௯u*?"-E ~H$;]|F-͋-}8> @ BB`[߰fK_SWByɒ%ɊX|kNŗ?$Ķ-A ~G$;]|F- !jK_@ @hVk隵k IifV]klZjͳgNVm̙3]Nv* !%m c>'QE3ʦ?oi^Q[ p|@ @DUںl՚Uh Iif]ÕkVݵMGYU\.\h-]T}l *]~ݤkk}sȦ6ҟ=N(:ג31+­Ģ+6dHkႍ#6lM5@ @2qM[2" tR]`ҤI!n>5jd?k\Zi?LϞDz?Y&W]국dɒ~dt@ @~5g8>4'҉:yܹsmŊDEE*D$:i~&K'*QTX9 G??{Px-M ?s3_93 @ @ @H@BsD" @ @ @@ʜ{@ @ @ A!* H @ @ @ȜBT @ @ @ Qi@ @ @ @@2g @ @ @i@JE @ @ @2'93 @ @ @HBT(@ @ @ 9̙ @ @ @@ҀD@ @ @ DeΌ= @ @ @ $@ @ @ dN!*sf@ @ @ 4 Q @ @ @ sQ3c@ @ @ 4 D" @ @ @@ʜ{@ @ @ A!* H @ @ @Ȝ@wcᒕX @ @ @ P, U,/;' @ @ @6=|Vo-G @ @ @bDDeƋ @ @ @i@J @ @ @2#/JC @ @ I!*MP @ @ @ȌBTf( @ @ @ &4AQ  @ @ @ 3Q4 @ @ @@E1@ @ @  DeƋ @ @ @i@J @ @ @2#/JC @ @ I!*MP @ @ @ȌBTf( @ @ @ &4AQ  @ @ @ 3Q4 @ @ @@E1@ @ @  DeƋ @ @ @i@J @ @ @2#/JC @ @ I!*MP @ @ @ȌBTf( @ @ @ &4AQ  @ @ @ 3Q4 @ @ @@E1@ @ @  DeƋ @ @ @i@J @ @ @ vݺ-q|9&BT`@ @ @ /\l4V^o6d@ @ @(_dk׮M1$`y#dvխFUV!j @ @ @ M`Y+oٚ5NR:F޳l,2_bC}j+V^?-,]K[!@ @ @ȜDeCG|iUЪVL3x͚=/MVZGYmμxYsً l {칁VbEks>}~h @ @ @ &Mf=_D(U#H5VCKunC6ݏްSgIM`z ; .VXe&N_]?YOA @ @ߝ5F~X.[vXeW";~n{_wG|aV;hncr6sc84`oʕm[i@&"@_@ @ @ȞEKl܄IH0p$IBRLu~/0h "O"Ԇ 9˕)]ڎl?8Qm '~h @ @ @ [͚4O>:x!1闆ʕ2>Ѿ#>W&GYU1k=w9\"T2e# <jըgHjh! @ @ @ +˗j+LJ/\l}uV!(X^<^ EFRF +r2o{6b[>g(Tҥ!hYP:["r_s@ @ @  @$I2 I$,I`JeP}yoGc֯ϱD3N8ЊP:!"r\V>@ @ @QǴ;*RO0fϝ$%F.2Jly Tin74rK.*bkհ]NeD)+g=}U뱶vݺ8J,i:B/|2Qa,C @ @( B׉Q>f8&aĦ=*UȲ+m_l5ۅie CD1R$O/FuDA4TB/BIX@ @ @($ I P$($0Ihhen` B}͏"iF1#n=",@ @ @ج$F={^:D# "Veo]\;+ltygk.V4C9s_Qcڵksh;ìFrm++J,ZbC6_L 6̦ @ @ @` XnvڴG\ί>mYzMduלoM4RHiv]=m܄IsN(rJ`N#m*v/0זjk+%ߚlOA @ @ Ph H0p$IBRIxE'u .[&)8/BDK @ @ bE@bT]7wu<wQ"UDBEKw>a|?!2IGٹwj[UE*C @ @B@vjPj۱iWGJϖv[>X-^j}?~];Y:o*/u"D@# @ @ @[@%lmj٣ݯLKGV{7'_kn,([t_>ӎ?.:+[LmEiBTQIev뭷رcJo˭G'aڵv[޽mժU ˱5۷wypM~"GE@IDAT={GyĖ-[ɏ' 6?n?YWX;Ν[XOvg@@\p}ݑ?j3}3Xox䥙!? 8f̘.9{%sT@ @EM%Q,B=k&!jޟobD(Oސwt<ut+WhP:ҹΞEʕ+m„ 6o<k&9uTVZ Y}&М9sNX Bm/^:7eQFիsVR \RcN֪U9f6̙3mٙ쒰lRl]'}&@q9 ٳ:/\UfL;쐧} fŊֶm[PBRAJҥs<y=ڴi-,Yc]˕+YLm d5:uDI+Æ s9'YQA @(40qyA)Skqm[fz0^n?ﳇoҶQ-ǶL>,XĺP/J.e֮MEsNA=͢}b&MJu$ I:~9?իgrlEL!9֬YcAVlPxHtR[׮]Z-6 ]ae~뭷:=DŽ?>ϙ*UE]QA$~ݺu3; 'e䀿+6%]EnnF AGqYPQ"O6l_|1)믿$k`}?D}4}qTVQh I+Xh~tDdڴinG}dtPSqƑ֋H^`{vm?7o<+-q@ @ @"C(F)Sڥ[edG"Եw<n~1%BSbBT!z@(FkݻwOY[n'e~i,U"f29}E^KOO?mkT|~Ko @Ŋ] TQ"R*RᬳrќKd(%p{5kc{ڵs8!S_4;q!$|YEEVwH{ëܲ9.$n[5k:q-\/%aQ{:EDO}멧Jx%>`siӦN~+Ww96dҥVjUoĉ^eGof7 F"P2e'pu7.HP1o;FO7*;Q}-7xcxU䲸ըQ#r[+5pc1)~? S2 USi0@ @vݝ=iM (k2ߥRu2z6g 6,c/ xǖi&1ꊛ{n&i`Gxs>g|EgFglɅ=w=b8[,g KkR M3ީTx~|8)رs;{~r$Kdw~ܪC=ԥcUhDWr:l S?C/i~t{ ?bo\Jdg{R4%;& = iT[KRT]{k.&9տ٠xp#{wͩmZ>zo vm71]Qz7 g#VrG-z%mͻ薨>oZ,oB}]Wt}{\iPUFCosLCʫ?T^2'_~q&TVGwjPy ̋Zo*$[ϤC9lMPk.*:-٩S''Le?e!@ $#nz۟vشGF-mmٯAV~;+YWA[yG;_޴EhoOȦۃsj)ţ3Xo5G=Pb @SS֓k"!*qv5w Xݥ7w]cw^9t;v}w+#Lˉ_u#5ZFȔOF+OfHh/^HhRiLQGrϼb8"=:_?d?놋R5tЌӌJer!'&s1ɪ| FkEi`ZU9g>JQv9Wj1z-G r@w&{"SU(mZAJks$fejrh;.`U4RoMPߧ8^DdnT4OLL00 ]uԳ2/D"pԇwuWSĜ7?Ygj6풨~yx|DT3ϸrTWPԣ>Ĩtl~ @@ uU8(~Q$h61\DT!~<n )5}gHbvd#ˊG,K!O}=DP6b{«.ˁ(R4o7o^BGģxgRzk.z J <ͥ2;p˗^z>@P:/=1.[pal. 9SSQ2#՟JPNNC?rkT~ij_'&53GXt֔BNL*5WD"K$$*^}J)9xo喘@g*AUg.]\4d֩3<33[KH[+o4@mH$HS?X`TX\߶9ΠӫO0ϒu D6/ 7ܐ+c2_W^qUI\ELېβ}'-U^.̒%KFfE߅/wi ;RsW{~ۉ3+UD  @@oAΝeʗCon_rf6}=o<ɗڊr&1]q{v*+= 2<x͙ G$F|vg5Ræh{^+sB]~rU^Vd=,D')Ři61F}QInE (b t%$,I%\}ny+r(Dsho͛ W#՞ύVzZ˖-]Y$' \(S" [ioݺM.b7ߌ{*'JQȤ+a*!T}3t]rƩ0pleXޘK4">,]n}>tZ^vܑ[Zճ4F aR_t)gDp4hP/282;Ylc*<ZA>Ҷw>0UUoP}=H]dr۫gJ!JJ/?Dˋ-r7x|M;ӝNPQzn*JNb"jkNJϪ1?MjIo 3_\ ~FnJO>35/j? O_~c+~[or&od }Y!@ Xff恧٬7ϚBetʕ)AKϴٰ5vȩkZ#O#Vqϧ {GZ?:~`?cFP[Udv]zIAQy9>~de5{&*'ɹ*Qx9p$xZUFmg}v, gas"Ou|_ӎ;n1,˨?ގKL96֦>Ega6YW\ƍ]Jѥ<?+UFEEUy'~>JEQX4~K7ntAe} .Zbg͵fK&elmђ DDQlMT G_hٗ 1zF3U%2OUW%˶y=>gNd0Q˽΁1ovVfun͉T;w6}Jd)۴u]mTP [%zyӳ>REu=62eJ,"7-뻨0"5FBlժUY`((;~?z++jXu*W\U5 @ $$W*aJ,%KB0Q'u^ڔ/^:owN$FM6zR wtVvY{JXB#/u"\l\V&A!s9MkJ?I_e^{)rndcJa#>s#ͩ "aR994y_{Nr.viǘ&2 _G5dQX7H-5PTa愨:3|pJ &SHT.OԲQ?\Ԍڡ9ƎIOEKnEmO"GacPӎk'!Jj]sor-Sԧp9>zWcG?s;s*TpI̎oC€.ٰiL\J/i9餓"h; (e9śtZ|:^}sx8kܰz\HT;64s.84G}{6|s*a+Jpx~p'|RV\I ĖOt+Zo^t<E`'wU>}\Ooc^|)k6 ^vaPµRE8c4oW; @ VcO0fEO??CnNٜ|3Sx#H׵I/ߖ,?AdTe˕PbT^/yw៍ve /tB`gՉoOdo\f"#pNM T?,^n)'frTL(;PyI4O'0/5h9cW-Ⱦ>ͱre9A̯=76&rzыSNPB396HA SG4Mʤ$|9NKi$tJ<hsEasntls=) [gILeߣGdEDϔLM>Qm6c/O?R) Pg/▣nC=5W_m 9nԬY:s3ϵE+VD `Q`FJm:PrAJGҪ 3|0]gEK܋@nwO>"^}OѢhtL)+,P}?U$Dɚ4iCDr+SQTJVSNɵ"eN+^fbJu4S>ObN;۵^z]7x*| @hߛ6wŗUe;CIGZ`ʐT&3sbGآKs"Kj͕\˧ G|eew7mZ3O]R;C;0DZb2,Aa:V9D4:؁Uc9& -Ϟ=́QL,9s M;G*?N;4PyLv_tEn>:H4pL; vԴc?0䄗P<#JW>!R4u7J^z9GcTˊz H hDA$L?k̶U}NGQu?-RϺy',Y]~9Yڦ($E(m"1vm@%F ޾^:H>A4L}_!|+J qJEɒ)}=Mm~\9\~U}Y=٠yind&v2ӽn_yr>?kyA0^)-&tHWЯסKs,"H'ԩ <8}pU%j㎱8&Y +;ߓ¦z$~ MchKD&PqRB<c}%p{.~ċJ)b '&L4ٔV@ @E<4 Vd( _dI:kCsQQH:1:񈴄<A*Z'rӑCΉxt0FFˇGj恘3gsk瑣TQ r!*i=~$J}4ũjmڴ:;P)D(j+E9%G#oh(E٘>sTJGxWJ*={4/& m)!6M&Oio}0Ҿa}VJcLse՗$D)/*:B$/$}<~sm_i~iJǒ_ z6Ԧr{=WE+t^a1_EԷئJ7?7QZdQ_VpͧDeL?u6\<nWYTiru9;#MP:b` :Y*H<>ې  ԫ2E^W>Jᔚ^xt^oԩWzwO&Խ@Ŵirե{JrVPoYXhp{$ y})=BT2l @&1՞zi- L˜I۷jĨ2h4=SEIRÚ0~s\*w{#v_Ͻ 4wd:"OW$Gʧ+Ɂw_ AJ_iћaMqW)}惒Ot#/IITzQI+Tkr J";(>*Fߋ/؎?x7ZfX_N`9O@3Mv7:Aj=4%ҥK@6#aA}YT{｝TW_"`R_]U(&j >&mm]N9ڦ9y =wP;5UtowJ_:f'\TT?H=|N1qͷ$Lh5ͳ#Vg[rg}~]׸N:ztj<G[ ~AMڶm뢫 &Qhĉn`I:;|J %>Sn@[h)}F{O>qە0|^Q%Zw-fSHx[X{EQZjQuY0z_ޯ{c˲ @ O.eMPjը:m<SAZ?Q5ڠ&uxkQ_zdS9MOno'B),7LZoR)q#VN2[],y꼨4VBQ_cǎQ  Jao^{7ɰhlR)%mfݻww#w% Y (֜Q_Φy4j)tw}rFJPrfc {-5U_ΝhLr<*1*Tus)F<)lN1ӵїFfe#X/}%ykl%dEbwzq?IRd29͛DLۻvTTڜH))/Yse?)a:>\'o4Ju9t%@i2}G+ɧ{ שeE լ=_X~ht}i~_9L$ G)Še.'y.n-|2@ _"وRvM}|af2ɞJҵ=̒6 @ d7+_"PHВŋQmlڠ6ӿSn <y!9Ĩ wf藍[`&"DK*Ec])} +m)mδ|lGw Z߾}j9NꪘKS.!K1GF)+_X;wnl>Z@ilyw<Ehds:&ǖRaFHHr?9%tPd9NO9Oo&\HQLP\kwP {/li F>O]xl}vmk;Nҁ#<SԛJagTR?GիLEg&':9.9L.INO*2ELEetVDI*5Y;崖/ީ}:]Ɏ_ܶWIz͚4:`eS<+5p_T$&VZD۵^}UOtHR"$BRP!E50E{Us ~%-_萱E=KG8JG}HB͏)Nk o$+ LT j_` @RyN'hڵjX.'"EI:./ 6ч.;'89)]=h_w^=?4}3} Y`>BTF9*-qԉGF;ͨf>`ђ3f=9%Z'gF2ĉGJ֫W/'(h"N;4-LBrԨQ#6T@h;%RŏVj,EVrpa$i$uZ4GQgxEO$Fw9R}^T}U瓏v?>F7f=7c\̷7,;g]u4ڠH'{7MN_1mw9^GMX*U{#ϕTe,m"kٲ$ HRﮧ7dw+/bWc5-^j?γ1]~o~fu.bvXtz<5O㿃}]-(?K׀UꔠM&"rxS5(Wt$/*uoiJa 4VES#eݯzxKEkO @ 䕀Aնl-ww/HjhIv1mζίվ{Xre}/ 8hQ,nfiA <OMj3KdneD:&З_~Z}+Ui&=z{?Jdg}^zȀ:ש;}FR(W*͢RID*| J'1r9vS!"^Pӈz?/D&PwAe4k@p^p.VϪk̳O?d?kbi~4ĺ/pueJ%؋<nE>Ѽ,?Sc縓j%գoNf7EY\,NZ䢞D95aĈn? PćO4`x,G@EۻQNo)= vɖ,]nO2hLu|~.kܸqs6 J6"SJ=E-I7J~DC"AIBR[u*+t(աD* m$Qt&>TD=3yn;0  @ v(7[%t5 2ԮUݯ.w>{j7\ebN.)BTz d)9=hTdJuQrVrkҗiNYhD(ɇD.rda%KJMVi䠼:}YfRG rjT{9vM} W={tR*mRa RGkڶ[p!ƹK^8\̛«VN͛=}!J;fIsIGJ#*k"(p%b=a')"Fe*`͞=ET(h"ӜM~~ˏ<])N[QtN;åTL"i@Q?f[ɏ>EJT_4Bշ'J%St?{AX5HEz}Yi6l袻^x')_UN>NSO=5\$en4j >=z0v!@ خsohj 2MC_;iE};BT>]_&eUF2T<LlΔKhTMS9m43trlHJfr(3ΰ~|s\&ۏm'Gys~}5\*#nw6۸tDP԰I%C_#㝑jEFF#B)^`ևӯKXupK\SRE+Y>*z,rxgEVEȕp[oNs#t0RĨѱcK/JeOJ¦:n'T)SN oα糞UӝIѯ;w{.VڭǷ'V rZ/"fϿE.[n VǴ庨94%ꥈBFHo+/Ihb \4d"krm.INR ]=On7 LbO|[YeX)%Y9DR// "|T"0uIL @ HҔ4x8BT>]k^pRT߁*hXwi29D29)4v4P5IQW^qyСBLi9S:x&ZhDVBDX_ O8'*u]FsITT"@`_sEw#XwF)GwU?,95GGTa*/l䩶S, D~V^.;Oz]Rէ( ԏ4ORI[=+\pdQGe{lq.ЪW)$ED9(9%v}w(:WDh"7D>ݻw,h?E \$)ՙ2U׭߰?Z0|1GE]l+S_$@Vi%ėÇ;A_QLzIѳXX>P>fUcl}玞|pZMW5!{S]i^& OJ'XbJLLg)h"o50a$&ޔoԩcD>sd @ l"ԫ[(|z2dJN (UV9ܺ`vOǢ 5Fjt7#YJ5zذa6fk&LWDAc T3,r+ILx. 4PFKիm۶ֱc\dNϬGT+`>~QTr[PCϻ[5nX/:OV='"爞_&1JUD]*ajȑ1GC =ݻ;G7|5k5RF|>s>b W~؉1QVeՠAq糢S߶wy'I\U y݋uz P]>ݶU~TX޺SL6h#ju͓MDVRD:X'ѻQ}R"Mo^y_{!ʒoqT??P#I"[, AQ@dDNU4xdz8qb!:x@ @`|{B߯LVEsA<$:clF:&9`Ε}-XNetJqɩ-ݨQ#ڽvaQE/(:uJV-G%qʧB@@09'P?t9%`$[?ꛊ0i߾s's',<ޔVt#?+Wm:|ɱɡ=c '>i"&RLH~:1*٢?r*G3iYBvΩ,IiAtlEzU)Iy <*駟h@KL*gu֫+*+ǶyipUZ.),$f&J[ӑi? ub.A[*z} TҠaVJ%;}RubC"Q5o7}O+n|߮w=5#F;<>sX BѧN>~>)4x!u=؏?n ‘A?fE*%.,[<i\ZrK\~JQ%D~NSzT֮];7##ANi'% :@ @@"ʷ8QQ}`^8Y9xmȤ &<Ɣ;ܔäund5YQ,r 2čO4G~G;~ȩAN g—<gUiS\:M.@vmgzs+푏nQJ;NqNj9g^l۫YcۿwP+նrP *gJݒ"7 ;^K 0ҳD^nh=/D8`)׻RyJ"REE{rBk9%(RB2ENEdVJժE:pv]v%Zi"M鸔vOm2YQ]zɁ/P͙3';¢ ^Z2q':TN:^(SJ'_tMm J'q6LKP:o{8J0JȻw3oߺߔ.3V:Իb>4 ￿$Kvm%jA_=1ݣzN̜93g]QmPd~%2%z@ @@*ʷ+hC|=лFpl6h+p-[nwژgڌvݝO8!+^MwΈä?Yכ+VgCh_QZ*ʱB9,(%Nȑ)H9JNDk,YRR |h\ֲAë/<Nj;]^Shm9S%wR9 sFy/GuUu=/H3؉GTAP he; 4/KPQJٰs=9>ٮ$=ҝCIy9i"Ǻ<^<kҜJsXFٝ1rKJc^z&n9;N{VZ# o[QxI$%Y|8(J)R>pс3lˊQߒuDP~/S;(gt&zWl㏡2{"OR>IV<.grԔk/',5+~n%:6!@ @ G`,F V}c6T>%b@p7>[s:5یYs;矚ф/n_~3Zu>xY][;?Fx-H VF-VnX(Еc}#\4"R}yY [e썲[FTe yI%BM@?d6TA: @ @6"?baULSΧrA )9;%uE hUSV퉻EYm0 6aX 7`k4JaSdJ J[mγ&DC@,[ncoMwLj١Nmw.j*([ z߾}FFs5A:(@ @`sȋXX((7ӻ gn|,MZW$BvOno6n\Q &4"eI %UV9ɱ( @8 J,RYJ#MS hn9řhΨTgM#>C @@CG/bBzC @Мr~-iNvڹ)O@ @?l}WEfҦhMZ˖-wa8Qa,C @PD)\2)'P͛7g.xh @ ޽{-ܒN.0$Ju=Xb(X @ @ @`Kx1lذ-ux8(T**@ @ @ `="TuMjכ^ vmذa6g@ @ @ua3TD@i^{5PRzm+Y{%#DDT2:l @ @ @ #W)hѢ % @ @ O૯*Y"De @ @ @"0~լ+QEs  @ @ B@)ܰI k[h @ @ @(ZjejղoNY=蠃lڵv;vCڲe"MBЛoL[xeEWlȦ z-\0ްalaX?Oѻ|_vPjo(- @ @@>~U֬Y3[fk&NvPt':(Y-K3gf$&UTFeիWwZIlرt[͚5m̘1VT)իw}9ʟzX%l֭[7燑#GU^J,^ɎODT2:l+Wϟ;a~7Q @ @ "d֭[+'qSN}N0uԌ(E-vW8!kN;-!n;묳\rĦx [׮]sPFc}AUm(.Ux6Gsh) @ @@!'蜰^}P_ن 9i}ƍ$+lu9aZtQ="՞={z-ynm96+)9^r%9Æ 3(OwpJ7m>T7~65G+B @ b^DRЊ+r e -[tgҵ[NR\V]tQr-Z]vŭo?m#jʕ&K&!MQT>s\@-"jᒕhN॑ѩ(2gE8@ @ $%xl;vhKW~ ɬLϹkƭ *FM4~Ji24yd@IDATۣoUVUw ^,ۢK4Zj;{+6ۻ ?q?#;cb%>=OnW+gYjq n-oBԖ< &фJ+!^zN @ @`P*M8"k/Yf9D! N"7E/{=7?T^zY۶m'x"~sϪtǏo_}U,_VbN*PLSI'de˖_~٪V2d}n7!Zh&0{Ή޲!@ @ 3%Jl9sM:ťkҤ;mRZ; 6 c.j}Hp}]'^\vށU\)N#?ǪkݺsL{'$xl9ΠH ~zK .j{]vevg)b[mU%:Gd)W\=߄p@ @ @@$^2?ϓ懒X3sLvC骫! Ju;2lv.rʮȑ#sPZ6XJ:[omJ#eW^y)r˛Rz4}tSTlر֦MWxsH=߄()n @ @ @śiJɧcJ<LI*$_6g}*V|w.=^|9}ѣ > `*U2{׃HcruEŎ鏯6襹$FtM7j}oRjΨ)Sѣ߶#F8֖oBԖ>@ @ @@%~z[t)G~vuW'P%"gɑEzKc6o /D+:,\Q^xaJo+SJ? Da1W_OysѼOUTպsZ߾}N:֮];YKW~ _}'|y!jvr04b @ @ /Pڜ&=BǔW_uȢo&<<M4xfׯv|g϶ ZϞ=jժN~ħ:ȕw}]d'"$ *mkvN/?m=p`)6p@;]:Yf9MSM6u[|߷'?׮]Uu`'@ @ @$ F"7)*)_((9 %kqsD-[qI)矷W^yce˖ߺt"&LwF/HmmusOiD.6۸bիWwauݭO?WQ`7%@0@ @ @{GyU\9\E y$Fs*I(S+u y܇݋/vBo-[=z!bKWV-tqŪन,СCm̘1nnxf̘aNsyFV^R ^veH*SGv3ϘM^W]4}!@ @ @@w9rJk߾M=zpѣ|Mp<x ONTձu'pBl/(Rjȑ.*I=vy͛7woS7ӓT~{Ի}VXa]tI_wm=cNPcn*1*߅(ATz!@ @ @\Pճ7xo?'̈J8BJ&)m_&M0֨Q#kժU4T*H;<'h)ޱgQ2_ϰazW=J3yT"nV'8֬Y3WoN=TrDou4 %ҊyiB @ @ @wIQ ;o֭sJyWn]yd˗/wUZSRݫ_~.+D!CN.%D>5YA?}uBSO=eJs"Gsa) Lʗ/o[NX*#6c9 @ @ @E@U{bŊeb.I7 Q^.Q++}MǑեK{l=pLb't/V`މ*0@ @ @ $ޔ.1ANЙ5kZBNC?ܽ8{:/5k(nv7UL7 ҫFsF1¥:tM0!&B͞=ۢ洊ڂ94 @ @ @C@*)O$tԩWق lĉϩO5vaV\X3fXN\mۺ}/w믿Z>}\z)$4r-o_=\|GϜ93E[f3BԖQ!@ @ @wىI*Tp("I{1NOwuT3pc5hѢX j׮m? <8K.qs0Z d]w[ugQGe7t)K֤I{\QFomoۖO|d'|b_|z]׮]ko]veuq! ^@ @ @@B;w;384|;#EnI&ٓO>iSNz$ST֭˭QY Q/i&eE$uE) (]^4xT}ziΧC{Kֆte69 @ @ @ȂiLMamΜ9.*Ji|;c74eorK}wJͤ*own9iٲe~S^z91LڤcTsW?cJ+o+W7o^mT*&@ @ @ >ͥ$bŊn>S! 8GQޛsvuW~]Tرck^2֫RI 7|ӪVj?sxC 5jX~>ȱ|(h񊜒a-K֬Y3+]tr  @ @ "K@ VYƝ_ޫUR#Ί:kREQa @ @ @@ D!@ @ @ D@:@ @ @ <@3B* @ @ @"Eu @ @ @y&gT@ @ @ E!* @ @ @LtkJ`ڵֿ[lm6v[%6yΝk RJYm}6lw}צNjʕ38ýg[ߦO:tM2@sS?~V^zի~v)lQ'g}f}ŋ~s7[f̀@ @ P Dm :sL[|)Sva|s;|p[rmV֡C'mӈU;o<4Ԋ%Knq!J"ɓmVR%vmcm—_~i&MrmX'A _|QڹpBӵYn]+[lAF  }{Iرfyӧy ЧO'*LA @ =QJ$kl͚5Ny'zr$E$y+_| \DJ\ۍ7!A駟.г9"ے]79{1lN ۊ9sA(t.旣Мh@*WWױ @ @ .]رc~(lMߤEDx堕%9 Sx-Zڵkĺ *lX:-N(@VX$=>kРAj!M @ @8C{ߡ MIm${/dLT:>,oJ7ooEaHE IWJ4>l @ @@N裏uEZO>͡.%|d˖-ܧ,f]DMy񢹘~G>}i޼ytxCar?YQ4swkҥ[o_~%ls.I.Q;5I LsJ)]Dͳ;[ja]s}6|75iĶfs d5kt&k1n8ߨ۲eKU/,XW\Ν>k뤈49<)TC͚5mV]ws<͍ƌ*UGnEK,Yb71^7+qӱǚ5kf{W:K3fĪPU_}ymڴi6~xP;]vX2ut/:x`R>gvVX1 7ե[{׷){[,V{̙3Uۻk쯓)S8>M6՗}_5)O@\~>cLϱtK6^} QFm1qgA﯍ڧ!oO8qκTW4"v2'o}W}s˫e3ۦkhѢ?NKdzy{NGf=>. @ Opw.`[Mi_a>*c0i2iH $ADHrNCiT0:(1)tii`Jb ʽg=9Siu}><3|QI&n-Ԝ#SNŭtA[nIm#<~mW_}u>/v}wwgzXxl„ jƌn~')Sd88p ܡ31<v֭[޽{aR֩O>}xA.@N#ѣG] Ao߾o;cԕ6F}ɏv>3{Q}Ç1cرcy. dn/ƍB˖-9ԏ9|?7aAĊ]:ur={LӿnԺK Jkw?uvBСCܹs}{N>䜱3q?8pu%bBM3=\|Ә "6@ׯ޵s8}Nj-!axѣG; 󪫮rn9!zn\~El#N<ٍ92m۶Wl<;rg>Ap ~X",_qI_ 6, .mK/dxc? ]q]H[Ö{5Dͻp^f׮]ݣ>K!pn@ 9gڴia'՞O?:tAA!  }l߇ kqlȐ!K;G%'o)BFT8B1$q~СØd9gп|m%Bq>Lp^kPD(sdמ5kwK5\*:GIuqLę,C0NF!˪x^*Oq N|D~bDXY" |g8ُ؄`V|HQF\1g权ؘfO~_gzL8;gΜ#~X9Ϭ̊\8Kn/zq\y9;~:24CD rp_dL{yE7\4n-Y*ߕD`xYq-¯7q#" " " " " " "I=>|?D-< m?>v&f?դ9N#D{|ÑL%'0xgm.袼Q8פxs9GX4)~+p"pB g\__YCtTfDgt٧Qw뭷C8.ϱ @}D4k̇ "u]Au}YFy 3c27"؈h"O8 .5<M"/_Γ6-QWՌ7"M85E?jժUv^-B7Q3 s?gkxj|:묳|2" {q<#^ r}R]{stŧ H&kaI@C4A q<F~N+g;餓|4{.J0j9\?97t0MT֭s=}5#R1|_YD_P0#pD}ke2{6DT }v1Mvig'"8AD_76Feliu?c4~ Rڗ1>gnݩ#cԸMۮmCՍ4ox?0^ygjC!Ea,ac&- qe" " " " " " " "EWŅrG,M?wN=uUmZ@|J8>y@BÓ '\ea:A25qHad,C\Ep<{ƽI1ŹSNlo@#5sa%BB\ajNfD""q)3w;mux.; a[Kwz6!&rNT۟r2Y'`K_p5|mFjAc;3VP' \؆$%H?- i"1p[lpmQ#8q 3BAycU"XPJ5Fe{{&U:J6oF8-w1uGjA 1E֏9?gї.w} c$,Ũ駟<c3io#*c*lj=;XRoD` =O"E͎;8߶WÔNO1ac.fK3.+V mCՍ3<nj|xxZj=Rt3jiL9N:C!wN83eDhh /v:Ф3g= ήP`*A@K̤CE;'9]a!Bٌ>j?,?ܬx=t""] 8̞y[\sLYO/}pND+PqQG_Xgf81hZݏ=z!~?fBfpH[ExV^H earpn2C%Ex E(;hcv(Y+B1qcovrj9M1Y &BYW&.^Ÿ&D =}qUiQO5&h'Tj>;})x≉hamIy)A`B*V?H'㔨͛(mC֍FoF4aeMP㴁V f&Կ3v--E@D@D@D@D@D@D@D 2_SfVW(n7g܀mw*_v5:GO3Da/8cq\&m\B#j'Nf7aRa9pT.'6'tYG Z#4,8DR_YAM\:ԥ"R|aƹnFIKG3w/a-ݡWz/@Ӿ 1KiHY3>Flso^G`hD9 hAc^&;BW1uo"lRBN[cX=C 6#a |6v:huL;/ ev>SgYՕ: ǀ5.nWsLM"e-#c_hD1؈."l]B A6.NTSh> "/ϴDwƶ<Զ@}^̇/`ܩS'7n8jJiOPBN7NiFi q U>)>+i5fSLp֛3;}O9+d:>Q'OYAZ{794sLHtI:aZW _~x^78GbC|BrkرpCo稢, Dm(6/W\}R!XjrQl]1u|}.F@ÝȗbZ^?k|d_jTy{[ =qeװec~!xvƻ1@iߴ~6s誔mC֭PE`C0Dlc3?!<QXOjcuyim<v`,Qvr>\׮]!RGPeFy(e<@M3xϝ ^'X gv9F4CϞ=i,§+$y éX#K~/^ŭ>}$Š[Ҝ\#bi畳/L=Ç;4Ñ=bMY<)r'jb]{ʱbӟ>Yꯐ`Vb؄UKwXp"f}Y땎 3!|?4RMln|at,"1>R j c(FqVߙZM^{m3ķaSA-|;kXzk:"X1&U-p 'E'ZF4hPWLNwҎM4)'B'/Ӝ VDaȑ9s;yxHuEz}10Nssr 8Vg^>VFy4igD/f̘Hi֩ )3gQƍTaٰU#-v9+b[OɌ|po`n"'}l]vjvY^1AzCuˈ.ӧOO=}ꩧ\-|QRYѸygWmC͞)ߒ9xw/W>!Jw<Q|!~}V" " " " " " " O~u"c7q>m݆@=zmjsPsWeM QDdN}ӊ>f8O8LY!\`#^|OºJf`0_0XV!Yf*oL+{CC/X1Dz+8WQǹH>7s!o)v [K,<6N;͋i͚O!Q ohwcYbG)cptͼC[cq8s) yOWĘjx?w3Q8giW"/)K? seҶiw 0 .i畺!ԺS1A{1N O BEd/Uʶ!떯v;!fisC1vԩ^e"oy?" " " " " " " |<$>46{s`L.LQl5! 's1A?}f#8 G /J%_| BtL7UB O0'x;ҊA~CMǻO>Bޔz[mOgPO*62.gv?3MTrM=È9^(_lYs/M6|F?_l<\<zZA7cbtfJ=gae1 ,g =꾦01;1fbMޏaݧc֩J<;SN9^"v͏e?*X%lnԟ{|ILd=s<DbnSoGyCw1x`OjZѮzv 6lXҦDE``_SlIҙHC0:hY:b".KF#Y<ޘ'?6N=R?ΧaQk|Ad#eŮoҢ,B$|H!l8!& VHfHDņXd&u| G3"o[?NNE17o9sm%mz}%n;.^a;vl=6eiaY:W?<㚡ЈHi3v3~aU3qNo+s!)2QO~<@NBPM=xw1f0T?s757dڕ ZӾad]e(PT; ]7c宻Z{R"onݺe\T" " " " " " " "A[oY~uNGApYgH-RnK~G6ֽ{wwemR۝s9~>$I91|7v)6|s/TF`u0* K/J?C9"ı5/ݗΌ۷MO"p|rߣ>u; ?Eq6mfG lpr~?"ܼ9^ &=B8}/p:CG,iDo7)W&\ܸnݺuN}!:tq?xNr!COD:Qmu"H}g)8g}M2027賤#4cv7v>};V9MOv/mM/um '";Y)S$a0+bV!\JsJcqpg$I)j|bl.\Y!}y=s%cym=ڿ{CZ:#bR YbOdڇoH*ٳg.BLx@z6D?;^{~}uf(!h<Ą!C#N[KCRD` .t\r_)AŻ#HD A'!<t׋ Ō|_#8 r[|ף<p҅ :ԟN5\^:b u }Z6HɲXؽp>b*V?3 P"8rèQΝ믿d@LKw'^L Էo_ Ϣ_ǒԭ0,{/./kg0"+<ΉZ}!:l֬ov-b{e=|˰Mr=l?㿡Ɯݣ2- !#|'1ںSNnlRڅWًwVBT2&x .(eT\Ӿλ] ۆ[\vKt}{6ksF u՛@o`ҤI{ 7tGqD~ɾqfSdz]Ϟ=SۍqpDHw\׮]] e0# ,4;9A8PN4/C-)v˄vөpl鶆U%=DQY5mԊ;&;]n :%KCU>o/0Y9YfcKΧozBĮo6%܋Yuz|zˮc.]Ԓa@u.׀""QV ۆr*tmR^wue=̞혇aIDcmcZc.X ׭.<g㝄2sY;YﻰZbC}8f Ɲ!s<Ӭqn(wLЇXzgQ_&,򨛍|m|Of#,s4+LڵOD@D@D@D@D@D@D`"~L #oLa+ B=3ehdձz%~, '?H%#֜L~gA©̒nɯUYCj œ*oΜ9>%u!ɹ[֥!iGĒ%K<DcB &E?saDtuAwBwMu#\Tz\ga:Iǽx^R!]!џ2R}}*瞤eV&"?? Qhxϖ-[IHz+Χr>\TxiF؎V_sRk1ijGWĘ+YHSH[! ("Ɩoe{νβK4K)ѷM)y_[k'umn[*_1h-WKݗ-ucgۺ=^a:oOgp&nɆ/Jݹ.-fŋ*;o:~m[.~{O^>=˧Klf7pѧ|lQ/pc7ue[_-7l틮@9\ce89Ԫ~20@f0Boiy *6sL\oYwYB+ %zyGD@D 7vBkԪrE@D@D@D@D@D@D@J#*QJfC`sVkʔ)^xկ~{$cǎYz{aV̕tBTe-zȶX>Uâ97__Gqӱ!" " " " " " " +ڷo3CM0Ob bsd8գG+\`i[bjsgEJ +5/Do>[N}IboMŧc-E@D@D@D@D@D@D@V[ݻwQORM:՝z~:6l;b^z7_>JH Q#e" " +@|P7'q񟞬5՘@?.r;<xp^BcƌqDT]wu[vU<E]2C˔/X79U9I&M-[v%˽(9Rwu|kteqQƐ)" " " " " " "  :t@1o<7mڴƏ,XPTҥu:ի_Ӹg MhɧR }#CBϰ]vŭZn5GD@D@D@D@D@D@D@D@D@D@D`!мyaW'ELfά;oV\`*Ue2D@D@D@D@D@D@D@D@D@D@D@D@I`[=|5xMJFD@D@D@D@D@D@D@D@D@D@D@Y l%?,ڵ:5NUV%?,:urJϗEvcǎ%?,;k8c&lRr%DL'#ЫW/w+c5D`w]v-¦D@D@D@D@D@D@D@D@D@D@D@9r˔/)FQvM*L(" " " " " " " " " " " yծ];7i$7c 7w\駟9CV4'+n;jI*N(DQ6 |U\BTEɨFr?`zkԨQWd…nn5tmڴqm۶m{{oƍ?-XcrW>G(ҥK4cj]ZUYĉ{Gn7/YWwA" " " " " " " " " @wZhQ5/tO=/|^.]xq#Eܴik…(ou6m6tӤwwAjEے%K_6LBԊn[%?xA F4VJ'8W}QIB') ]?| !~k֬YUDD:S5ˮ ߿*"U!Js@%} 뗿A^vm*~u yxD@D@D@D@D@D@D@D@Vy:&.3;ĺƍs+UN Z.Xu7 HTypd%)d"P|}뭵^2fy ISԤꫯ?D0s{Q mڴ)knΜ9ZQ4|A9ý͍6GNRqO?u׿|׋t}lӔ7ocNK1vm_}m՗c|Ef?&lRxfX,X1fH[m׮o+旋/<… DDi뮻Yr~Rn]wh^w}OX8·b ײezQ[9v>^t^z%ϳ<m5Fs?$}3N;" `̿}/͛{9܋;Ny뵯?9~<ڳI&nmd}x6Ɯ3wizcT-gVd?$3xz%DW`c6wog5΀gj<W6c^{Ϳgئϭuz[#Ŝ2" " " " " " " " ":9! ASNݭtA[nIm#<~ᩎYW_}u/pwݝyށ0a{.恚1c>}<e/*98I7bp1 !V6^n5m4>T6xkO>^K-k>#n)GB۷oLu SWNf9 pB3{Q}Ç1cرcx.kz@`~ DxC9$ޝ]{zIDATn"njE6ƍC1qtYgy-mv8s-Gqxmh"w紛;]=Rs=nԾ8ݏ~#_2Ӏ:u?~j[S?y=WLJcoTO}ݎ߾:uzir'Ovs߇X{sSO=տs/!4(s3NJFfօ[c=]@[wHxxnT+.m\53"xLD0BO?r/wmZ8ː!C*,NTF}pfϞ爪qĠ,{Țb *u"_ρ<k,/`L5פYu ),뮻.S,uL\xgP\Æ ˼\%}hN;-o}KD1̲h8rC" G/~ / e9'N| olwĄ.7i衇㬡 ;vLnطAn6mZ A;b.ho%<u9HBFThY}8,S: e" " " " " " " " " ({D":̈O #Gо}{n8͉1#-Z8D'?0n]tEv ￿:i۶#eСC;s|DE a¬k׮>Zqb8Ǐs_ݧ,q'(;wv7vBD`1\rXȉB}͈N9}ZD_>>JC~g<@A"]v[wW&~᤿}9R3ʳvGnsb-QVSsm [4`aѮ"DYVI޴Nx3菴UX+Gf,w}Bknܞ{URo;q%w]N"e'SfhF;at7vafy)w>OFJV.⮽ڤ=tS}ZC"h b/94[a,OSO[\H43N &;Cڌgw6yiPú*c",F S~:Z(Lf({4RWbN;LI@lfP8k\n$ IBAy:))3)9M=͘?ȌԁݻwMN8;uT?O@G <3" l}s ȶydLr񒹭LN*4xf@x.Y$eRNi 8(\z6!y쾜f8{} >+˳RO~f!̈_W]9˰NI #z;eFD "GKı.oK/Mڀg*B s`Gz? >ǸxuAСIt&8 bpB}ꐶDG#5qL[1£af,ng[+Vy/u\[m;ӓ>S ܏xΦO0&[R4CPoaK;GD@D@D@D@D@D@D@D@D@ , ?>mBU3Z3 8(h\A\Bpc? PЉp#8 peG?ܬx34'6l㈲0#ʢsLY&ir#sv:: 81",rv?c띆뮻 ) ;|d aHm"lJ$|fAڼVmڴLY5֫WgсfPO DY;1ډHTTwDIe"'bMbȤe׍ᵨ~j(;%L3hi]jgD']WMvm[27㊱[PO3w6K|>?>jH{s=p#HfqcMG;_c`N,IqcQH@FV6^kֺuk94!"p0#%"i! ٳ-D:B㗈tKqhC>L;BuǷ&-mO ?^Ko=у\Q-fUIޡҴ%vqr{k9l#42b[wu] F u>;&L R<-ɻi{(N˗&pvB̙3sTM9n۴y|,k;͸Gt&P'eu\D@D@D@D@D@D@D@D@D @M Qdr2DD EE'3R,"Yif=- }$9?S13t YbK/ɓ'g<i Nts#*I00KN(a%+#YNpIW ɖ&քrdLDB/lX2Qv.Q)fDGk[VrnHSIQJ\&i҄Rb-XZǸ^ ɓ1|JyR# )RCag/J".J_" " " " " " " " " jZ*6%[ڣg9yl1c jپbD/s*)C3):Dlr0ÀHz܋"E 8w^BBdQlԊv2ň'ηcn̅X~gO!>iXpˊVi0+bŌb 4Y_f<#1c;aZ>d(X}YXY-lg1FS1sD@D@D@D@D@D@D@D@D@*'PBTb 6 g>Kї7H!Tp 4(G"ڇ9k!Q &MrsOUn8tw& ٍV#GPpر"ƚ7oH_dwy裏ܜ9s|ЩﺡCY:i/vq>Q'1d.2^,7ӎW' i+f_9f1W&GdsnQyX/$ujڴ!e&4i M0b +}“v-xwTډ&LHSNɶVD@D@D@D@D@D@D@D@D@*#PB48'C)xd^3R7p B_++`9as-R^{mײeKsq?̼ Q>8p4iYDiӎ8/.p>y+?y"H -,#kƌ^;ӼU6D|CoJ+5֩>51b g}vZV}yٳ}}跤g2<W{ vڹz4֖7"4y&:L')q\ awt (|c?+#!ӌN>dRD@D@D@D@D@D@D@D@D ֨5V%vW_MRm/qO; ,:iBQE ^|H?q<3'Уn^O<q_oϝ;7uoț\s铜>KmX3ffMi}Ā~QgwbEƾ0ŽW'aFe{ѢEnԩ>W^^hi"#LW_^>lN$cx_D3e]/oz}V'{6lwc<HrFڼjId!㒱X)86VHY7n\9\(R|hY.rtPhrVD@D@D@D@D@D@D@D@D@"PBOxsTNlذa ";7H#4YC<t[ԃU..KF#Y<;'k0裏'xzhrS{=IXVoi9frNfIdm㇘sMG @cAhll*ڢE _;ÖTfs=m&KM>+x`r=sd}ݗntM؉NxEϱܠ +~B[</|nB@H[Y*"oҤ ;#Lnv%"uD"2cu'G%Ƴ<0K18"rl?x=3.߿J;7Þ%6D@D@D@D@D@D@D@D@D@*"PөxrR؝uY>g-tԻ##<Cٽ{wwemR۝s9~>$mpz5`vQGR"po~$B #`pr_zSOPz`Ats ba<w}/b) {G:xq裡7զML] !f~h//bι_}D8q0D/(ڈ2>" ̧Ľ Ra W97۠|n<!:!wq~gvrH"\!| YDo۶?cƖr+|I7e_6>IN;픤/D\%Jp}φwva%8U;v7}!-bnHS,0U>2҂Տ>ëV|}oўIx2'Œ:Dߙ3Y╕cI;N Ɔ}< 4DBM6-pԆ?gͼ,UhroW, qmdY!D 1aȐ!O<P搥b[LcJ3tPڡ"d! ^C$@gDhth,NU3il;\9{́܄GyzrC̽kK[g'p:"2g<"Y EP Y`0f'zH@Ȩs_O2K "ągBT(P-b>ɽ<L/$q?O>"Er,d\qD]x AY 1vm0bZx_{[:k6ό {^{%}%q/6)nh97[OdDZڻrӢy"L~-E@D@D@D@D@D@D@D@D@ Xpb zZA\p SYA"Luէn˄4á|sZڹ88S5G F{Y:3q8Ç,/!!(rhڴir{QnQ,<K|F;:y^"bKsl'-]/ vlcڼ<+QhFp>I{ЮYh;c!/80s=׋\/C+ 8<iN+pD$fنn˴k.HXOֽ -kCכ}D Qm͛:Z΋oew}w7bĈzJxڵW W_}6M 漫(gc5l022Xvl{|\" " " " " " " " " -dwODNz'V %Q+7t_'Z¡\88_̙Qge] -s^;1.,Yy;"%Q6{-?saDu#5jݛypS7Ҽ{Kx6;˩ոK}86^ ?kџLwD* gq)spzЗ[5ڞvDpMzba/y*# {O3@F u|o&mfa,m[ԏS)_F*[K2bFX<"" 6IHjE~+&2lEF5xnܼczyv;_K uW`do=?S("WyH&" @!90+S(KkY Ϩ:>J!C5ǢjxDChҥK%d" " " " " " " " " "P7Bu 0yd7j((}is㨊" " " " " " " " " "P@ QFdLD@js1G?nݺ~RjN"z`7w8tY*5*0"JXgucN:u1ٗm߭zYŴ_D@D@D@D@D@D@D@D@D@V:|yY!EK.u>Yŋ.SM+êB" " " " " " " " " " " "  SW_}̙Oylf;>w@! H*C*IENDB`
PNG  IHDR$D ) iCCPICC ProfileHWTZ ҫ.H! J A^\`EWElkdQQ,,AEEY 6T$tWλ߹wge'@/Ƅ3S$ @`Z #@UiWQpElh8"v.a7Q  !Ad)ΐc])Nc;M\Lā,0%i|f!;Q@lo؛@,xlnnT-Ҿi1YQ,E&@HÚNFP31Ҝ biEFAGf/w2š}lQ3p9p\ qv0v` e 4a^p|1gY&7lo劂bGlyaÝ+ʌKD[ y +A!ʎ }P9b#H9@6]#4sE#yall,M} 2BXW1 s8\~07 .abAN=#g차0vķn0<`Xw897 &Ò@/yO0`!\`3Ha qh_PeT+m@P @k޸'k_Xp7}ď<2*1H %-Gy!Xot\#9|GxB$<$\'HAx,2l5Hs&$0Zpvi0f nY; \N0? 3r6?'e}>z%+%ai+0jc-eQ;]:NcXvRGwcN-F-}aBz22 ~eٶcv.H쿍0.}7^t,cN<5<^8 :\Z(Ó199 |A@Hg\zbP V l;^puepoBGF7 B"$IE2>"F Rd-R@_"҉F^5 P*f8 C8t*Et%ZVZ zJ0Eb6Ea)X:&a%XVZ_$X'tl<+x-ނ_Ż~+F%X<a$BaPFM8N8NHd͉l&+[MN#D"YHQ$TLDO:M">dr09'/"OOɃ *  Q Y v)4(\QQR)^8Je!rrrFQQH]q"Oqba ݊jT+ju UL]ICmަhf4_Z VM;K{@DWU S(WTURzl<MHL>3<J*7UTQ+T^T}FR3S R-Q۩vVlb.9z:Q\=L=KTzzFLJ0c1rG7|1]ckhjr5K4i^ ZUu_׶Ҟ=C{9>uON;nlݝmzz!zMzgYO x N<gj09rf P0Plðp(h!c7t&&MԘ1U0u34hj,lY3sM0"{4 |*kDK7l-VUUkŚgźs,aXت7m6~6656ݶ Eu/ǙKf\븯vv9vګO_d`ʁPp͑8߱񕓵i-gD_\\].]z]M\S]7tSwv[v>߽G<m<=y>o>;~G^F^,^owvo˧硯/wS?K,~/x h CKۃԂ*g8i % :apjxlxEaDDt℉&ދ4GEuQͣD=rғ91bǭo/oNPNP>10qm$i\ܤɼRJBA7L<xʍSgN8M{ZδӕM%&K̊bU6/8^w-iWg^2z3}22x ޫЬmYﳣd$%-yy3:ւb$#C~0\[ UMl!I]]XYaFŒ3UggͲ|Ӣ_fٳY8{yi_2gAȂ ) nEo'.nXdG?TST,,se2޲7-Z)TjWZVy{ť.yheU.&毾g޵k>Z7q]zo7Lp̩lFFFIyDy&M7}Ȭ^_yhol6m>mm#dGmYUNOv%jڻKw#ڵzU5hw9PapX|8~уLm>N?^RΪˬ'wpoi4l<qr)ʩ%Nh48yzݳIgLji?~g[ZO_xKn.\msn;]k^phy˧篅]|=znN)ŹvWw ]ppEr;aû؏^<=ܳ IS5v<`_n~i_'z֛=o6D<xn}{?}lϤ_,4| zo(whHdW 4={%û|Q/ 7 o4_([a1 [;eXDXT!|z/¡-CC_vAhʗBwRF?ʿ<9lXA%'Y@IDATx|VE5H : "v\{ǾEײo{w[\]ꢮ`EY+EzKHw>7>- ϓ>sgݹsߜslڼ}("("("("("("(@ OSE@PE@PE@PE@PE@PE@P,JDiGPE@PE@PE@PE@PE@PE@XRE@PE@PE@PE@PE@PE@P`m [EΝ[WE@PE@PE@PE@PE@PE@,Xy \QwN IPE@PE@PE@PE@PE@PE (G2=H́UDPE@PE@PE@PE@PE@PE Q(e" Ҏ("("("("("(@C Q(e"*QAg("("("("("(@F Q(e"fçg("("("("("("P^*/Z^PE@PE@PE@PE@PE@PE %aDE@PE@PE@PE@PE@PE@P"DTy"("("("("("((&*"("("("("("%ʋWE@PE@PE@PE@PE@PE@D@@X4QPE@PE@PE@PE@PE@PE(U^"("("("("("(@ JD¢"("("("("("(E@"E@PE@PE@PE@PE@PE@PP"*MTE@PE@PE@PE@PE@PE@(/JDA-("("("("("("Qh"("("("("("(@yP"jyE@PE@PE@PE@PE@PE@P@ EE@PE@PE@PE@PE@PE@Pʋ@VE@PE@PE@Pj͖o~#RP8~l!}ztF֭>RRRRZj P^=̔f͚O* jZ"~ڣ!Q}?Tk-/@E粵W~JMN0v>7;wJ5ZFPE@PE@PE!PTR${Mn^ZZM@2hI/4|ٲeKB5SB ++Kt"(y5c>f]~6m9-nݺ~%bE@PE@PE@Px- g nP5k.)YlBF㜄`ܹjڴlZ$JZ$tʹ_X\blݺUPru=vhH&ʹHivHԌo5:Y"P\8&KDCEu)"("("PPP ҕ"^KsM\x*!PX@X( 걟k٣Giܸ\x!B_#J?vm쐨9jε3;J9]UpS"\ m"("("(UGR` Rp]XgvZK(@۶m퉹k,]P}dkgDPim>TK}"("("Tn/% _5`I4]Swcݾ}*s@ff=1wcˣ!Jo L?v쐨yj5gJx)_PE@PE@Pj@jRmf$rKJJR^UDu"yik3kcwڟ5[CͻR/%+"("("("("("PCP"^X=-E@PE@PE@PE@PE@PE@P7JD+WE@PE@PE@PE@PE@PE"Pv-͓;vDaR~}ڵԭEN:UܨC1-WZSPE@PE@PE@PE@PEP"bSO=%vjY:u䦛nH:ĉe4ѪUZID)&"("("("("("<JD%Y*Q^=k'8 (4lПdSOMs_-X9ٹs :Tڶm뒢k:&Q'?E@PE@PE@PE@PE@P D`6+ժ9sdeשSP"LfMPE@PE@PE@PE@PE@PP"*!4SMA@w%/pa*ҵ:%tnB4SD`=jY+"("("("PM[Mۭͮ$pS$An4Ť&^U='E@PE@PE@PE@PE@P}ZD 1 ~ˎ;ʴ8;;LZmHPLjUsTE@PE@PE@PE@PE@,j4yfYnl߾=_ZZ4o\4iI+FqqZJ mUUV^ު#ׯ_oe6-77מG$Cmdff-[ڵk#cQD֬Y#,ի'M6f͚Iu| 4=$??_-[&6l 1[h!pp=+R8}^71*OVd{.E@PE@PE*#0Pٱk,޲XV4A6=ƠVdێm*Ūb ٵkt޽N-Bl2J/xEx>##CX\폫F?F/n%L'?U[^1QF)_gki&(AlܸHT_PKKL{_ΛN{ɜ9s" CO "[b-z!t,B*W\qlݺU^uowMF-999IOe2A]tEҥK:u[s8餓d䔷(;V/^lvў;Oz|?ɰ'裏'4?Yz^P\?\(uF{={L2Ş˻+3g/-pb_|/ &CÇi˗/~Z ;' $sI&AҩS'9$9h)"("(#)6[7뾱Pl%5?H֩+2;ޑrF3$aY?G&-2l}(mRK V}kyw'?I~vmva!exoT?,X@X ܵkW3A}QygwL=J3Au'luA+Ro[. rmM z0gs}~B~yX@.J,f%K{ﾓo]N=@&M$7t\z,0&_0 :;}w`(~_ɴi"}1,|<ʒm۶JYy ۴i<V=5e_" -^~儮  r%\Rl 4O<r["M]+ ,MnS^.7_2LX◠4r0@/Zr cǎYyP\re~"ëj⋣&{OHoΛ'xbd*ny$"<!>#kWP9& ?Db G1bDv"P lXO~z\wY@*_[W<yeR)(~N>l޾C:̕K؃ZV%])"(@ nMKnZnj%unj[sGNKB+`\wuoZjBϨ{ /)"Vgu]g o<䓑}N)=ɞ={ڟ% 82XR@C}΀kQ,DPCBO #<K }≮l9Hӿ*B=O>G 'Z^U,z8}5YaqH;WO}˼yZpo1VɶSEkA TҡCt zQβ WH2PJ~zL#o.r׿M*~0l-/FAui@-J1D,P Db+@AL,ubo=Xzd ~vIZ讻 ; :2$@$0.~4'&k0 Cz\"ߋw;s- Un%ꫯC&L`-Gw(5 ,)%w,̏2&r2{Xrkⷫ翎Iu ʃ_KNoR(aU0#'?Wdr?5,\re؁-{likΛW_irC]Yޜ|[ez"("PQzXmyymd(PX2#,a zuIΧ ^s9i9ҸAٕO&-3KWocF[+tҰ]^NpɊ8A"Ϋ*?|yG{&:nƨ4Q`3-P;9^`aÂX>ĕs,z[J:}c xU[Qcz5t<8ʻ?^QTzV(q% H|ڷoo=|MF_cXB?ΰV;"ʸ&[XoTA^ 'C^14Q=o^ְu?8.!3f̐ /7~ñkσ$ӟ*%w 訩PboҥvPuigI^^T;_e,*<u T*fBBvP/V2EWTH$1BZ:r-I282IHTXǪ* &rOs"a~:bth)K(=밽i ɝgt;Jw/δaݚ~Tn#P&ϟbӿc˜S$Ut-C<yρml!sybvyߊ"(B3J&RlIiѦEfٹk%܎6|'6ȩO5n''$o-ze#ڏMQ;|? .u/5'ճ?)W*UH۶m-TJlC;nܸQk7U߹sZP,EPW@:(kl/,./1whrR^]ܱt^23ғ+lrNuqګ@y9yd~ <+o]TM ~gO"rg7\Fb X˄BcAN>n#Lze|^q>K '<@vَ{1c |A;.qdkX"ofUnKF k0[)ٵ Ku}uI}a\KU `B޼mtXay&,`}X{瞰e;Ru Da3'8)˳6r)uDŽxӔsڷo_KDwF(+D#P#ӧT(097|53:k2 WxV92Yf ;fe~CdÁ „6;)& a¤#!YpYV&-gއ+×v>lptþHRG[7-N**zeLj}L[hU͐6p [wNY&'"Y&B\={$kh ԵU|pˈ EjjJbx ޙlc E)'i^7Y[Rqz}mP9v)kF]Z?~EO9˷K;o`J6,8 9ϐR7&+7nO ͯ("T#Cشt$/:4v0$Ϣ-"6dhl,IgcujygZu˾b[%~SXKTy#/A'*x% މ1i$9rdD_F?^).!c_~G~I3 dIQ4 ;E>edZ>&dBe o)#GgD^AS?HQ֓6OXo@xv 1Gh$SƟ׋_m͸A?-6:% ~L*꥗^:2o<pҞJaÆ u} ѭkÊ paF_; oֆtԨQ:i?B|4 ȗfˇO,u6Yaҽs:6nS{\d%2A")B r<Z{\<t$:Loq{/?7 ޻m'˪B Գgl9X?+Q,nqw\|a=ì^=sw!]bPM|Ax`?ߤo&0F  bc ~gɛ#֬Y8A\P\#&?~1;̰ADYgau%bR4LXƋ6<_ykTnt&2sʵW{'ɠ .vB ڽ憘0_,k5l !Hhh Ƅgep'xM a@lԁevjJs-d~⵾I=RPXL9VD!f)iGCLNoQ7.}~ $cʰzڡ4_2_PE@H x*9t1鲽dl.JȦ{'h*od˳ߛ*EQx4h( }K,SLWe*,) m7ku/%Ұ^C_'|NsNkPyo)**F1xc*(^c (\8p# wzX=7X]XǪ6m&/9IubeؗޕHF;4)"N⋈7SzH˻<VP(QO8;8.s8aA,epHÝ">C\Y DB?.OG6p@Fo{ XYcj~lyoҗ2):yՕZɉ#ʰf9MLGX+\~s[(\3ƺ)U).FQC"Xrz"tO~!9{0$k,OD7D5x(k*57[/ oL5j+{w-^یRsUǾ&}mģ帣4ׂ-ܷDqt<7zb>zr rUWɉ'hux 髌A ߶Eb$Щ sJ 客i xArgDPe@reEhӦ]%k6 a(VLc6Z%H0c&6Ay*"  Yp{&9X c+Vغ8O a@4Ț_. (&\y!a0 gm->S.$ty"C2L cgB5O!^%2-B$-mO;b=T)En%`%g qFG}.zk+K>Z`e)bՄSܵ%M5cV^붘cIReuTrN 5%*P_18(?X1UsA1HWs()":buRtl':K"߾, ~om'pӉxNyybe;ewiR_{ ΐu+>ۣ,~xɦìYApQmk.? k[卥 (ֻ8gϾ :󳸖EX`Uĭ>o^AM/u{wq!d ;g 6ݻ_n;&fkvnE!p/,K\{,GP\Z \un+-!i+_E!Jy" h?[H[SaRӯX=CJ~b׳oEINw7\A<iw;tdZs9ZAg,f@0Vނ0wB,P.'w"kCUvϺg /nyrep^_̘=W|c),X\=8ԾyFE"9o euxmd~?zKB d~A `IѠ:X$!~𓪮 s5Uǎ]rZU#8a =dSҗ0%{sy˻m,xf. /1ǻp!^ D^0xU `0\h2ŸD0AF^L/{A$?_e?[ c0x*XRo^ [EċT<2х%{(Li7.%r3ӌ体7s??"&ȸ1ɳ~k͏B^ҽh[2B,%m,! U{;Xc4~J.k|ϫ<\SiDAKS;>,Vơ@Ax{n=}_>U7}~`"(@4SjվQ{ク% .O vX+%!l7jPj 6VLn_թ'w[](]"MTr d&Ks)7q A+,OXuxN!{'ӏ~#[ dJ[\a- kCldʰ=<,-1YlܴU>%bGvV#@iג~am߮ V\;"/Yx>LVZqF)=9~bd9x‚T%^z^n -])w"iπ __ޞqÖ+gt4n|g>\ 16}BcokZR"I&<x{ǽڵkgcKV*gn[s̙3-/ {ߵP< N:v\x(iJۋC!=Y^7A^~!ulqxzw11}p'x yEglfHy+#Vv,#HTcHۭSy&b*ɍk2X`Ox~vI S[Ap`mÍf$MeZ')Ipyo~6M%dۂH w| Nb`13fL2q&<-AH R U\t&CI$qx5UwewO.Lf̃)*XnlDJxؘ|zBιVߦm2dĕUфّ)ƒҭIg& WkynL8#[7Zx@$v.R,_&0ggt/jH qp!ԸA]oMI>o2/A1i-̹vk!$&=Ӎ5W-д5C*#msٶbrV`pKJXC~q5;͸vkc&m3g,p/KvPKK ݸTX?^U'r~;w}KMЬ?><W!|~BN1DwkSƲzCX֭qb<"#XߴpO]oX!8xm.Xu*H(~ml uCF]HY а2("!I [dTV]c斥RZ[$;k,㕌rA Ҽ[(uiEiy22-3gm[M=whC¢OXĔG/qH +!)vObFmݵ D]gQ^kuX(}d:z XvF׮n&yfX:fQ z７z藘ctꩧZ}D##,nן"ܠ^ܤA*-Я ė#] ͅ= /(cIo/-]Z>r 7d)#rfY'cUYr ٵcPUI9׼$m* #(xY ! = BBdX`3Ą+oOF%W^`b!"c.Eg`tbIx-dB.YPﾈeN\: X A3 iI_d?VR/ E_{wGy(,B ui R>z.?fJOI ٦Nj? qIX3 "\G9ɳz2Y *S ]V0I M<dbc?IoRf`' ?7//# ^ewo{RaGIC0.JU-dQa*UNhD:x\hH#b'A 9Z}[A9fÇvp9jk~)o/$,VnF82moB땑'^ n(m@1 Sk6Ԭܐ_ȈYr~f&.a<\|9h"gwʱVieouA崁cRWM'; K'68 XvU#JCP21˪Me'|߻smd6Ҭ^ =Wl(lKR.,„I?}e\v3c9myXMWE@PB_MMFI60~ SPvZ|vlC+[,k HFŠ 0LZeFDݿE8N8iZSA?vɑo8O/I'_xKƛx)砨[tu4ɶss-QSN9 -DW(.q,ޛ_XO.(dQO_nƸ$++* DPt;@9GKBĜY{{q"kChaAP'N/.}K:3o,eq/ +XD]8+s?Jcvmw+H7ࠞQ$âyңKyXࢴč({l~;&RY9q B]ZХc5)H%//O-Z$SL,뭷~\qg aYe{c|p/K m\oia]9QZ2<˼zlG;'l1>uF[;NAH!,O|{~]-ī?y31wǬ-DOЎEUf3qbI IGeDb'aJjxuU~J ~tI*u2`A277ן\ׇwgda}[iW " BɑQRoac%a7eFwljv˫7]$+N4.\{iEb^8EV7x񝖷vlQ|A$%*KE ـG YeEEVSX1\\}K?c[FK-;u.1Wg#75z{!_HhX+Wn<Jh; \XP?4ϼȚ>jCɋ"w0=\5cuy6Y,aRGQ^+WUE@eK ֆ _fR*Y 7JvnYP%TҹIH>Xh<3Y7n/F ݝK~;RʛVQqG#(knDꎛc8̯b͒WՊSzs;E7-6np[Ś,4E5q!q]w4qFurѭyr,a6{rx/:* e)NA<REM' A}ӛ~JÎC 1} ;O%;]}xWhbԫKp=c򽣖wyGN1bqBDAݱeL . i zPH&d]t0AZ}і9_uՌ9 Fk Xq&+23m|9mƂ']?}6Mn7,10>q\7 =/3. DdiSO==deH b?E`joZbF}%% GyDWX%{"ŰIWLD{҉Bɱ7~f>zU9^ ~y!2~S79}BX2yc6pqc1‘FWm)[w~Mޖ}yg&9^K-Rf}QXl߸;yLY}|)ibܺye!57mo^3mjh0jw0dԭS˩ g•bL#)kwo؂!ḙR$ڒ6_ |N1T֪\{.Yi/K Th⯾Ɔ8Zw0ۣ %+M3ʉMK>G`˹Dd`\WX_]YqU8"(cC 99Ou^"gsfYSZgIf̈-1R9=%apP'H 5堈b6qjr$XtkOrr/W}*U"[6AQi(ZnfI#9!>PjhXC`KVKDQ(r|M }W A&SN6,@Xn;gbmk|CT`tYcƌX'uB1p+: q+"BX,tܮdeA5YxwT(k'4wu dkZ+QE +/[i7-XEŲrZ>d}duvv>͏%&X'A ijF"/ו(Ŧ_چ^b@gذaٴiӬ?E1au ^c㖯uq_o- _yg#'}XDד{y=,3P{MLVL=Xb]u'GώoABP ~wx Թs뮋 QG<mdAejSZ69XÖgǎFxlfuNʆݔ /s/?*[8YP"$(ןV/DVx<T!~o\|{'TDz'"ng&FvSvrq) zzZOT}]2Q3ˮA}w&&S]i{H9Z42cȞZj _p8m;aD|+鉹ker6.䘍S'rf9ϟn|smUⰖgȜ?ee9~ϏVMITdȼg,!dfC\Zɦ=o^[ZS^A^rۧuĩjb9jqQ );{?H̼ZQAaM)Eng^ = gyX+bȃo͉E)"b i cZe6.TZ3P$ xqMٲ aEPEQ}5cO8( w{G;Hː6C=|rcJhFcWn/7ZH@@ l5P.sc_O&0/;tN O|"k9CAcJر4 kXek\[<cr!O< @|&ņ\D>+O{B\yppuq_\%W3<xuO.&4 ~Sr3z0ҥK<`-$wq~`{H[*?_סm+i۪fJݥ[q>9l:E*[EC+Xknȑ2fk<yސ[H/9V!a: :˦<HEh]ҧGkɔJ7l"ϖ"Cʠ~ryG;Moz"XZp$,';XIaAu;}*.7X[aa裏,~},c+~W*Wo7|Tʇ@'4H0'2wXaB2.l5u3o[@ s` 01gɱkMȽs<#ܾHz~Fe[, sC$-՗XB2 s =>\!0sr,X+SߑPiy﵌:w[vqg lޱKB>b1:)!Ȼl[!ϲ%X`m()5#>x!/WAx{ɰҔ;Or\k rF^) `;,as!qɖ]b 6ַ7%`SeI(bBk!*!⦝yLJ. ߬G/bGGY6*VޟP\1sK ƽڭE2evM}A!]Y&<C^7_뎔6n 6\nAՖIʛ;1*1mE@Pځ@N\K@lkHҠNYعڢdb*CZf21Ӣ">Զ[ܧ=*csfg˿c#/{9Ȏ#ܪ=7G.z7mI{ߓ#iwSlX;tlo >jv˓k.=3a{eYh%.'##(xu~qJ| |7bقP?1$qnP<j3], [kצ\sYf!hlGtt()8Qs$J]{F(멓U@SoY*Ɉgp&X ~x} .nyto[n9^Or<ur1˳_|["ufvXldY -r$zk4kƣr$ B?o\m;6H `}w+ zÇw?k' ̌ǩZY'zvki)MU vg!mޛ'hJq{Ƙ4aF<evmLEN=T[?c7EưH,b 8@IDATt܏?x(W|M_퉨0Vk %pbZ9iб̢n=V`EB2 0͛71 d/`C)t9YYC= w_fȝ:ujjP8o?hoʾc-W6{lm<<7 Ey:H1j`ƝWh+uREWf01\AeUo݊}aX\`sqR%JX! -. #Ȗ 9kt^ SP&:B Xra a&FU#I#YYlBqK7Q ᷿ ƦW*9ސ\Ӗ wIcEXJDpqۡSE@:d3.w6ڙG+3 4n6$nY,*,[g)ćx\zs2PiZ?wm ɝN솥1 ee]}|ciԠL]3~MFe䪋N7ʰ REypOu.+2A22ChABjB_}4"xv >h].JT֞N]c,aQO|p`297ް1UxqO>H~Wxɻ>qs ڑw~~"K/ f\^Cĝ4is=!Q{ #6TWc$K&|<Ef6B פ+V˦-dä\MElݡ^kO 2G%NЌ37MTcCXzr½b aٽ{wA,|샌 e?r! ғtHCfW 1ݳ0 WՃٻf;餓]2XQ'n+L<f9<//ώAO璒%s϶dTXksz!Rt0@.Xg/M7x V@۷Oh@`bWa qƕI'ɘ3u PɉMXcF0) 2~az V hi%|h? "61/ aUy AeۢڳȐ!=uVbyʤ<U&AА^jk!{ݟ6>Ay*3/ #m` 1nZeM[Ueo4y#m̥?bEd1#?@"ٳtR"̺3WaB\yI(Z0\ SWL\'_O~y9A`0ǣȾÐq*"(׭oJ0o+KDؽú~k 9(չp]Jp%g嶕|rp\)/;ON|યCV{8\w2m_xR&&D=sY'Bd>ζVHy'LMW^pyEeve/;36taݚtܝ>)@`W_?nl#j $}r:z[oc}uGz,܅HD⏅m׶]9{(P !Do_9}q[>pنލ8@ΪKh|_>"6E=:[);+Ӻlnc͚3Oy=9iPݽ^e5G"wa-ڴic!_^t'z\W_}U?~{ud@HT|0&rg]ޚ?/-Y2kKΐ~tz|,[ZƜcd5JW6$\|rcM9¨0 0 yHNʌIA;.DT Y^z%R>=va 1P^f_|qk_FV#OfpM- 8$Ee AM駟gQ7/!  \ j4X6#^u\!+QFE=DeXF_O 0S 09ꨣvU4b*Wrw (Ki; iq{2kT0a[j2&א psk;}~k֩e[4y?}jUE텙r]cKW3]b@a\ i!bD21ʝ̒:4ƒC4Ka<gY?[ym2W}RovQ- rg>Y~"("P-(Uh-$X5ilf,s,X7-۶X5S]ƑZƻ%䉨>H쎶}hn]e]kJKͅo7<#;tB`nѣɦo/BΉJP:=?M~cҩS'6;UW]e߳ e6~I@ %TQ3%&O!V9>V;c(T?!`nWU(HT))XQYeDbIe]~2 XDNA~0 rk71ޛhtPխ6q23Ӎ$c&YdAf2!:k%V ?v=}.6Dޛ5 })//Ͽ+7 Yq?Af9WoMԜZ"Iƍ-#NZ/a?w, +H(,П<yD53^g3dXA~HRzq,Fx.]KDTPG`։7F+W{/(LX] VrcB~` 2yc6jX7pC틉 9Ě hL!.\t4= .L ڊd(هl?ua*9& XG\3΁ca Vai7][қwo juPZaHD'#ۃozxIA C[4F{ܝ΃}b'KyRr"O}]@{+ ar+IrzǦ=3o@[ilbAm pꓓ)|.漱*?])BBӡYcK7-}H((ê-*tr/p}ek 1n:@Yfl,UXTNSETB}m5we{DۨE@PjEdMiXYhdT]Ym'}sI # TCl%C1G)Oʟ%>On]j7v[XRh܎%#O3- lw;\VٗKTڄK7{֋.dzY:bĈ1VI(0je WXr/8W,EayF[(Qc{ӆ(L ׀uɒ%AYۿ9s}zhTCn"XLG!?S S>t"Ǐ1Q "԰bs>2K{}iߦwHe,2|n {v͓A閄,b]w)X>q\ <aV-,wzcC"OY`uxByWī=t6: |%=tR9s̓1qu_ǽS>N vR?q{X/}g1Cjy䑱aӌu8c(AJoy5Ok/m_(rN81/0DA& nċJDb|U8lb-  a<8)@85777!\2l2vnx`5Dɮߜ~Bǰ '}%!v4Cܷ<;Y=Z"W0DNXO+yu[EP3Zo#ϘuNsL4#Xo3r2u\ֽq-hoj͔a,mlC( 3M.'L<!pb9''`s`5qrn\2gc@Qw0Z4+U܇&֐-:1uY 1c?}P{7fQT=Ok6uy26A*n_Q[ `w("*eSz @T4̵%Ҩ^@h}z&gMF 9ӉRN#vG Bӻ.kV% 7/g  4H0$mZ_ERI?r*y {?o%([nEN893"M 'CFLG2W:*IvJo أw1lP{o ^Qnb)8ecw\zv%?CυK%'$(t~4./ X(PG2|XAxI(Q. B.ިkG^}5P<]@ǝEWޓ3N:ZzthbG?'\dgXEݻwh[e#s}B tg }54n){!Ae XO}$dd2nǒn%rPDPr+Ju֣Au Y*R&x,p3G%W0 WȏE,ORqg׻M-<yQyyyj .hxpY:>àxO$6'K$s ^fΜHN*דxˤ/Vs sUhauT*-͸{= WM>9Qda"@ZLyݣIiRkrE!r.Wl{:᫵) r,Ciێ`S/l3O;2 )a(|؏|s> iB!3_G89 1/GkުkK6ƀ5HɜU}m2Xȹ8HgsJKӯpY> 17}[FHSd_ 3_ҫT~>l7Y/T$\KQ}KPjy4KVbN&vSj\Zd4S#CDHidǑ yX%>hK@.3eerD#{@5h.'`O[d2y6ԫ[:`ށ?مA, f*=X|Yт}+@$@wmj'XO 88묳l1cXj_*XbpҤIy` Gyz9qmǣ ;"qq&ta!(NB_QJW R~F.p焘(w?%PJLDPi(!P>V_a cѣ= }MYSwFuӏ/IBqfLgy z7%Fi(<</6G?}ǯ?EO 3x3DQ3"&[~ '!C؟< qGXHܚ<hf4٧8L[[3֞'t a2s>~5W³)?|2vبCwuWi!t|u0ָr_dÎ<!Q,>JfA +X>_U5g'$ < y3xxu :#V;0~ko]mLy&#Ą1l. ֚ _ho.AAi:o0|D2ϊwib`p.=RLVx2Wys5 &wqR%0QfIEJP]k~H",x,&,ǵˎ;;X +!{`I(}m +'9w,šz!-^Ȣ}VA@Y_\!T Riie Y 4T7YX:)920׾LC-C8eDA:-]W`-hj.ҞJߚB~!gu="D.$8\rǙIۙgUiq}9omH|jo2.0pAA]- M[ViukŊ"(5\5Ko&6eo˲^7͸6T 㲯};MLDYF3iXTWTR$] [*N%[#s?'5;Ho]RW^Ź/Qeٖg_&awc5 #ҔO;'P.K%pyy>|- J.ʣ;cd=}e=1(ı.eJG uGBGE>(krE( Z$޵{m QXQ sWHᇣ_@A&t X+[. &Xdq -E|do y0ᣯ$}9~~?̒O0d˶Smk &;.q}'㎳w\L"X+=r~r뭷t BxE6,p@|BHM20J-ZzxVmH,VKoMrq2j[vyq}zql (~\{\b^w͚RZO?_˗/^osd*ú2 qu<myu(mel=AIFɳ;~d yjYab̤?N:9cWd2(>,M uryvgPx%+0`:'f[5B:%/ 7F u\6Y:t=,ُ.nߛAD-Q2 @=npƃDU@Y kFްtWO9+W7zsbjo^nMӆTY^P,ˡ7v+ẼVGbSCܪfZ˿(CRguʑDs0m}ߜ .$z>. ?hǏSK(C]bu6 YfᏦ.F*xeP㜫x-9@j`Mcsw{rr!RQ&>a<oW8vI6ezٶǯ8TZx\qKkYuÉ=傡y ȨkFvC7de(QAWBE@P!PǼ4PL쨕VȦh6KھZ2i΍ՉuQ|PG6/[l=X@-ߺ\&.h\JpnS6+[Xn۾.=Oʌ;w:Ldk%VS˻<¢SG]7)(k;(4z /L{5kOcV^aӖm2)l9?;Ə4Yb?Pnn|)(Y @x%\b]=C`rX"=>~|QF^!^w}ԇbٝ6AhYH:puq7Ve|ݸ qB|07.Ou^~,_F>HX9!4EӓFӺĥq,0[h۶40+ /r ^awY@躐0kLw_ d@-~ 裏P;~ *_]Ӛ4qho| _h.|ibIyxz3_ƽ|5c tsqҦyNxmcI$Sݛ EAz_e+(_mfc wfg2c=ZI~sO$uP5!Φۓ|6J~>7(ѫ0!FGbc V1X$:BHo9E'`>b,){={f}: ps={la9n/?~3,\ܐ| &&Lּ7}vr3o0~&4`KKcP? tǡȠ 酩3PpaZX+tK5fGB2F4^6KEv6R!i-O4, ϿX+gRagxa!&*ܾt0qo!3AyWti#cIZTG6\J,O&~aUY& v}CV,5v7Ub"r-.$/DӸ_ &%=QTz잳Y,[Mc7ab=xkTcO"`_40bBi!|k79j_Wf \gw^+|~{yEz~e}Xo61~4ȳ;"W5EXeKD^xy9m/qT)[)"T2|=BfZUx%V_h$OU+|2=3sxT<). *,(KotSx '_2.qv/~rRubҠ3H10BkyߏuN4_1IaRok.=K>\/ ]!z{N9?,h#'s|9}QΓ"L7:yOw ;K/yGis@oĂD躸ָKD([)tbY(g0]zӰ*Ω(A?2N ._d'ۮf|+Q'Ȩ¡O6޶OLL}G\%z|u/0b\dp.~a} OX!hG 1ZђM6EǾzWd<䀶-"gol, y1Cd![lt0tEѱ&HvzMΕ1"C}>\an3rlj^Xn_ϰsC洴(^_J:;ZLgaB tSU囇 d'daNJU77aM~@>)<aҽ~+xաne]TDS/ \p[tS2Bᓊ,2 Ւ,j44N/__' A䵄"wx L0 0uz-Ĉj ^)T]Ts0ɐK~ڐoXa]ormL*o^bN7.<m,C{,oU1x:Lb<$Tu"(@@xW,۶D4 $S%M,yre$N]:ݿ'YxPT)n<@"W<[ؗߑsCʪ57ޗ۲:R-oOL~?!=Rڷke`R^Iryt% X_wo8<%uQRT0çu3{_K7<7Ǹ dō[fM}3$3Pb%'{d }ⰿQn+gt W>̔?&g;K#CvlZ8h9t@o`,C|Ku<xND*#"Fq<CT=jU )"/ OLܬ,nզc5.7Ӭ.ebƽd\݅2CPM_ޒ<~,btxeg>]($AR~*&g ;YQ(BU_<cs-CʹoV0M8ћw+3("@lRp)h֩j.B=ilj.Z4ojGz,;wܦrȆ@zBsұC$q#]}{u9J ފꏘAUFWN÷!*2 RXǠ`Wp}Xɐ۴ₕ=qHmc?ܾPSLzeE@P,H@$#.$Wsrh'/>%|fzBUc J܂(z]~icQUHeZ"(@D˅.,`I+&YBv!DH$ȤM ٔIFҹC;SҢi,wjo}J%"Ť[s@DNlRQjIWSE0qlݷwF7MV.\o+*J B |*"("(@G)d"ݟFݤzm"("jnZJP@OU;6) (8oR1 V*"("("("(%R.pc E"("P@:O]Mӌ yI̊"("("("(5%b\ӒٵkW{wŸ*...S? [EPE@؟@$&KNpJoPR jK~oܴeo^4="("("("(U %b\LKdǎQGeJǰaäs&`tP;vLͦ("T.M5r+"("("("HqY b٭[9ʿiӦGEPE@PE@PE@PE@PE@P@ݚvBz>"("("("("("(U%uV("("("("("("PP"]R=!E@PE@PE@PE@PE@PE@PJDU렭PE@PE@PE@PE@PEwR]>.UTD@DP@ذ b/X}ٰc/`EA 6l *ҥ^{[{7L&'r9g @(]Έ6qM; @@RlպUU4'? RJٺuRc{!&௯u*?"-E ~H$;]|F-͋-}8> @ BB`[߰fK_SWByɒ%ɊX|kNŗ?$Ķ-A ~G$;]|F- !jK_@ @hVk隵k IifV]klZjͳgNVm̙3]Nv* !%m c>'QE3ʦ?oi^Q[ p|@ @DUںl՚Uh Iif]ÕkVݵMGYU\.\h-]T}l *]~ݤkk}sȦ6ҟ=N(:ג31+­Ģ+6dHkႍ#6lM5@ @2qM[2" tR]`ҤI!n>5jd?k\Zi?LϞDz?Y&W]국dɒ~dt@ @~5g8>4'҉:yܹsmŊDEE*D$:i~&K'*QTX9 G??{Px-M ?s3_93 @ @ @H@BsD" @ @ @@ʜ{@ @ @ A!* H @ @ @ȜBT @ @ @ Qi@ @ @ @@2g @ @ @i@JE @ @ @2'93 @ @ @HBT(@ @ @ 9̙ @ @ @@ҀD@ @ @ DeΌ= @ @ @ $@ @ @ dN!*sf@ @ @ 4 Q @ @ @ sQ3c@ @ @ 4 D" @ @ @@ʜ{@ @ @ A!* H @ @ @Ȝ@wcᒕX @ @ @ P, U,/;' @ @ @6=|Vo-G @ @ @bDDeƋ @ @ @i@J @ @ @2#/JC @ @ I!*MP @ @ @ȌBTf( @ @ @ &4AQ  @ @ @ 3Q4 @ @ @@E1@ @ @  DeƋ @ @ @i@J @ @ @2#/JC @ @ I!*MP @ @ @ȌBTf( @ @ @ &4AQ  @ @ @ 3Q4 @ @ @@E1@ @ @  DeƋ @ @ @i@J @ @ @2#/JC @ @ I!*MP @ @ @ȌBTf( @ @ @ &4AQ  @ @ @ 3Q4 @ @ @@E1@ @ @  DeƋ @ @ @i@J @ @ @ vݺ-q|9&BT`@ @ @ /\l4V^o6d@ @ @(_dk׮M1$`y#dvխFUV!j @ @ @ M`Y+oٚ5NR:F޳l,2_bC}j+V^?-,]K[!@ @ @ȜDeCG|iUЪVL3x͚=/MVZGYmμxYsً l {칁VbEks>}~h @ @ @ &Mf=_D(U#H5VCKunC6ݏްSgIM`z ; .VXe&N_]?YOA @ @ߝ5F~X.[vXeW";~n{_wG|aV;hncr6sc84`oʕm[i@&"@_@ @ @ȞEKl܄IH0p$IBRLu~/0h "O"Ԇ 9˕)]ڎl?8Qm '~h @ @ @ [͚4O>:x!1闆ʕ2>Ѿ#>W&GYU1k=w9\"T2e# <jըgHjh! @ @ @ +˗j+LJ/\l}uV!(X^<^ EFRF +r2o{6b[>g(Tҥ!hYP:["r_s@ @ @  @$I2 I$,I`JeP}yoGc֯ϱD3N8ЊP:!"r\V>@ @ @QǴ;*RO0fϝ$%F.2Jly Tin74rK.*bkհ]NeD)+g=}U뱶vݺ8J,i:B/|2Qa,C @ @( B׉Q>f8&aĦ=*UȲ+m_l5ۅie CD1R$O/FuDA4TB/BIX@ @ @($ I P$($0Ihhen` B}͏"iF1#n=",@ @ @ج$F={^:D# "Veo]\;+ltygk.V4C9s_Qcڵksh;ìFrm++J,ZbC6_L 6̦ @ @ @` XnvڴG\ί>mYzMduלoM4RHiv]=m܄IsN(rJ`N#m*v/0זjk+%ߚlOA @ @ Ph H0p$IBRIxE'u .[&)8/BDK @ @ bE@bT]7wu<wQ"UDBEKw>a|?!2IGٹwj[UE*C @ @B@vjPj۱iWGJϖv[>X-^j}?~];Y:o*/u"D@# @ @ @[@%lmj٣ݯLKGV{7'_kn,([t_>ӎ?.:+[LmEiBTQIev뭷رcJo˭G'aڵv[޽mժU ˱5۷wypM~"GE@IDAT={GyĖ-[ɏ' 6?n?YWX;Ν[XOvg@@\p}ݑ?j3}3Xox䥙!? 8f̘.9{%sT@ @EM%Q,B=k&!jޟobD(Oސwt<ut+WhP:ҹΞEʕ+m„ 6o<k&9uTVZ Y}&М9sNX Bm/^:7eQFիsVR \RcN֪U9f6̙3mٙ쒰lRl]'}&@q9 ٳ:/\UfL;쐧} fŊֶm[PBRAJҥs<y=ڴi-,Yc]˕+YLm d5:uDI+Æ s9'YQA @(40qyA)Skqm[fz0^n?ﳇoҶQ-ǶL>,XĺP/J.e֮MEsNA=͢}b&MJu$ I:~9?իgrlEL!9֬YcAVlPxHtR[׮]Z-6 ]ae~뭷:=DŽ?>ϙ*UE]QA$~ݺu3; 'e䀿+6%]EnnF AGqYPQ"O6l_|1)믿$k`}?D}4}qTVQh I+Xh~tDdڴinG}dtPSqƑ֋H^`{vm?7o<+-q@ @ @"C(F)Sڥ[edG"Եw<n~1%BSbBT!z@(FkݻwOY[n'e~i,U"f29}E^KOO?mkT|~Ko @Ŋ] TQ"R*RᬳrќKd(%p{5kc{ڵs8!S_4;q!$|YEEVwH{ëܲ9.$n[5k:q-\/%aQ{:EDO}멧Jx%>`siӦN~+Ww96dҥVjUoĉ^eGof7 F"P2e'pu7.HP1o;FO7*;Q}-7xcxU䲸ըQ#r[+5pc1)~? S2 USi0@ @vݝ=iM (k2ߥRu2z6g 6,c/ xǖi&1ꊛ{n&i`Gxs>g|EgFglɅ=w=b8[,g KkR M3ީTx~|8)رs;{~r$Kdw~ܪC=ԥcUhDWr:l S?C/i~t{ ?bo\Jdg{R4%;& = iT[KRT]{k.&9տ٠xp#{wͩmZ>zo vm71]Qz7 g#VrG-z%mͻ薨>oZ,oB}]Wt}{\iPUFCosLCʫ?T^2'_~q&TVGwjPy ̋Zo*$[ϤC9lMPk.*:-٩S''Le?e!@ $#nz۟vشGF-mmٯAV~;+YWA[yG;_޴EhoOȦۃsj)ţ3Xo5G=Pb @SS֓k"!*qv5w Xݥ7w]cw^9t;v}w+#Lˉ_u#5ZFȔOF+OfHh/^HhRiLQGrϼb8"=:_?d?놋R5tЌӌJer!'&s1ɪ| FkEi`ZU9g>JQv9Wj1z-G r@w&{"SU(mZAJks$fejrh;.`U4RoMPߧ8^DdnT4OLL00 ]uԳ2/D"pԇwuWSĜ7?Ygj6풨~yx|DT3ϸrTWPԣ>Ĩtl~ @@ uU8(~Q$h61\DT!~<n )5}gHbvd#ˊG,K!O}=DP6b{«.ˁ(R4o7o^BGģxgRzk.z J <ͥ2;p˗^z>@P:/=1.[pal. 9SSQ2#՟JPNNC?rkT~ij_'&53GXt֔BNL*5WD"K$$*^}J)9xo喘@g*AUg.]\4d֩3<33[KH[+o4@mH$HS?X`TX\߶9ΠӫO0ϒu D6/ 7ܐ+c2_W^qUI\ELېβ}'-U^.̒%KFfE߅/wi ;RsW{~ۉ3+UD  @@oAΝeʗCon_rf6}=o<ɗڊr&1]q{v*+= 2<x͙ G$F|vg5Ræh{^+sB]~rU^Vd=,D')Ři61F}QInE (b t%$,I%\}ny+r(Dsho͛ W#՞ύVzZ˖-]Y$' \(S" [ioݺM.b7ߌ{*'JQȤ+a*!T}3t]rƩ0pleXޘK4">,]n}>tZ^vܑ[Zճ4F aR_t)gDp4hP/282;Ylc*<ZA>Ҷw>0UUoP}=H]dr۫gJ!JJ/?Dˋ-r7x|M;ӝNPQzn*JNb"jkNJϪ1?MjIo 3_\ ~FnJO>35/j? O_~c+~[or&od }Y!@ Xff恧٬7ϚBetʕ)AKϴٰ5vȩkZ#O#Vqϧ {GZ?:~`?cFP[Udv]zIAQy9>~de5{&*'ɹ*Qx9p$xZUFmg}v, gas"Ou|_ӎ;n1,˨?ގKL96֦>Ega6YW\ƍ]Jѥ<?+UFEEUy'~>JEQX4~K7ntAe} .Zbg͵fK&elmђ DDQlMT G_hٗ 1zF3U%2OUW%˶y=>gNd0Q˽΁1ovVfun͉T;w6}Jd)۴u]mTP [%zyӳ>REu=62eJ,"7-뻨0"5FBlժUY`((;~?z++jXu*W\U5 @ $$W*aJ,%KB0Q'u^ڔ/^:owN$FM6zR wtVvY{JXB#/u"\l\V&A!s9MkJ?I_e^{)rndcJa#>s#ͩ "aR994y_{Nr.viǘ&2 _G5dQX7H-5PTa愨:3|pJ &SHT.OԲQ?\Ԍڡ9ƎIOEKnEmO"GacPӎk'!Jj]sor-Sԧp9>zWcG?s;s*TpI̎oC€.ٰiL\J/i9餓"h; (e9śtZ|:^}sx8kܰz\HT;64s.84G}{6|s*a+Jpx~p'|RV\I ĖOt+Zo^t<E`'wU>}\Ooc^|)k6 ^vaPµRE8c4oW; @ VcO0fEO??CnNٜ|3Sx#H׵I/ߖ,?AdTe˕PbT^/yw៍ve /tB`gՉoOdo\f"#pNM T?,^n)'frTL(;PyI4O'0/5h9cW-Ⱦ>ͱre9A̯=76&rzыSNPB396HA SG4Mʤ$|9NKi$tJ<hsEasntls=) [gILeߣGdEDϔLM>Qm6c/O?R) Pg/▣nC=5W_m 9nԬY:s3ϵE+VD `Q`FJm:PrAJGҪ 3|0]gEK܋@nwO>"^}OѢhtL)+,P}?U$Dɚ4iCDr+SQTJVSNɵ"eN+^fbJu4S>ObN;۵^z]7x*| @hߛ6wŗUe;CIGZ`ʐT&3sbGآKs"Kj͕\˧ G|eew7mZ3O]R;C;0DZb2,Aa:V9D4:؁Uc9& -Ϟ=́QL,9s M;G*?N;4PyLv_tEn>:H4pL; vԴc?0䄗P<#JW>!R4u7J^z9GcTˊz H hDA$L?k̶U}NGQu?-RϺy',Y]~9Yڦ($E(m"1vm@%F ޾^:H>A4L}_!|+J qJEɒ)}=Mm~\9\~U}Y=٠yind&v2ӽn_yr>?kyA0^)-&tHWЯסKs,"H'ԩ <8}pU%j㎱8&Y +;ߓ¦z$~ MchKD&PqRB<c}%p{.~ċJ)b '&L4ٔV@ @E<4 Vd( _dI:kCsQQH:1:񈴄<A*Z'rӑCΉxt0FFˇGj恘3gsk瑣TQ r!*i=~$J}4ũjmڴ:;P)D(j+E9%G#oh(E٘>sTJGxWJ*={4/& m)!6M&Oio}0Ҿa}VJcLse՗$D)/*:B$/$}<~sm_i~iJǒ_ z6Ԧr{=WE+t^a1_EԷئJ7?7QZdQ_VpͧDeL?u6\<nWYTiru9;#MP:b` :Y*H<>ې  ԫ2E^W>Jᔚ^xt^oԩWzwO&Խ@Ŵirե{JrVPoYXhp{$ y})=BT2l @&1՞zi- L˜I۷jĨ2h4=SEIRÚ0~s\*w{#v_Ͻ 4wd:"OW$Gʧ+Ɂw_ AJ_iћaMqW)}惒Ot#/IITzQI+Tkr J";(>*Fߋ/؎?x7ZfX_N`9O@3Mv7:Aj=4%ҥK@6#aA}YT{｝TW_"`R_]U(&j >&mm]N9ڦ9y =wP;5UtowJ_:f'\TT?H=|N1qͷ$Lh5ͳ#Vg[rg}~]׸N:ztj<G[ ~AMڶm뢫 &Qhĉn`I:;|J %>Sn@[h)}F{O>qە0|^Q%Zw-fSHx[X{EQZjQuY0z_ޯ{c˲ @ O.eMPjը:m<SAZ?Q5ڠ&uxkQ_zdS9MOno'B),7LZoR)q#VN2[],y꼨4VBQ_cǎQ  Jao^{7ɰhlR)%mfݻww#w% Y (֜Q_Φy4j)tw}rFJPrfc {-5U_ΝhLr<*1*Tus)F<)lN1ӵїFfe#X/}%ykl%dEbwzq?IRd29͛DLۻvTTڜH))/Yse?)a:>\'o4Ju9t%@i2}G+ɧ{ שeE լ=_X~ht}i~_9L$ G)Še.'y.n-|2@ _"وRvM}|af2ɞJҵ=̒6 @ d7+_"PHВŋQmlڠ6ӿSn <y!9Ĩ wf藍[`&"DK*Ec])} +m)mδ|lGw Z߾}j9NꪘKS.!K1GF)+_X;wnl>Z@ilyw<Ehds:&ǖRaFHHr?9%tPd9NO9Oo&\HQLP\kwP {/li F>O]xl}vmk;Nҁ#<SԛJagTR?GիLEg&':9.9L.INO*2ELEetVDI*5Y;崖/ީ}:]Ɏ_ܶWIz͚4:`eS<+5p_T$&VZD۵^}UOtHR"$BRP!E50E{Us ~%-_萱E=KG8JG}HB͏)Nk o$+ LT j_` @RyN'hڵjX.'"EI:./ 6ч.;'89)]=h_w^=?4}3} Y`>BTF9*-qԉGF;ͨf>`ђ3f=9%Z'gF2ĉGJ֫W/'(h"N;4-LBrԨQ#6T@h;%RŏVj,EVrpa$i$uZ4GQgxEO$Fw9R}^T}U瓏v?>F7f=7c\̷7,;g]u4ڠH'{7MN_1mw9^GMX*U{#ϕTe,m"kٲ$ HRﮧ7dw+/bWc5-^j?γ1]~o~fu.bvXtz<5O㿃}]-(?K׀UꔠM&"rxS5(Wt$/*uoiJa 4VES#eݯzxKEkO @ 䕀Aնl-ww/HjhIv1mζίվ{Xre}/ 8hQ,nfiA <OMj3KdneD:&З_~Z}+Ui&=z{?Jdg}^zȀ:ש;}FR(W*͢RID*| J'1r9vS!"^Pӈz?/D&PwAe4k@p^p.VϪk̳O?d?kbi~4ĺ/pueJ%؋<nE>Ѽ,?Sc縓j%գoNf7EY\,NZ䢞D95aĈn? PćO4`x,G@EۻQNo)= vɖ,]nO2hLu|~.kܸqs6 J6"SJ=E-I7J~DC"AIBR[u*+t(աD* m$Qt&>TD=3yn;0  @ v(7[%t5 2ԮUݯ.w>{j7\ebN.)BTz d)9=hTdJuQrVrkҗiNYhD(ɇD.rda%KJMVi䠼:}YfRG rjT{9vM} W={tR*mRa RGkڶ[p!ƹK^8\̛«VN͛=}!J;fIsIGJ#*k"(p%b=a')"Fe*`͞=ET(h"ӜM~~ˏ<])N[QtN;åTL"i@Q?f[ɏ>EJT_4Bշ'J%St?{AX5HEz}Yi6l袻^x')_UN>NSO=5\$en4j >=z0v!@ خsohj 2MC_;iE};BT>]_&eUF2T<LlΔKhTMS9m43trlHJfr(3ΰ~|s\&ۏm'Gys~}5\*#nw6۸tDP԰I%C_#㝑jEFF#B)^`ևӯKXupK\SRE+Y>*z,rxgEVEȕp[oNs#t0RĨѱcK/JeOJ¦:n'T)SN oα糞UӝIѯ;w{.VڭǷ'V rZ/"fϿE.[n VǴ庨94%ꥈBFHo+/Ihb \4d"krm.INR ]=On7 LbO|[YeX)%Y9DR// "|T"0uIL @ HҔ4x8BT>]k^pRT߁*hXwi29D29)4v4P5IQW^qyСBLi9S:x&ZhDVBDX_ O8'*u]FsITT"@`_sEw#XwF)GwU?,95GGTa*/l䩶S, D~V^.;Oz]Rէ( ԏ4ORI[=+\pdQGe{lq.ЪW)$ED9(9%v}w(:WDh"7D>ݻw,h?E \$)ՙ2U׭߰?Z0|1GE]l+S_$@Vi%ėÇ;A_QLzIѳXX>P>fUcl}玞|pZMW5!{S]i^& OJ'XbJLLg)h"o50a$&ޔoԩcD>sd @ l"ԫ[(|z2dJN (UV9ܺ`vOǢ 5Fjt7#YJ5zذa6fk&LWDAc T3,r+ILx. 4PFKիm۶ֱc\dNϬGT+`>~QTr[PCϻ[5nX/:OV='"爞_&1JUD]*ajȑ1GC =ݻ;G7|5k5RF|>s>b W~؉1QVeՠAq糢S߶wy'I\U y݋uz P]>ݶU~TX޺SL6h#ju͓MDVRD:X'ѻQ}R"Mo^y_{!ʒoqT??P#I"[, AQ@dDNU4xdz8qb!:x@ @`|{B߯LVEsA<$:clF:&9`Ε}-XNetJqɩ-ݨQ#ڽvaQE/(:uJV-G%qʧB@@09'P?t9%`$[?ꛊ0i߾s's',<ޔVt#?+Wm:|ɱɡ=c '>i"&RLH~:1*٢?r*G3iYBvΩ,IiAtlEzU)Iy <*駟h@KL*gu֫+*+ǶyipUZ.),$f&J[ӑi? ub.A[*z} TҠaVJ%;}RubC"Q5o7}O+n|߮w=5#F;<>sX BѧN>~>)4x!u=؏?n ‘A?fE*%.,[<i\ZrK\~JQ%D~NSzT֮];7##ANi'% :@ @@"ʷ8QQ}`^8Y9xmȤ &<Ɣ;ܔäund5YQ,r 2čO4G~G;~ȩAN g—<gUiS\:M.@vmgzs+푏nQJ;NqNj9g^l۫YcۿwP+նrP *gJݒ"7 ;^K 0ҳD^nh=/D8`)׻RyJ"REE{rBk9%(RB2ENEdVJժE:pv]v%Zi"M鸔vOm2YQ]zɁ/P͙3';¢ ^Z2q':TN:^(SJ'_tMm J'q6LKP:o{8J0JȻw3oߺߔ.3V:Իb>4 ￿$Kvm%jA_=1ݣzN̜93g]QmPd~%2%z@ @@*ʷ+hC|=лFpl6h+p-[nwژgڌvݝO8!+^MwΈä?Yכ+VgCh_QZ*ʱB9,(%Nȑ)H9JNDk,YRR |h\ֲAë/<Nj;]^Shm9S%wR9 sFy/GuUu=/H3؉GTAP he; 4/KPQJٰs=9>ٮ$=ҝCIy9i"Ǻ<^<kҜJsXFٝ1rKJc^z&n9;N{VZ# o[QxI$%Y|8(J)R>pс3lˊQߒuDP~/S;(gt&zWl㏡2{"OR>IV<.grԔk/',5+~n%:6!@ @ G`,F V}c6T>%b@p7>[s:5یYs;矚ф/n_~3Zu>xY][;?Fx-H VF-VnX(Еc}#\4"R}yY [e썲[FTe yI%BM@?d6TA: @ @6"?baULSΧrA )9;%uE hUSV퉻EYm0 6aX 7`k4JaSdJ J[mγ&DC@,[ncoMwLj١Nmw.j*([ z߾}FFs5A:(@ @`sȋXX((7ӻ gn|,MZW$BvOno6n\Q &4"eI %UV9ɱ( @8 J,RYJ#MS hn9řhΨTgM#>C @@CG/bBzC @Мr~-iNvڹ)O@ @?l}WEfҦhMZ˖-wa8Qa,C @PD)\2)'P͛7g.xh @ ޽{-ܒN.0$Ju=Xb(X @ @ @`Kx1lذ-ux8(T**@ @ @ `="TuMjכ^ vmذa6g@ @ @ua3TD@i^{5PRzm+Y{%#DDT2:l @ @ @ #W)hѢ % @ @ O૯*Y"De @ @ @"0~լ+QEs  @ @ B@)ܰI k[h @ @ @(ZjejղoNY=蠃lڵv;vCڲe"MBЛoL[xeEWlȦ z-\0ްalaX?Oѻ|_vPjo(- @ @@>~U֬Y3[fk&NvPt':(Y-K3gf$&UTFeիWwZIlرt[͚5m̘1VT)իw}9ʟzX%l֭[7燑#GU^J,^ɎODT2:l+Wϟ;a~7Q @ @ "d֭[+'qSN}N0uԌ(E-vW8!kN;-!n;묳\rĦx [׮]sPFc}AUm(.Ux6Gsh) @ @@!'蜰^}P_ن 9i}ƍ$+lu9aZtQ="՞={z-ynm96+)9^r%9Æ 3(OwpJ7m>T7~65G+B @ b^DRЊ+r e -[tgҵ[NR\V]tQr-Z]vŭo?m#jʕ&K&!MQT>s\@-"jᒕhN॑ѩ(2gE8@ @ $%xl;vhKW~ ɬLϹkƭ *FM4~Ji24yd@IDATۣoUVUw ^,ۢK4Zj;{+6ۻ ?q?#;cb%>=OnW+gYjq n-oBԖ< &фJ+!^zN @ @`P*M8"k/Yf9D! N"7E/{=7?T^zY۶m'x"~sϪtǏo_}U,_VbN*PLSI'de˖_~٪V2d}n7!Zh&0{Ή޲!@ @ 3%Jl9sM:ťkҤ;mRZ; 6 c.j}Hp}]'^\vށU\)N#?ǪkݺsL{'$xl9ΠH ~zK .j{]vevg)b[mU%:Gd)W\=߄p@ @ @@$^2?ϓ懒X3sLvC骫! Ju;2lv.rʮȑ#sPZ6XJ:[omJ#eW^y)r˛Rz4}tSTlر֦MWxsH=߄()n @ @ @śiJɧcJ<LI*$_6g}*V|w.=^|9}ѣ > `*U2{׃HcruEŎ鏯6襹$FtM7j}oRjΨ)Sѣ߶#F8֖oBԖ>@ @ @@%~z[t)G~vuW'P%"gɑEzKc6o /D+:,\Q^xaJo+SJ? Da1W_OysѼOUTպsZ߾}N:֮];YKW~ _}'|y!jvr04b @ @ /Pڜ&=BǔW_uȢo&<<M4xfׯv|g϶ ZϞ=jժN~ħ:ȕw}]d'"$ *mkvN/?m=p`)6p@;]:Yf9MSM6u[|߷'?׮]Uu`'@ @ @$ F"7)*)_((9 %kqsD-[qI)矷W^yce˖ߺt"&LwF/HmmusOiD.6۸bիWwauݭO?WQ`7%@0@ @ @{GyU\9\E y$Fs*I(S+u y܇݋/vBo-[=z!bKWV-tqŪन,СCm̘1nnxf̘aNsyFV^R ^veH*SGv3ϘM^W]4}!@ @ @@w9rJk߾M=zpѣ|Mp<x ONTձu'pBl/(Rjȑ.*I=vy͛7woS7ӓT~{Ի}VXa]tI_wm=cNPcn*1*߅(ATz!@ @ @\Pճ7xo?'̈J8BJ&)m_&M0֨Q#kժU4T*H;<'h)ޱgQ2_ϰazW=J3yT"nV'8֬Y3WoN=TrDou4 %ҊyiB @ @ @wIQ ;o֭sJyWn]yd˗/wUZSRݫ_~.+D!CN.%D>5YA?}uBSO=eJs"Gsa) Lʗ/o[NX*#6c9 @ @ @E@U{bŊeb.I7 Q^.Q++}MǑեK{l=pLb't/V`މ*0@ @ @ $ޔ.1ANЙ5kZBNC?ܽ8{:/5k(nv7UL7 ҫFsF1¥:tM0!&B͞=ۢ洊ڂ94 @ @ @C@*)O$tԩWق lĉϩO5vaV\X3fXN\mۺ}/w믿Z>}\z)$4r-o_=\|GϜ93E[f3BԖQ!@ @ @wىI*Tp("I{1NOwuT3pc5hѢX j׮m? <8K.qs0Z d]w[ugQGe7t)K֤I{\QFomoۖO|d'|b_|z]׮]ko]veuq! ^@ @ @@B;w;384|;#EnI&ٓO>iSNz$ST֭˭QY Q/i&eE$uE) (]^4xT}ziΧC{Kֆte69 @ @ @ȂiLMamΜ9.*Ji|;c74eorK}wJͤ*own9iٲe~S^z91LڤcTsW?cJ+o+W7o^mT*&@ @ @ >ͥ$bŊn>S! 8GQޛsvuW~]Tرck^2֫RI 7|ӪVj?sxC 5jX~>ȱ|(h񊜒a-K֬Y3+]tr  @ @ "K@ VYƝ_ޫUR#Ί:kREQa @ @ @@ D!@ @ @ D@:@ @ @ <@3B* @ @ @"Eu @ @ @y&gT@ @ @ E!* @ @ @LtkJ`ڵֿ[lm6v[%6yΝk RJYm}6lw}צNjʕ38ýg[ߦO:tM2@sS?~V^zի~v)lQ'g}f}ŋ~s7[f̀@ @ P Dm :sL[|)Sva|s;|p[rmV֡C'mӈU;o<4Ԋ%Knq!J"ɓmVR%vmcm—_~i&MrmX'A _|QڹpBӵYn]+[lAF  }{Iرfyӧy ЧO'*LA @ =QJ$kl͚5Ny'zr$E$y+_| \DJ\ۍ7!A駟.г9"ے]79{1lN ۊ9sA(t.旣Мh@*WWױ @ @ .]رc~(lMߤEDx堕%9 Sx-Zڵkĺ *lX:-N(@VX$=>kРAj!M @ @8C{ߡ MIm${/dLT:>,oJ7ooEaHE IWJ4>l @ @@N裏uEZO>͡.%|d˖-ܧ,f]DMy񢹘~G>}i޼ytxCar?YQ4swkҥ[o_~%ls.I.Q;5I LsJ)]Dͳ;[ja]s}6|75iĶfs d5kt&k1n8ߨ۲eKU/,XW\Ν>k뤈49<)TC͚5mV]ws<͍ƌ*UGnEK,Yb71^7+qӱǚ5kf{W:K3fĪPU_}ymڴi6~xP;]vX2ut/:x`R>gvVX1 7ե[{׷){[,V{̙3Uۻk쯓)S8>M6՗}_5)O@\~>cLϱtK6^} QFm1qgA﯍ڧ!oO8qκTW4"v2'o}W}s˫e3ۦkhѢ?NKdzy{NGf=>. @ Opw.`[Mi_a>*c0i2iH $ADHrNCiT0:(1)tii`Jb ʽg=9Siu}><3|QI&n-Ԝ#SNŭtA[nIm#<~mW_}u>/v}wwgzXxl„ jƌn~')Sd88p ܡ31<v֭[޽{aR֩O>}xA.@N#ѣG] Ao߾o;cԕ6F}ɏv>3{Q}Ç1cرcy. dn/ƍB˖-9ԏ9|?7aAĊ]:ur={LӿnԺK Jkw?uvBСCܹs}{N>䜱3q?8pu%bBM3=\|Ә "6@ׯ޵s8}Nj-!axѣG; 󪫮rn9!zn\~El#N<ٍ92m۶Wl<;rg>Ap ~X",_qI_ 6, .mK/dxc? ]q]H[Ö{5Dͻp^f׮]ݣ>K!pn@ 9gڴia'՞O?:tAA!  }l߇ kqlȐ!K;G%'o)BFT8B1$q~СØd9gп|m%Bq>Lp^kPD(sdמ5kwK5\*:GIuqLę,C0NF!˪x^*Oq N|D~bDXY" |g8ُ؄`V|HQF\1g权ؘfO~_gzL8;gΜ#~X9Ϭ̊\8Kn/zq\y9;~:24CD rp_dL{yE7\4n-Y*ߕD`xYq-¯7q#" " " " " " "I=>|?D-< m?>v&f?դ9N#D{|ÑL%'0xgm.袼Q8פxs9GX4)~+p"pB g\__YCtTfDgt٧Qw뭷C8.ϱ @}D4k̇ "u]Au}YFy 3c27"؈h"O8 .5<M"/_Γ6-QWՌ7"M85E?jժUv^-B7Q3 s?gkxj|:묳|2" {q<#^ r}R]{stŧ H&kaI@C4A q<F~N+g;餓|4{.J0j9\?97t0MT֭s=}5#R1|_YD_P0#pD}ke2{6DT }v1Mvig'"8AD_76Feliu?c4~ Rڗ1>gnݩ#cԸMۮmCՍ4ox?0^ygjC!Ea,ac&- qe" " " " " " " "EWŅrG,M?wN=uUmZ@|J8>y@BÓ '\ea:A25qHad,C\Ep<{ƽI1ŹSNlo@#5sa%BB\ajNfD""q)3w;mux.; a[Kwz6!&rNT۟r2Y'`K_p5|mFjAc;3VP' \؆$%H?- i"1p[lpmQ#8q 3BAycU"XPJ5Fe{{&U:J6oF8-w1uGjA 1E֏9?gї.w} c$,Ũ駟<c3io#*c*lj=;XRoD` =O"E͎;8߶WÔNO1ac.fK3.+V mCՍ3<nj|xxZj=Rt3jiL9N:C!wN83eDhh /v:Ф3g= ήP`*A@K̤CE;'9]a!Bٌ>j?,?ܬx=t""] 8̞y[\sLYO/}pND+PqQG_Xgf81hZݏ=z!~?fBfpH[ExV^H earpn2C%Ex E(;hcv(Y+B1qcovrj9M1Y &BYW&.^Ÿ&D =}qUiQO5&h'Tj>;})x≉hamIy)A`B*V?H'㔨͛(mC֍FoF4aeMP㴁V f&Կ3v--E@D@D@D@D@D@D@D 2_SfVW(n7g܀mw*_v5:GO3Da/8cq\&m\B#j'Nf7aRa9pT.'6'tYG Z#4,8DR_YAM\:ԥ"R|aƹnFIKG3w/a-ݡWz/@Ӿ 1KiHY3>Flso^G`hD9 hAc^&;BW1uo"lRBN[cX=C 6#a |6v:huL;/ ev>SgYՕ: ǀ5.nWsLM"e-#c_hD1؈."l]B A6.NTSh> "/ϴDwƶ<Զ@}^̇/`ܩS'7n8jJiOPBN7NiFi q U>)>+i5fSLp֛3;}O9+d:>Q'OYAZ{794sLHtI:aZW _~x^78GbC|BrkرpCo稢, Dm(6/W\}R!XjrQl]1u|}.F@ÝȗbZ^?k|d_jTy{[ =qeװec~!xvƻ1@iߴ~6s誔mC֭PE`C0Dlc3?!<QXOjcuyim<v`,Qvr>\׮]!RGPeFy(e<@M3xϝ ^'X gv9F4CϞ=i,§+$y éX#K~/^ŭ>}$Š[Ҝ\#bi畳/L=Ç;4Ñ=bMY<)r'jb]{ʱbӟ>Yꯐ`Vb؄UKwXp"f}Y땎 3!|?4RMln|at,"1>R j c(FqVߙZM^{m3ķaSA-|;kXzk:"X1&U-p 'E'ZF4hPWLNwҎM4)'B'/Ӝ VDaȑ9s;yxHuEz}10Nssr 8Vg^>VFy4igD/f̘Hi֩ )3gQƍTaٰU#-v9+b[OɌ|po`n"'}l]vjvY^1AzCuˈ.ӧOO=}ꩧ\-|QRYѸygWmC͞)ߒ9xw/W>!Jw<Q|!~}V" " " " " " " O~u"c7q>m݆@=zmjsPsWeM QDdN}ӊ>f8O8LY!\`#^|OºJf`0_0XV!Yf*oL+{CC/X1Dz+8WQǹH>7s!o)v [K,<6N;͋i͚O!Q ohwcYbG)cptͼC[cq8s) yOWĘjx?w3Q8giW"/)K? seҶiw 0 .i畺!ԺS1A{1N O BEd/Uʶ!떯v;!fisC1vԩ^e"oy?" " " " " " " |<$>46{s`L.LQl5! 's1A?}f#8 G /J%_| BtL7UB O0'x;ҊA~CMǻO>Bޔz[mOgPO*62.gv?3MTrM=È9^(_lYs/M6|F?_l<\<zZA7cbtfJ=gae1 ,g =꾦01;1fbMޏaݧc֩J<;SN9^"v͏e?*X%lnԟ{|ILd=s<DbnSoGyCw1x`OjZѮzv 6lXҦDE``_SlIҙHC0:hY:b".KF#Y<ޘ'?6N=R?ΧaQk|Ad#eŮoҢ,B$|H!l8!& VHfHDņXd&u| G3"o[?NNE17o9sm%mz}%n;.^a;vl=6eiaY:W?<㚡ЈHi3v3~aU3qNo+s!)2QO~<@NBPM=xw1f0T?s757dڕ ZӾad]e(PT; ]7c宻Z{R"onݺe\T" " " " " " " "A[oY~uNGApYgH-RnK~G6ֽ{wwemR۝s9~>$I91|7v)6|s/TF`u0* K/J?C9"ı5/ݗΌ۷MO"p|rߣ>u; ?Eq6mfG lpr~?"ܼ9^ &=B8}/p:CG,iDo7)W&\ܸnݺuN}!:tq?xNr!COD:Qmu"H}g)8g}M2027賤#4cv7v>};V9MOv/mM/um '";Y)S$a0+bV!\JsJcqpg$I)j|bl.\Y!}y=s%cym=ڿ{CZ:#bR YbOdڇoH*ٳg.BLx@z6D?;^{~}uf(!h<Ą!C#N[KCRD` .t\r_)AŻ#HD A'!<t׋ Ō|_#8 r[|ף<p҅ :ԟN5\^:b u }Z6HɲXؽp>b*V?3 P"8rèQΝ믿d@LKw'^L Էo_ Ϣ_ǒԭ0,{/./kg0"+<ΉZ}!:l֬ov-b{e=|˰Mr=l?㿡Ɯݣ2- !#|'1ںSNnlRڅWًwVBT2&x .(eT\Ӿλ] ۆ[\vKt}{6ksF u՛@o`ҤI{ 7tGqD~ɾqfSdz]Ϟ=SۍqpDHw\׮]] e0# ,4;9A8PN4/C-)v˄vөpl鶆U%=DQY5mԊ;&;]n :%KCU>o/0Y9YfcKΧozBĮo6%܋Yuz|zˮc.]Ԓa@u.׀""QV ۆr*tmR^wue=̞혇aIDcmcZc.X ׭.<g㝄2sY;YﻰZbC}8f Ɲ!s<Ӭqn(wLЇXzgQ_&,򨛍|m|Of#,s4+LڵOD@D@D@D@D@D@D`"~L #oLa+ B=3ehdձz%~, '?H%#֜L~gA©̒nɯUYCj œ*oΜ9>%u!ɹ[֥!iGĒ%K<DcB &E?saDtuAwBwMu#\Tz\ga:Iǽx^R!]!џ2R}}*瞤eV&"?? Qhxϖ-[IHz+Χr>\TxiF؎V_sRk1ijGWĘ+YHSH[! ("Ɩoe{νβK4K)ѷM)y_[k'umn[*_1h-WKݗ-ucgۺ=^a:oOgp&nɆ/Jݹ.-fŋ*;o:~m[.~{O^>=˧Klf7pѧ|lQ/pc7ue[_-7l틮@9\ce89Ԫ~20@f0Boiy *6sL\oYwYB+ %zyGD@D 7vBkԪrE@D@D@D@D@D@D@J#*QJfC`sVkʔ)^xկ~{$cǎYz{aV̕tBTe-zȶX>Uâ97__Gqӱ!" " " " " " " +ڷo3CM0Ob bsd8գG+\`i[bjsgEJ +5/Do>[N}IboMŧc-E@D@D@D@D@D@D@V[ݻwQORM:՝z~:6l;b^z7_>JH Q#e" " +@|P7'q񟞬5՘@?.r;<xp^BcƌqDT]wu[vU<E]2C˔/X79U9I&M-[v%˽(9Rwu|kteqQƐ)" " " " " " "  :t@1o<7mڴƏ,XPTҥu:ի_Ӹg MhɧR }#CBϰ]vŭZn5GD@D@D@D@D@D@D@D@D@D@D`!мyaW'ELfά;oV\`*Ue2D@D@D@D@D@D@D@D@D@D@D@D@I`[=|5xMJFD@D@D@D@D@D@D@D@D@D@D@Y l%?,ڵ:5NUV%?,:urJϗEvcǎ%?,;k8c&lRr%DL'#ЫW/w+c5D`w]v-¦D@D@D@D@D@D@D@D@D@D@D@9r˔/)FQvM*L(" " " " " " " " " " " yծ];7i$7c 7w\駟9CV4'+n;jI*N(DQ6 |U\BTEɨFr?`zkԨQWd…nn5tmڴqm۶m{{oƍ?-XcrW>G(ҥK4cj]ZUYĉ{Gn7/YWwA" " " " " " " " " @wZhQ5/tO=/|^.]xq#Eܴik…(ou6m6tӤwwAjEے%K_6LBԊn[%?xA F4VJ'8W}QIB') ]?| !~k֬YUDD:S5ˮ ߿*"U!Js@%} 뗿A^vm*~u yxD@D@D@D@D@D@D@D@Vy:&.3;ĺƍs+UN Z.Xu7 HTypd%)d"P|}뭵^2fy ISԤꫯ?D0s{Q mڴ)knΜ9ZQ4|A9ý͍6GNRqO?u׿|׋t}lӔ7ocNK1vm_}m՗c|Ef?&lRxfX,X1fH[m׮o+旋/<… DDi뮻Yr~Rn]wh^w}OX8·b ײezQ[9v>^t^z%ϳ<m5Fs?$}3N;" `̿}/͛{9܋;Ny뵯?9~<ڳI&nmd}x6Ɯ3wizcT-gVd?$3xz%DW`c6wog5΀gj<W6c^{Ϳgئϭuz[#Ŝ2" " " " " " " " ":9! ASNݭtA[nIm#<~ᩎYW_}u/pwݝyށ0a{.恚1c>}<e/*98I7bp1 !V6^n5m4>T6xkO>^K-k>#n)GB۷oLu SWNf9 pB3{Q}Ç1cرcx.kz@`~ DxC9$ޝ]{zIDATn"njE6ƍC1qtYgy-mv8s-Gqxmh"w紛;]=Rs=nԾ8ݏ~#_2Ӏ:u?~j[S?y=WLJcoTO}ݎ߾:uzir'Ovs߇X{sSO=տs/!4(s3NJFfօ[c=]@[wHxxnT+.m\53"xLD0BO?r/wmZ8ː!C*,NTF}pfϞ爪qĠ,{Țb *u"_ρ<k,/`L5פYu ),뮻.S,uL\xgP\Æ ˼\%}hN;-o}KD1̲h8rC" G/~ / e9'N| olwĄ.7i衇㬡 ;vLnطAn6mZ A;b.ho%<u9HBFThY}8,S: e" " " " " " " " " ({D":̈O #Gо}{n8͉1#-Z8D'?0n]tEv ￿:i۶#eСC;s|DE a¬k׮>Zqb8Ǐs_ݧ,q'(;wv7vBD`1\rXȉB}͈N9}ZD_>>JC~g<@A"]v[wW&~᤿}9R3ʳvGnsb-QVSsm [4`aѮ"DYVI޴Nx3菴UX+Gf,w}Bknܞ{URo;q%w]N"e'SfhF;at7vafy)w>OFJV.⮽ڤ=tS}ZC"h b/94[a,OSO[\H43N &;Cڌgw6yiPú*c",F S~:Z(Lf({4RWbN;LI@lfP8k\n$ IBAy:))3)9M=͘?ȌԁݻwMN8;uT?O@G <3" l}s ȶydLr񒹭LN*4xf@x.Y$eRNi 8(\z6!y쾜f8{} >+˳RO~f!̈_W]9˰NI #z;eFD "GKı.oK/Mڀg*B s`Gz? >ǸxuAСIt&8 bpB}ꐶDG#5qL[1£af,ng[+Vy/u\[m;ӓ>S ܏xΦO0&[R4CPoaK;GD@D@D@D@D@D@D@D@D@ , ?>mBU3Z3 8(h\A\Bpc? PЉp#8 peG?ܬx34'6l㈲0#ʢsLY&ir#sv:: 81",rv?c띆뮻 ) ;|d aHm"lJ$|fAڼVmڴLY5֫WgсfPO DY;1ډHTTwDIe"'bMbȤe׍ᵨ~j(;%L3hi]jgD']WMvm[27㊱[PO3w6K|>?>jH{s=p#HfqcMG;_c`N,IqcQH@FV6^kֺuk94!"p0#%"i! ٳ-D:B㗈tKqhC>L;BuǷ&-mO ?^Ko=у\Q-fUIޡҴ%vqr{k9l#42b[wu] F u>;&L R<-ɻi{(N˗&pvB̙3sTM9n۴y|,k;͸Gt&P'eu\D@D@D@D@D@D@D@D@D @M Qdr2DD EE'3R,"Yif=- }$9?S13t YbK/ɓ'g<i Nts#*I00KN(a%+#YNpIW ɖ&քrdLDB/lX2Qv.Q)fDGk[VrnHSIQJ\&i҄Rb-XZǸ^ ɓ1|JyR# )RCag/J".J_" " " " " " " " " jZ*6%[ڣg9yl1c jپbD/s*)C3):Dlr0ÀHz܋"E 8w^BBdQlԊv2ň'ηcn̅X~gO!>iXpˊVi0+bŌb 4Y_f<#1c;aZ>d(X}YXY-lg1FS1sD@D@D@D@D@D@D@D@D@*'PBTb 6 g>Kї7H!Tp 4(G"ڇ9k!Q &MrsOUn8tw& ٍV#GPpر"ƚ7oH_dwy裏ܜ9s|ЩﺡCY:i/vq>Q'1d.2^,7ӎW' i+f_9f1W&GdsnQyX/$ujڴ!e&4i M0b +}“v-xwTډ&LHSNɶVD@D@D@D@D@D@D@D@D@*#PB48'C)xd^3R7p B_++`9as-R^{mײeKsq?̼ Q>8p4iYDiӎ8/.p>y+?y"H -,#kƌ^;ӼU6D|CoJ+5֩>51b g}vZV}yٳ}}跤g2<W{ vڹz4֖7"4y&:L')q\ awt (|c?+#!ӌN>dRD@D@D@D@D@D@D@D@D ֨5V%vW_MRm/qO; ,:iBQE ^|H?q<3'Уn^O<q_oϝ;7uoț\s铜>KmX3ffMi}Ā~QgwbEƾ0ŽW'aFe{ѢEnԩ>W^^hi"#LW_^>lN$cx_D3e]/oz}V'{6lwc<HrFڼjId!㒱X)86VHY7n\9\(R|hY.rtPhrVD@D@D@D@D@D@D@D@D@"PBOxsTNlذa ";7H#4YC<t[ԃU..KF#Y<;'k0裏'xzhrS{=IXVoi9frNfIdm㇘sMG @cAhll*ڢE _;ÖTfs=m&KM>+x`r=sd}ݗntM؉NxEϱܠ +~B[</|nB@H[Y*"oҤ ;#Lnv%"uD"2cu'G%Ƴ<0K18"rl?x=3.߿J;7Þ%6D@D@D@D@D@D@D@D@D@*"PөxrR؝uY>g-tԻ##<Cٽ{wwemR۝s9~>$mpz5`vQGR"po~$B #`pr_zSOPz`Ats ba<w}/b) {G:xq裡7զML] !f~h//bι_}D8q0D/(ڈ2>" ̧Ľ Ra W97۠|n<!:!wq~gvrH"\!| YDo۶?cƖr+|I7e_6>IN;픤/D\%Jp}φwva%8U;v7}!-bnHS,0U>2҂Տ>ëV|}oўIx2'Œ:Dߙ3Y╕cI;N Ɔ}< 4DBM6-pԆ?gͼ,UhroW, qmdY!D 1aȐ!O<P搥b[LcJ3tPڡ"d! ^C$@gDhth,NU3il;\9{́܄GyzrC̽kK[g'p:"2g<"Y EP Y`0f'zH@Ȩs_O2K "ągBT(P-b>ɽ<L/$q?O>"Er,d\qD]x AY 1vm0bZx_{[:k6ό {^{%}%q/6)nh97[OdDZڻrӢy"L~-E@D@D@D@D@D@D@D@D@ Xpb zZA\p SYA"Luէn˄4á|sZڹ88S5G F{Y:3q8Ç,/!!(rhڴir{QnQ,<K|F;:y^"bKsl'-]/ vlcڼ<+QhFp>I{ЮYh;c!/80s=׋\/C+ 8<iN+pD$fنn˴k.HXOֽ -kCכ}D Qm͛:Z΋oew}w7bĈzJxڵW W_}6M 漫(gc5l022Xvl{|\" " " " " " " " " -dwODNz'V %Q+7t_'Z¡\88_̙Qge] -s^;1.,Yy;"%Q6{-?saDu#5jݛypS7Ҽ{Kx6;˩ոK}86^ ?kџLwD* gq)spzЗ[5ڞvDpMzba/y*# {O3@F u|o&mfa,m[ԏS)_F*[K2bFX<"" 6IHjE~+&2lEF5xnܼczyv;_K uW`do=?S("WyH&" @!90+S(KkY Ϩ:>J!C5ǢjxDChҥK%d" " " " " " " " " "P7Bu 0yd7j((}is㨊" " " " " " " " " "P@ QFdLD@js1G?nݺ~RjN"z`7w8tY*5*0"JXgucN:u1ٗm߭zYŴ_D@D@D@D@D@D@D@D@D@V:|yY!EK.u>Yŋ.SM+êB" " " " " " " " " " " "  SW_}̙Oylf;>w@! H*C*IENDB`
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./CHANGES.md
Changes by Version ================== Release Notes. Apollo 1.9.0 ------------------ * [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552) * [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553) * [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561) * [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563) * [slim docker images](https://github.com/ctripcorp/apollo/pull/3572) * [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574) * [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575) * [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585) * [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593) * [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594) * [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602) * [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609) * [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611) * [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617) * [update known users](https://github.com/ctripcorp/apollo/pull/3619) * [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620) * [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627) * [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628) * [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632) * [update known users](https://github.com/ctripcorp/apollo/pull/3633) * [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634) * [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646) * [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656) * [update known users](https://github.com/ctripcorp/apollo/pull/3657) * [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658) * [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660) * [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667) * [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668) * [fix unit test](https://github.com/ctripcorp/apollo/pull/3669) * [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677) * [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679) * [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670) * [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682) * [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692) * [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695) * [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699) * [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713) * [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720) * [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666) * [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757) * [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766) * [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789) * [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765) * [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754) * [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647) * [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786) * [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797) * [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803) * [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812) * [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808) * [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804) * [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822) * [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832) * [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816) * [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831) * [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819) * [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840) * [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849) * [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847) * [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856) * [fix show-text-modal number display](https://github.com/ctripcorp/apollo/pull/3851) * [Lazy load ConfigUtil](https://github.com/ctripcorp/apollo/pull/3864) * [make jdbc session enable default](https://github.com/ctripcorp/apollo/pull/3869) * [support json/yaml/xml format for public namespace](https://github.com/ctripcorp/apollo/pull/3836) * [Translate application into 应用 not 项目](https://github.com/ctripcorp/apollo/pull/3877) * [add spring configuration metadata for property names cache](https://github.com/ctripcorp/apollo/pull/3879) * [Fix Multiple PropertySourcesPlaceholderConfigurer beans registered issue](https://github.com/ctripcorp/apollo/pull/3865) * [use jdk 8 to publish apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3880) * [fix apollo config data loader with profiles](https://github.com/ctripcorp/apollo/pull/3870) * [polish log](https://github.com/ctripcorp/apollo/pull/3882) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
Changes by Version ================== Release Notes. Apollo 1.9.0 ------------------ * [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552) * [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553) * [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561) * [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563) * [slim docker images](https://github.com/ctripcorp/apollo/pull/3572) * [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574) * [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575) * [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585) * [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593) * [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594) * [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602) * [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609) * [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611) * [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617) * [update known users](https://github.com/ctripcorp/apollo/pull/3619) * [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620) * [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627) * [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628) * [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632) * [update known users](https://github.com/ctripcorp/apollo/pull/3633) * [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634) * [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646) * [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656) * [update known users](https://github.com/ctripcorp/apollo/pull/3657) * [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658) * [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660) * [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667) * [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668) * [fix unit test](https://github.com/ctripcorp/apollo/pull/3669) * [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677) * [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679) * [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670) * [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682) * [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692) * [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695) * [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699) * [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713) * [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720) * [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666) * [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757) * [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766) * [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789) * [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765) * [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754) * [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647) * [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786) * [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797) * [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803) * [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812) * [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808) * [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804) * [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822) * [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832) * [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816) * [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831) * [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819) * [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840) * [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849) * [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847) * [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856) * [fix show-text-modal number display](https://github.com/ctripcorp/apollo/pull/3851) * [Lazy load ConfigUtil](https://github.com/ctripcorp/apollo/pull/3864) * [make jdbc session enable default](https://github.com/ctripcorp/apollo/pull/3869) * [support json/yaml/xml format for public namespace](https://github.com/ctripcorp/apollo/pull/3836) * [Translate application into 应用 not 项目](https://github.com/ctripcorp/apollo/pull/3877) * [add spring configuration metadata for property names cache](https://github.com/ctripcorp/apollo/pull/3879) * [Fix Multiple PropertySourcesPlaceholderConfigurer beans registered issue](https://github.com/ctripcorp/apollo/pull/3865) * [use jdk 8 to publish apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3880) * [fix apollo config data loader with profiles](https://github.com/ctripcorp/apollo/pull/3870) * [polish log](https://github.com/ctripcorp/apollo/pull/3882) * [add history query](https://github.com/ctripcorp/apollo/pull/3878) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/CommitController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.entity.Commit; import com.ctrip.framework.apollo.biz.service.CommitService; import com.ctrip.framework.apollo.common.dto.CommitDTO; import com.ctrip.framework.apollo.common.utils.BeanUtils; import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController public class CommitController { private final CommitService commitService; public CommitController(final CommitService commitService) { this.commitService = commitService; } @GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit") public List<CommitDTO> find(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespaceName, Pageable pageable){ List<Commit> commits = commitService.find(appId, clusterName, namespaceName, pageable); return BeanUtils.batchTransform(CommitDTO.class, commits); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.entity.Commit; import com.ctrip.framework.apollo.biz.service.CommitService; import com.ctrip.framework.apollo.common.dto.CommitDTO; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.core.utils.StringUtils; import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController public class CommitController { private final CommitService commitService; public CommitController(final CommitService commitService) { this.commitService = commitService; } @GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit") public List<CommitDTO> find(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespaceName, @RequestParam(required = false) String key, Pageable pageable){ List<Commit> commits; if (StringUtils.isEmpty(key)) { commits = commitService.find(appId, clusterName, namespaceName, pageable); } else { commits = commitService.findByKey(appId, clusterName, namespaceName, key, pageable); } return BeanUtils.batchTransform(CommitDTO.class, commits); } }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/CommitRepository.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.repository; import com.ctrip.framework.apollo.biz.entity.Commit; import java.util.Date; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import java.util.List; public interface CommitRepository extends PagingAndSortingRepository<Commit, Long> { List<Commit> findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable pageable); List<Commit> findByAppIdAndClusterNameAndNamespaceNameAndDataChangeLastModifiedTimeGreaterThanEqualOrderByIdDesc( String appId, String clusterName, String namespaceName, Date dataChangeLastModifiedTime, Pageable pageable); @Modifying @Query("update Commit set isdeleted=1,DataChange_LastModifiedBy = ?4 where appId=?1 and clusterName=?2 and namespaceName = ?3") int batchDelete(String appId, String clusterName, String namespaceName, String operator); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.repository; import com.ctrip.framework.apollo.biz.entity.Commit; import java.util.Date; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import java.util.List; public interface CommitRepository extends PagingAndSortingRepository<Commit, Long> { List<Commit> findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable pageable); List<Commit> findByAppIdAndClusterNameAndNamespaceNameAndDataChangeLastModifiedTimeGreaterThanEqualOrderByIdDesc( String appId, String clusterName, String namespaceName, Date dataChangeLastModifiedTime, Pageable pageable); @Modifying @Query("update Commit set isdeleted=1,DataChange_LastModifiedBy = ?4 where appId=?1 and clusterName=?2 and namespaceName = ?3") int batchDelete(String appId, String clusterName, String namespaceName, String operator); List<Commit> findByAppIdAndClusterNameAndNamespaceNameAndChangeSetsLikeOrderByIdDesc(String appId, String clusterName, String namespaceName,String changeSets, Pageable page); }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/CommitService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.Commit; import com.ctrip.framework.apollo.biz.repository.CommitRepository; import java.util.Date; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service public class CommitService { private final CommitRepository commitRepository; public CommitService(final CommitRepository commitRepository) { this.commitRepository = commitRepository; } @Transactional public Commit save(Commit commit){ commit.setId(0);//protection return commitRepository.save(commit); } public List<Commit> find(String appId, String clusterName, String namespaceName, Pageable page){ return commitRepository.findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(appId, clusterName, namespaceName, page); } public List<Commit> find(String appId, String clusterName, String namespaceName, Date lastModifiedTime, Pageable page) { return commitRepository .findByAppIdAndClusterNameAndNamespaceNameAndDataChangeLastModifiedTimeGreaterThanEqualOrderByIdDesc( appId, clusterName, namespaceName, lastModifiedTime, page); } @Transactional public int batchDelete(String appId, String clusterName, String namespaceName, String operator){ return commitRepository.batchDelete(appId, clusterName, namespaceName, operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.Commit; import com.ctrip.framework.apollo.biz.repository.CommitRepository; import java.util.Date; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service public class CommitService { private final CommitRepository commitRepository; public CommitService(final CommitRepository commitRepository) { this.commitRepository = commitRepository; } @Transactional public Commit save(Commit commit){ commit.setId(0);//protection return commitRepository.save(commit); } public List<Commit> find(String appId, String clusterName, String namespaceName, Pageable page){ return commitRepository.findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(appId, clusterName, namespaceName, page); } public List<Commit> find(String appId, String clusterName, String namespaceName, Date lastModifiedTime, Pageable page) { return commitRepository .findByAppIdAndClusterNameAndNamespaceNameAndDataChangeLastModifiedTimeGreaterThanEqualOrderByIdDesc( appId, clusterName, namespaceName, lastModifiedTime, page); } public List<Commit> findByKey(String appId, String clusterName, String namespaceName, String key,Pageable page){ String queryKey = "\"key\":\""+ key +"\""; return commitRepository.findByAppIdAndClusterNameAndNamespaceNameAndChangeSetsLikeOrderByIdDesc(appId, clusterName, namespaceName, "%"+ queryKey + "%", page); } @Transactional public int batchDelete(String appId, String clusterName, String namespaceName, String operator){ return commitRepository.batchDelete(appId, clusterName, namespaceName, operator); } }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.api; import com.ctrip.framework.apollo.common.dto.*; import com.ctrip.framework.apollo.portal.environment.Env; import com.google.common.base.Joiner; import org.springframework.boot.actuate.health.Health; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import java.util.*; @Service public class AdminServiceAPI { @Service public static class HealthAPI extends API { public Health health(Env env) { return restTemplate.get(env, "/health", Health.class); } } @Service public static class AppAPI extends API { public AppDTO loadApp(Env env, String appId) { return restTemplate.get(env, "apps/{appId}", AppDTO.class, appId); } public AppDTO createApp(Env env, AppDTO app) { return restTemplate.post(env, "apps", app, AppDTO.class); } public void updateApp(Env env, AppDTO app) { restTemplate.put(env, "apps/{appId}", app, app.getAppId()); } public void deleteApp(Env env, String appId, String operator) { restTemplate.delete(env, "/apps/{appId}?operator={operator}", appId, operator); } } @Service public static class NamespaceAPI extends API { private ParameterizedTypeReference<Map<String, Boolean>> typeReference = new ParameterizedTypeReference<Map<String, Boolean>>() { }; public List<NamespaceDTO> findNamespaceByCluster(String appId, Env env, String clusterName) { NamespaceDTO[] namespaceDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces", NamespaceDTO[].class, appId, clusterName); return Arrays.asList(namespaceDTOs); } public NamespaceDTO loadNamespace(String appId, Env env, String clusterName, String namespaceName) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}", NamespaceDTO.class, appId, clusterName, namespaceName); } public NamespaceDTO findPublicNamespaceForAssociatedNamespace(Env env, String appId, String clusterName, String namespaceName) { return restTemplate .get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/associated-public-namespace", NamespaceDTO.class, appId, clusterName, namespaceName); } public NamespaceDTO createNamespace(Env env, NamespaceDTO namespace) { return restTemplate .post(env, "apps/{appId}/clusters/{clusterName}/namespaces", namespace, NamespaceDTO.class, namespace.getAppId(), namespace.getClusterName()); } public AppNamespaceDTO createAppNamespace(Env env, AppNamespaceDTO appNamespace) { return restTemplate .post(env, "apps/{appId}/appnamespaces", appNamespace, AppNamespaceDTO.class, appNamespace.getAppId()); } public AppNamespaceDTO createMissingAppNamespace(Env env, AppNamespaceDTO appNamespace) { return restTemplate .post(env, "apps/{appId}/appnamespaces?silentCreation=true", appNamespace, AppNamespaceDTO.class, appNamespace.getAppId()); } public List<AppNamespaceDTO> getAppNamespaces(String appId, Env env) { AppNamespaceDTO[] appNamespaceDTOs = restTemplate.get(env, "apps/{appId}/appnamespaces", AppNamespaceDTO[].class, appId); return Arrays.asList(appNamespaceDTOs); } public void deleteNamespace(Env env, String appId, String clusterName, String namespaceName, String operator) { restTemplate .delete(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}?operator={operator}", appId, clusterName, namespaceName, operator); } public Map<String, Boolean> getNamespacePublishInfo(Env env, String appId) { return restTemplate.get(env, "apps/{appId}/namespaces/publish_info", typeReference, appId).getBody(); } public List<NamespaceDTO> getPublicAppNamespaceAllNamespaces(Env env, String publicNamespaceName, int page, int size) { NamespaceDTO[] namespaceDTOs = restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/namespaces?page={page}&size={size}", NamespaceDTO[].class, publicNamespaceName, page, size); return Arrays.asList(namespaceDTOs); } public int countPublicAppNamespaceAssociatedNamespaces(Env env, String publicNamesapceName) { Integer count = restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/associated-namespaces/count", Integer.class, publicNamesapceName); return count == null ? 0 : count; } public void deleteAppNamespace(Env env, String appId, String namespaceName, String operator) { restTemplate.delete(env, "/apps/{appId}/appnamespaces/{namespaceName}?operator={operator}", appId, namespaceName, operator); } } @Service public static class ItemAPI extends API { public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) { ItemDTO[] itemDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items", ItemDTO[].class, appId, clusterName, namespaceName); return Arrays.asList(itemDTOs); } public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) { ItemDTO[] itemDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/deleted", ItemDTO[].class, appId, clusterName, namespaceName); return Arrays.asList(itemDTOs); } public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}", ItemDTO.class, appId, clusterName, namespaceName, key); } public ItemDTO loadItemById(Env env, long itemId) { return restTemplate.get(env, "items/{itemId}", ItemDTO.class, itemId); } public void updateItemsByChangeSet(String appId, Env env, String clusterName, String namespace, ItemChangeSets changeSets) { restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/itemset", changeSets, Void.class, appId, clusterName, namespace); } public void updateItem(String appId, Env env, String clusterName, String namespace, long itemId, ItemDTO item) { restTemplate.put(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{itemId}", item, appId, clusterName, namespace, itemId); } public ItemDTO createItem(String appId, Env env, String clusterName, String namespace, ItemDTO item) { return restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items", item, ItemDTO.class, appId, clusterName, namespace); } public void deleteItem(Env env, long itemId, String operator) { restTemplate.delete(env, "items/{itemId}?operator={operator}", itemId, operator); } } @Service public static class ClusterAPI extends API { public List<ClusterDTO> findClustersByApp(String appId, Env env) { ClusterDTO[] clusterDTOs = restTemplate.get(env, "apps/{appId}/clusters", ClusterDTO[].class, appId); return Arrays.asList(clusterDTOs); } public ClusterDTO loadCluster(String appId, Env env, String clusterName) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}", ClusterDTO.class, appId, clusterName); } public boolean isClusterUnique(String appId, Env env, String clusterName) { return restTemplate .get(env, "apps/{appId}/cluster/{clusterName}/unique", Boolean.class, appId, clusterName); } public ClusterDTO create(Env env, ClusterDTO cluster) { return restTemplate.post(env, "apps/{appId}/clusters", cluster, ClusterDTO.class, cluster.getAppId()); } public void delete(Env env, String appId, String clusterName, String operator) { restTemplate.delete(env, "apps/{appId}/clusters/{clusterName}?operator={operator}", appId, clusterName, operator); } } @Service public static class AccessKeyAPI extends API { public AccessKeyDTO create(Env env, AccessKeyDTO accessKey) { return restTemplate.post(env, "apps/{appId}/accesskeys", accessKey, AccessKeyDTO.class, accessKey.getAppId()); } public List<AccessKeyDTO> findByAppId(Env env, String appId) { AccessKeyDTO[] accessKeys = restTemplate.get(env, "apps/{appId}/accesskeys", AccessKeyDTO[].class, appId); return Arrays.asList(accessKeys); } public void delete(Env env, String appId, long id, String operator) { restTemplate.delete(env, "apps/{appId}/accesskeys/{id}?operator={operator}", appId, id, operator); } public void enable(Env env, String appId, long id, String operator) { restTemplate.put(env, "apps/{appId}/accesskeys/{id}/enable?operator={operator}", null, appId, id, operator); } public void disable(Env env, String appId, long id, String operator) { restTemplate.put(env, "apps/{appId}/accesskeys/{id}/disable?operator={operator}", null, appId, id, operator); } } @Service public static class ReleaseAPI extends API { private static final Joiner JOINER = Joiner.on(","); public ReleaseDTO loadRelease(Env env, long releaseId) { return restTemplate.get(env, "releases/{releaseId}", ReleaseDTO.class, releaseId); } public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) { if (CollectionUtils.isEmpty(releaseIds)) { return Collections.emptyList(); } ReleaseDTO[] releases = restTemplate.get(env, "/releases?releaseIds={releaseIds}", ReleaseDTO[].class, JOINER.join(releaseIds)); return Arrays.asList(releases); } public List<ReleaseDTO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page, int size) { ReleaseDTO[] releaseDTOs = restTemplate.get( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all?page={page}&size={size}", ReleaseDTO[].class, appId, clusterName, namespaceName, page, size); return Arrays.asList(releaseDTOs); } public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName, int page, int size) { ReleaseDTO[] releaseDTOs = restTemplate.get( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/active?page={page}&size={size}", ReleaseDTO[].class, appId, clusterName, namespaceName, page, size); return Arrays.asList(releaseDTOs); } public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName, String namespace) { ReleaseDTO releaseDTO = restTemplate .get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest", ReleaseDTO.class, appId, clusterName, namespace); return releaseDTO; } public ReleaseDTO createRelease(String appId, Env env, String clusterName, String namespace, String releaseName, String releaseComment, String operator, boolean isEmergencyPublish) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8")); MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>(); parameters.add("name", releaseName); parameters.add("comment", releaseComment); parameters.add("operator", operator); parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish)); HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(parameters, headers); ReleaseDTO response = restTemplate.post( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases", entity, ReleaseDTO.class, appId, clusterName, namespace); return response; } public ReleaseDTO createGrayDeletionRelease(String appId, Env env, String clusterName, String namespace, String releaseName, String releaseComment, String operator, boolean isEmergencyPublish, Set<String> grayDelKeys) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8")); MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>(); parameters.add("releaseName", releaseName); parameters.add("comment", releaseComment); parameters.add("operator", operator); parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish)); grayDelKeys.forEach(key -> parameters.add("grayDelKeys",key)); HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(parameters, headers); ReleaseDTO response = restTemplate.post( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/gray-del-releases", entity, ReleaseDTO.class, appId, clusterName, namespace); return response; } public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespace, String releaseName, String releaseComment, String branchName, boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) { return restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/updateAndPublish?" + "releaseName={releaseName}&releaseComment={releaseComment}&branchName={branchName}" + "&deleteBranch={deleteBranch}&isEmergencyPublish={isEmergencyPublish}", changeSets, ReleaseDTO.class, appId, clusterName, namespace, releaseName, releaseComment, branchName, deleteBranch, isEmergencyPublish); } public void rollback(Env env, long releaseId, String operator) { restTemplate.put(env, "releases/{releaseId}/rollback?operator={operator}", null, releaseId, operator); } public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) { restTemplate.put(env, "releases/{releaseId}/rollback?toReleaseId={toReleaseId}&operator={operator}", null, releaseId, toReleaseId, operator); } } @Service public static class CommitAPI extends API { public List<CommitDTO> find(String appId, Env env, String clusterName, String namespaceName, int page, int size) { CommitDTO[] commitDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit?page={page}&size={size}", CommitDTO[].class, appId, clusterName, namespaceName, page, size); return Arrays.asList(commitDTOs); } } @Service public static class NamespaceLockAPI extends API { public NamespaceLockDTO getNamespaceLockOwner(String appId, Env env, String clusterName, String namespaceName) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock", NamespaceLockDTO.class, appId, clusterName, namespaceName); } } @Service public static class InstanceAPI extends API { private Joiner joiner = Joiner.on(","); private ParameterizedTypeReference<PageDTO<InstanceDTO>> pageInstanceDtoType = new ParameterizedTypeReference<PageDTO<InstanceDTO>>() { }; public PageDTO<InstanceDTO> getByRelease(Env env, long releaseId, int page, int size) { ResponseEntity<PageDTO<InstanceDTO>> entity = restTemplate .get(env, "/instances/by-release?releaseId={releaseId}&page={page}&size={size}", pageInstanceDtoType, releaseId, page, size); return entity.getBody(); } public List<InstanceDTO> getByReleasesNotIn(String appId, Env env, String clusterName, String namespaceName, Set<Long> releaseIds) { InstanceDTO[] instanceDTOs = restTemplate.get(env, "/instances/by-namespace-and-releases-not-in?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}&releaseIds={releaseIds}", InstanceDTO[].class, appId, clusterName, namespaceName, joiner.join(releaseIds)); return Arrays.asList(instanceDTOs); } public PageDTO<InstanceDTO> getByNamespace(String appId, Env env, String clusterName, String namespaceName, String instanceAppId, int page, int size) { ResponseEntity<PageDTO<InstanceDTO>> entity = restTemplate.get(env, "/instances/by-namespace?appId={appId}" + "&clusterName={clusterName}&namespaceName={namespaceName}&instanceAppId={instanceAppId}" + "&page={page}&size={size}", pageInstanceDtoType, appId, clusterName, namespaceName, instanceAppId, page, size); return entity.getBody(); } public int getInstanceCountByNamespace(String appId, Env env, String clusterName, String namespaceName) { Integer count = restTemplate.get(env, "/instances/by-namespace/count?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}", Integer.class, appId, clusterName, namespaceName); if (count == null) { return 0; } return count; } } @Service public static class NamespaceBranchAPI extends API { public NamespaceDTO createBranch(String appId, Env env, String clusterName, String namespaceName, String operator) { return restTemplate .post(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches?operator={operator}", null, NamespaceDTO.class, appId, clusterName, namespaceName, operator); } public NamespaceDTO findBranch(String appId, Env env, String clusterName, String namespaceName) { return restTemplate.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches", NamespaceDTO.class, appId, clusterName, namespaceName); } public GrayReleaseRuleDTO findBranchGrayRules(String appId, Env env, String clusterName, String namespaceName, String branchName) { return restTemplate .get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules", GrayReleaseRuleDTO.class, appId, clusterName, namespaceName, branchName); } public void updateBranchGrayRules(String appId, Env env, String clusterName, String namespaceName, String branchName, GrayReleaseRuleDTO rules) { restTemplate .put(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules", rules, appId, clusterName, namespaceName, branchName); } public void deleteBranch(String appId, Env env, String clusterName, String namespaceName, String branchName, String operator) { restTemplate.delete(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}?operator={operator}", appId, clusterName, namespaceName, branchName, operator); } } @Service public static class ReleaseHistoryAPI extends API { private ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>> type = new ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>>() { }; public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(String appId, Env env, String clusterName, String namespaceName, int page, int size) { return restTemplate.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories?page={page}&size={size}", type, appId, clusterName, namespaceName, page, size).getBody(); } public PageDTO<ReleaseHistoryDTO> findByReleaseIdAndOperation(Env env, long releaseId, int operation, int page, int size) { return restTemplate.get(env, "/releases/histories/by_release_id_and_operation?releaseId={releaseId}&operation={operation}&page={page}&size={size}", type, releaseId, operation, page, size).getBody(); } public PageDTO<ReleaseHistoryDTO> findByPreviousReleaseIdAndOperation(Env env, long previousReleaseId, int operation, int page, int size) { return restTemplate.get(env, "/releases/histories/by_previous_release_id_and_operation?previousReleaseId={releaseId}&operation={operation}&page={page}&size={size}", type, previousReleaseId, operation, page, size).getBody(); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.api; import com.ctrip.framework.apollo.common.dto.*; import com.ctrip.framework.apollo.portal.environment.Env; import com.google.common.base.Joiner; import org.springframework.boot.actuate.health.Health; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import java.util.*; @Service public class AdminServiceAPI { @Service public static class HealthAPI extends API { public Health health(Env env) { return restTemplate.get(env, "/health", Health.class); } } @Service public static class AppAPI extends API { public AppDTO loadApp(Env env, String appId) { return restTemplate.get(env, "apps/{appId}", AppDTO.class, appId); } public AppDTO createApp(Env env, AppDTO app) { return restTemplate.post(env, "apps", app, AppDTO.class); } public void updateApp(Env env, AppDTO app) { restTemplate.put(env, "apps/{appId}", app, app.getAppId()); } public void deleteApp(Env env, String appId, String operator) { restTemplate.delete(env, "/apps/{appId}?operator={operator}", appId, operator); } } @Service public static class NamespaceAPI extends API { private ParameterizedTypeReference<Map<String, Boolean>> typeReference = new ParameterizedTypeReference<Map<String, Boolean>>() { }; public List<NamespaceDTO> findNamespaceByCluster(String appId, Env env, String clusterName) { NamespaceDTO[] namespaceDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces", NamespaceDTO[].class, appId, clusterName); return Arrays.asList(namespaceDTOs); } public NamespaceDTO loadNamespace(String appId, Env env, String clusterName, String namespaceName) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}", NamespaceDTO.class, appId, clusterName, namespaceName); } public NamespaceDTO findPublicNamespaceForAssociatedNamespace(Env env, String appId, String clusterName, String namespaceName) { return restTemplate .get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/associated-public-namespace", NamespaceDTO.class, appId, clusterName, namespaceName); } public NamespaceDTO createNamespace(Env env, NamespaceDTO namespace) { return restTemplate .post(env, "apps/{appId}/clusters/{clusterName}/namespaces", namespace, NamespaceDTO.class, namespace.getAppId(), namespace.getClusterName()); } public AppNamespaceDTO createAppNamespace(Env env, AppNamespaceDTO appNamespace) { return restTemplate .post(env, "apps/{appId}/appnamespaces", appNamespace, AppNamespaceDTO.class, appNamespace.getAppId()); } public AppNamespaceDTO createMissingAppNamespace(Env env, AppNamespaceDTO appNamespace) { return restTemplate .post(env, "apps/{appId}/appnamespaces?silentCreation=true", appNamespace, AppNamespaceDTO.class, appNamespace.getAppId()); } public List<AppNamespaceDTO> getAppNamespaces(String appId, Env env) { AppNamespaceDTO[] appNamespaceDTOs = restTemplate.get(env, "apps/{appId}/appnamespaces", AppNamespaceDTO[].class, appId); return Arrays.asList(appNamespaceDTOs); } public void deleteNamespace(Env env, String appId, String clusterName, String namespaceName, String operator) { restTemplate .delete(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}?operator={operator}", appId, clusterName, namespaceName, operator); } public Map<String, Boolean> getNamespacePublishInfo(Env env, String appId) { return restTemplate.get(env, "apps/{appId}/namespaces/publish_info", typeReference, appId).getBody(); } public List<NamespaceDTO> getPublicAppNamespaceAllNamespaces(Env env, String publicNamespaceName, int page, int size) { NamespaceDTO[] namespaceDTOs = restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/namespaces?page={page}&size={size}", NamespaceDTO[].class, publicNamespaceName, page, size); return Arrays.asList(namespaceDTOs); } public int countPublicAppNamespaceAssociatedNamespaces(Env env, String publicNamesapceName) { Integer count = restTemplate.get(env, "/appnamespaces/{publicNamespaceName}/associated-namespaces/count", Integer.class, publicNamesapceName); return count == null ? 0 : count; } public void deleteAppNamespace(Env env, String appId, String namespaceName, String operator) { restTemplate.delete(env, "/apps/{appId}/appnamespaces/{namespaceName}?operator={operator}", appId, namespaceName, operator); } } @Service public static class ItemAPI extends API { public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) { ItemDTO[] itemDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items", ItemDTO[].class, appId, clusterName, namespaceName); return Arrays.asList(itemDTOs); } public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) { ItemDTO[] itemDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/deleted", ItemDTO[].class, appId, clusterName, namespaceName); return Arrays.asList(itemDTOs); } public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}", ItemDTO.class, appId, clusterName, namespaceName, key); } public ItemDTO loadItemById(Env env, long itemId) { return restTemplate.get(env, "items/{itemId}", ItemDTO.class, itemId); } public void updateItemsByChangeSet(String appId, Env env, String clusterName, String namespace, ItemChangeSets changeSets) { restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/itemset", changeSets, Void.class, appId, clusterName, namespace); } public void updateItem(String appId, Env env, String clusterName, String namespace, long itemId, ItemDTO item) { restTemplate.put(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{itemId}", item, appId, clusterName, namespace, itemId); } public ItemDTO createItem(String appId, Env env, String clusterName, String namespace, ItemDTO item) { return restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items", item, ItemDTO.class, appId, clusterName, namespace); } public void deleteItem(Env env, long itemId, String operator) { restTemplate.delete(env, "items/{itemId}?operator={operator}", itemId, operator); } } @Service public static class ClusterAPI extends API { public List<ClusterDTO> findClustersByApp(String appId, Env env) { ClusterDTO[] clusterDTOs = restTemplate.get(env, "apps/{appId}/clusters", ClusterDTO[].class, appId); return Arrays.asList(clusterDTOs); } public ClusterDTO loadCluster(String appId, Env env, String clusterName) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}", ClusterDTO.class, appId, clusterName); } public boolean isClusterUnique(String appId, Env env, String clusterName) { return restTemplate .get(env, "apps/{appId}/cluster/{clusterName}/unique", Boolean.class, appId, clusterName); } public ClusterDTO create(Env env, ClusterDTO cluster) { return restTemplate.post(env, "apps/{appId}/clusters", cluster, ClusterDTO.class, cluster.getAppId()); } public void delete(Env env, String appId, String clusterName, String operator) { restTemplate.delete(env, "apps/{appId}/clusters/{clusterName}?operator={operator}", appId, clusterName, operator); } } @Service public static class AccessKeyAPI extends API { public AccessKeyDTO create(Env env, AccessKeyDTO accessKey) { return restTemplate.post(env, "apps/{appId}/accesskeys", accessKey, AccessKeyDTO.class, accessKey.getAppId()); } public List<AccessKeyDTO> findByAppId(Env env, String appId) { AccessKeyDTO[] accessKeys = restTemplate.get(env, "apps/{appId}/accesskeys", AccessKeyDTO[].class, appId); return Arrays.asList(accessKeys); } public void delete(Env env, String appId, long id, String operator) { restTemplate.delete(env, "apps/{appId}/accesskeys/{id}?operator={operator}", appId, id, operator); } public void enable(Env env, String appId, long id, String operator) { restTemplate.put(env, "apps/{appId}/accesskeys/{id}/enable?operator={operator}", null, appId, id, operator); } public void disable(Env env, String appId, long id, String operator) { restTemplate.put(env, "apps/{appId}/accesskeys/{id}/disable?operator={operator}", null, appId, id, operator); } } @Service public static class ReleaseAPI extends API { private static final Joiner JOINER = Joiner.on(","); public ReleaseDTO loadRelease(Env env, long releaseId) { return restTemplate.get(env, "releases/{releaseId}", ReleaseDTO.class, releaseId); } public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) { if (CollectionUtils.isEmpty(releaseIds)) { return Collections.emptyList(); } ReleaseDTO[] releases = restTemplate.get(env, "/releases?releaseIds={releaseIds}", ReleaseDTO[].class, JOINER.join(releaseIds)); return Arrays.asList(releases); } public List<ReleaseDTO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page, int size) { ReleaseDTO[] releaseDTOs = restTemplate.get( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all?page={page}&size={size}", ReleaseDTO[].class, appId, clusterName, namespaceName, page, size); return Arrays.asList(releaseDTOs); } public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName, int page, int size) { ReleaseDTO[] releaseDTOs = restTemplate.get( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/active?page={page}&size={size}", ReleaseDTO[].class, appId, clusterName, namespaceName, page, size); return Arrays.asList(releaseDTOs); } public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName, String namespace) { ReleaseDTO releaseDTO = restTemplate .get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest", ReleaseDTO.class, appId, clusterName, namespace); return releaseDTO; } public ReleaseDTO createRelease(String appId, Env env, String clusterName, String namespace, String releaseName, String releaseComment, String operator, boolean isEmergencyPublish) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8")); MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>(); parameters.add("name", releaseName); parameters.add("comment", releaseComment); parameters.add("operator", operator); parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish)); HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(parameters, headers); ReleaseDTO response = restTemplate.post( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases", entity, ReleaseDTO.class, appId, clusterName, namespace); return response; } public ReleaseDTO createGrayDeletionRelease(String appId, Env env, String clusterName, String namespace, String releaseName, String releaseComment, String operator, boolean isEmergencyPublish, Set<String> grayDelKeys) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8")); MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>(); parameters.add("releaseName", releaseName); parameters.add("comment", releaseComment); parameters.add("operator", operator); parameters.add("isEmergencyPublish", String.valueOf(isEmergencyPublish)); grayDelKeys.forEach(key -> parameters.add("grayDelKeys",key)); HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(parameters, headers); ReleaseDTO response = restTemplate.post( env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/gray-del-releases", entity, ReleaseDTO.class, appId, clusterName, namespace); return response; } public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespace, String releaseName, String releaseComment, String branchName, boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) { return restTemplate.post(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/updateAndPublish?" + "releaseName={releaseName}&releaseComment={releaseComment}&branchName={branchName}" + "&deleteBranch={deleteBranch}&isEmergencyPublish={isEmergencyPublish}", changeSets, ReleaseDTO.class, appId, clusterName, namespace, releaseName, releaseComment, branchName, deleteBranch, isEmergencyPublish); } public void rollback(Env env, long releaseId, String operator) { restTemplate.put(env, "releases/{releaseId}/rollback?operator={operator}", null, releaseId, operator); } public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) { restTemplate.put(env, "releases/{releaseId}/rollback?toReleaseId={toReleaseId}&operator={operator}", null, releaseId, toReleaseId, operator); } } @Service public static class CommitAPI extends API { public List<CommitDTO> find(String appId, Env env, String clusterName, String namespaceName, int page, int size) { CommitDTO[] commitDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit?page={page}&size={size}", CommitDTO[].class, appId, clusterName, namespaceName, page, size); return Arrays.asList(commitDTOs); } public List<CommitDTO> findByKey(String appId, Env env, String clusterName, String namespaceName, String key, int page, int size) { CommitDTO[] commitDTOs = restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/commit?key={key}&page={page}&size={size}", CommitDTO[].class, appId, clusterName, namespaceName, key, page, size); return Arrays.asList(commitDTOs); } } @Service public static class NamespaceLockAPI extends API { public NamespaceLockDTO getNamespaceLockOwner(String appId, Env env, String clusterName, String namespaceName) { return restTemplate.get(env, "apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock", NamespaceLockDTO.class, appId, clusterName, namespaceName); } } @Service public static class InstanceAPI extends API { private Joiner joiner = Joiner.on(","); private ParameterizedTypeReference<PageDTO<InstanceDTO>> pageInstanceDtoType = new ParameterizedTypeReference<PageDTO<InstanceDTO>>() { }; public PageDTO<InstanceDTO> getByRelease(Env env, long releaseId, int page, int size) { ResponseEntity<PageDTO<InstanceDTO>> entity = restTemplate .get(env, "/instances/by-release?releaseId={releaseId}&page={page}&size={size}", pageInstanceDtoType, releaseId, page, size); return entity.getBody(); } public List<InstanceDTO> getByReleasesNotIn(String appId, Env env, String clusterName, String namespaceName, Set<Long> releaseIds) { InstanceDTO[] instanceDTOs = restTemplate.get(env, "/instances/by-namespace-and-releases-not-in?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}&releaseIds={releaseIds}", InstanceDTO[].class, appId, clusterName, namespaceName, joiner.join(releaseIds)); return Arrays.asList(instanceDTOs); } public PageDTO<InstanceDTO> getByNamespace(String appId, Env env, String clusterName, String namespaceName, String instanceAppId, int page, int size) { ResponseEntity<PageDTO<InstanceDTO>> entity = restTemplate.get(env, "/instances/by-namespace?appId={appId}" + "&clusterName={clusterName}&namespaceName={namespaceName}&instanceAppId={instanceAppId}" + "&page={page}&size={size}", pageInstanceDtoType, appId, clusterName, namespaceName, instanceAppId, page, size); return entity.getBody(); } public int getInstanceCountByNamespace(String appId, Env env, String clusterName, String namespaceName) { Integer count = restTemplate.get(env, "/instances/by-namespace/count?appId={appId}&clusterName={clusterName}&namespaceName={namespaceName}", Integer.class, appId, clusterName, namespaceName); if (count == null) { return 0; } return count; } } @Service public static class NamespaceBranchAPI extends API { public NamespaceDTO createBranch(String appId, Env env, String clusterName, String namespaceName, String operator) { return restTemplate .post(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches?operator={operator}", null, NamespaceDTO.class, appId, clusterName, namespaceName, operator); } public NamespaceDTO findBranch(String appId, Env env, String clusterName, String namespaceName) { return restTemplate.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches", NamespaceDTO.class, appId, clusterName, namespaceName); } public GrayReleaseRuleDTO findBranchGrayRules(String appId, Env env, String clusterName, String namespaceName, String branchName) { return restTemplate .get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules", GrayReleaseRuleDTO.class, appId, clusterName, namespaceName, branchName); } public void updateBranchGrayRules(String appId, Env env, String clusterName, String namespaceName, String branchName, GrayReleaseRuleDTO rules) { restTemplate .put(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules", rules, appId, clusterName, namespaceName, branchName); } public void deleteBranch(String appId, Env env, String clusterName, String namespaceName, String branchName, String operator) { restTemplate.delete(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}?operator={operator}", appId, clusterName, namespaceName, branchName, operator); } } @Service public static class ReleaseHistoryAPI extends API { private ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>> type = new ParameterizedTypeReference<PageDTO<ReleaseHistoryDTO>>() { }; public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(String appId, Env env, String clusterName, String namespaceName, int page, int size) { return restTemplate.get(env, "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories?page={page}&size={size}", type, appId, clusterName, namespaceName, page, size).getBody(); } public PageDTO<ReleaseHistoryDTO> findByReleaseIdAndOperation(Env env, long releaseId, int operation, int page, int size) { return restTemplate.get(env, "/releases/histories/by_release_id_and_operation?releaseId={releaseId}&operation={operation}&page={page}&size={size}", type, releaseId, operation, page, size).getBody(); } public PageDTO<ReleaseHistoryDTO> findByPreviousReleaseIdAndOperation(Env env, long previousReleaseId, int operation, int page, int size) { return restTemplate.get(env, "/releases/histories/by_previous_release_id_and_operation?previousReleaseId={releaseId}&operation={operation}&page={page}&size={size}", type, previousReleaseId, operation, page, size).getBody(); } } }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/CommitController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.common.dto.CommitDTO; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.component.PermissionValidator; import com.ctrip.framework.apollo.portal.service.CommitService; import javax.validation.Valid; import javax.validation.constraints.Positive; import javax.validation.constraints.PositiveOrZero; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Collections; import java.util.List; @Validated @RestController public class CommitController { private final CommitService commitService; private final PermissionValidator permissionValidator; public CommitController(final CommitService commitService, final PermissionValidator permissionValidator) { this.commitService = commitService; this.permissionValidator = permissionValidator; } @GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits") public List<CommitDTO> find(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page, @Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "10") int size) { if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) { return Collections.emptyList(); } return commitService.find(appId, Env.valueOf(env), clusterName, namespaceName, page, size); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.common.dto.CommitDTO; import com.ctrip.framework.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.component.PermissionValidator; import com.ctrip.framework.apollo.portal.service.CommitService; import javax.validation.Valid; import javax.validation.constraints.Positive; import javax.validation.constraints.PositiveOrZero; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Collections; import java.util.List; @Validated @RestController public class CommitController { private final CommitService commitService; private final PermissionValidator permissionValidator; public CommitController(final CommitService commitService, final PermissionValidator permissionValidator) { this.commitService = commitService; this.permissionValidator = permissionValidator; } @GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits") public List<CommitDTO> find(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @RequestParam(required = false) String key, @Valid @PositiveOrZero(message = "page should be positive or 0") @RequestParam(defaultValue = "0") int page, @Valid @Positive(message = "size should be positive number") @RequestParam(defaultValue = "10") int size) { if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) { return Collections.emptyList(); } if (StringUtils.isEmpty(key)) { return commitService.find(appId, Env.valueOf(env), clusterName, namespaceName, page, size); } else { return commitService.findByKey(appId, Env.valueOf(env), clusterName, namespaceName, key, page, size); } } }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/CommitService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.dto.CommitDTO; import com.ctrip.framework.apollo.portal.enricher.adapter.BaseDtoUserInfoEnrichedAdapter; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; import org.springframework.stereotype.Service; import java.util.List; @Service public class CommitService { private final AdminServiceAPI.CommitAPI commitAPI; private final AdditionalUserInfoEnrichService additionalUserInfoEnrichService; public CommitService(final AdminServiceAPI.CommitAPI commitAPI, AdditionalUserInfoEnrichService additionalUserInfoEnrichService) { this.commitAPI = commitAPI; this.additionalUserInfoEnrichService = additionalUserInfoEnrichService; } public List<CommitDTO> find(String appId, Env env, String clusterName, String namespaceName, int page, int size) { List<CommitDTO> dtoList = commitAPI.find(appId, env, clusterName, namespaceName, page, size); this.additionalUserInfoEnrichService.enrichAdditionalUserInfo(dtoList, BaseDtoUserInfoEnrichedAdapter::new); return dtoList; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.dto.CommitDTO; import com.ctrip.framework.apollo.portal.enricher.adapter.BaseDtoUserInfoEnrichedAdapter; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; import org.springframework.stereotype.Service; import java.util.List; @Service public class CommitService { private final AdminServiceAPI.CommitAPI commitAPI; private final AdditionalUserInfoEnrichService additionalUserInfoEnrichService; public CommitService(final AdminServiceAPI.CommitAPI commitAPI, AdditionalUserInfoEnrichService additionalUserInfoEnrichService) { this.commitAPI = commitAPI; this.additionalUserInfoEnrichService = additionalUserInfoEnrichService; } public List<CommitDTO> find(String appId, Env env, String clusterName, String namespaceName, int page, int size) { List<CommitDTO> dtoList = commitAPI.find(appId, env, clusterName, namespaceName, page, size); this.additionalUserInfoEnrichService.enrichAdditionalUserInfo(dtoList, BaseDtoUserInfoEnrichedAdapter::new); return dtoList; } public List<CommitDTO> findByKey(String appId, Env env, String clusterName, String namespaceName, String key, int page, int size) { List<CommitDTO> dtoList = commitAPI.findByKey(appId, env, clusterName, namespaceName, key, page, size); this.additionalUserInfoEnrichService.enrichAdditionalUserInfo(dtoList, BaseDtoUserInfoEnrichedAdapter::new); return dtoList; } }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/i18n/en.json
{ "Common.Title": "Apollo Configuration Center", "Common.Ctrip": "Ctrip", "Common.CtripDepartment": "Framework R&D Department", "Common.Nav.ShowNavBar": "Display navigation bar", "Common.Nav.HideNavBar": "Hide navigation bar", "Common.Nav.Help": "Help", "Common.Nav.AdminTools": "Admin Tools", "Common.Nav.NonAdminTools": "Tools", "Common.Nav.UserManage": "User Management", "Common.Nav.SystemRoleManage": "System Permission Management", "Common.Nav.OpenMange": "Open Platform Authorization Management", "Common.Nav.SystemConfig": "System Configuration", "Common.Nav.DeleteApp-Cluster-Namespace": "Delete Apps, Clusters, AppNamespace", "Common.Nav.SystemInfo": "System Information", "Common.Nav.ConfigExport": "Config Export", "Common.Nav.Logout": "Logout", "Common.Department": "Department", "Common.Cluster": "Cluster", "Common.Environment": "Environment", "Common.Email": "Email", "Common.AppId": "App Id", "Common.Namespace": "Namespace", "Common.AppName": "App Name", "Common.AppOwner": "App Owner", "Common.AppOwnerLong": "App Owner", "Common.AppAdmin": "App Administrators", "Common.ClusterName": "Cluster Name", "Common.Submit": "Submit", "Common.Save": "Save", "Common.Created": "Create Successfully", "Common.CreateFailed": "Fail to Create", "Common.Deleted": "Delete Successfully", "Common.DeleteFailed": "Fail to Delete", "Common.ReturnToIndex": "Return to project page", "Common.Cancel": "Cancel", "Common.Ok": "OK", "Common.Search": "Query", "Common.IsRootUser": "Current page is only accessible to Apollo administrator.", "Common.PleaseChooseDepartment": "Please select department", "Common.PleaseChooseOwner": "Please select app owner", "Common.LoginExpiredTips": "Your login is expired. Please refresh the page and try again.", "Component.DeleteNamespace.Title": "Delete Namespace", "Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?", "Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?", "Component.GrayscalePublishRule.Title": "Edit Grayscale Rule", "Component.GrayscalePublishRule.AppId": "Grayscale AppId", "Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule", "Component.GrayscalePublishRule.AcceptPartInstance": "Apply to some instances", "Component.GrayscalePublishRule.AcceptAllInstance": "Apply to all instances", "Component.GrayscalePublishRule.IP": "Grayscale IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(The list of instances are filtered by the typed AppId automatically)", "Component.GrayscalePublishRule.IpTips": "Can't find the IP you want? You may ", "Component.GrayscalePublishRule.EnterIp": "enter IP manually", "Component.GrayscalePublishRule.EnterIpTips": "Enter the list of IP, using ',' as the separator, and then click the Add button.", "Component.GrayscalePublishRule.Add": "Add", "Component.ConfigItem.Title": "Add Configuration", "Component.ConfigItem.TitleTips": "(Reminder: Configuration can be added in batch via text mode)", "Component.ConfigItem.AddGrayscaleItem": "Add Grayscale Configuration", "Component.ConfigItem.ModifyItem": "Modify Configuration", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "Note: Hidden characters (Spaces, Newline, Tab) easily cause configuration errors. If you want to check hidden characters in Value, please click", "Component.ConfigItem.ItemValueShowDetection": "Check Hidden Characters", "Component.ConfigItem.ItemValueNotHiddenChars": "No Hidden Characters", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "Select Cluster", "Component.MergePublish.Title": "Full Release", "Component.MergePublish.Tips": "Full release will merge the configurations of grayscale version into the main version and release them.", "Component.MergePublish.NextStep": "After full release, choose which behavior you want", "Component.MergePublish.DeleteGrayscale": "Delete grayscale version", "Component.MergePublish.ReservedGrayscale": "Keep grayscale version", "Component.Namespace.Branch.IsChanged": "Modified", "Component.Namespace.Branch.ChangeUser": "Current Modifier", "Component.Namespace.Branch.ContinueGrayscalePublish": "Continue to Grayscale Release", "Component.Namespace.Branch.GrayscalePublish": "Grayscale Release", "Component.Namespace.Branch.MergeToMasterAndPublish": "Merge to the main version and release the main version's configurations ", "Component.Namespace.Branch.AllPublish": "Full Release", "Component.Namespace.Branch.DiscardGrayscaleVersion": "Abandon Grayscale Version", "Component.Namespace.Branch.DiscardGrayscale": "Abandon Grayscale", "Component.Namespace.Branch.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Branch.Tab.Configuration": "Configuration", "Component.Namespace.Branch.Tab.GrayscaleRule": "Grayscale Rule", "Component.Namespace.Branch.Tab.GrayscaleInstance": "Grayscale Instance List", "Component.Namespace.Branch.Tab.ChangeHistory": "Change History", "Component.Namespace.Branch.Body.Item": "Grayscale Configuration", "Component.Namespace.Branch.Body.AddedItem": "Add Grayscale Configuration", "Component.Namespace.Branch.Body.PublishState": "Release Status", "Component.Namespace.Branch.Body.ItemSort": "Sort", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "Value of Main Version", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "Grayscale value", "Component.Namespace.Branch.Body.ItemComment": "Comment", "Component.Namespace.Branch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Branch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Branch.Body.ItemOperator": "Operation", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "Click to view released values", "Component.Namespace.Branch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.Branch.Body.ItemPublished": "Released", "Component.Namespace.Branch.Body.ItemEffective": "Effective configuration", "Component.Namespace.Branch.Body.ClickToSee": "Click to view", "Component.Namespace.Branch.Body.DeletedItem": "Deleted configuration", "Component.Namespace.Branch.Body.Delete": "Deleted", "Component.Namespace.Branch.Body.ChangedFromMaster": "Configuration modified from the main version", "Component.Namespace.Branch.Body.ModifiedItem": "Modified configuration", "Component.Namespace.Branch.Body.Modify": "Modified", "Component.Namespace.Branch.Body.AddedByGrayscale": "Specific configuration for grayscale version", "Component.Namespace.Branch.Body.Added": "New", "Component.Namespace.Branch.Body.Op.Modify": "Modify", "Component.Namespace.Branch.Body.Op.Delete": "Delete", "Component.Namespace.MasterBranch.Body.Title": "Configuration of the main version", "Component.Namespace.MasterBranch.Body.PublishState": "Release Status", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "Comment", "Component.Namespace.MasterBranch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.MasterBranch.Body.ItemOperator": "Operation", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "Click to check released values", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.MasterBranch.Body.ItemEffective": "Effective configuration", "Component.Namespace.MasterBranch.Body.ItemPublished": "Released", "Component.Namespace.MasterBranch.Body.AddedItem": "New configuration", "Component.Namespace.MasterBranch.Body.ModifyItem": "Modify the grayscale configuration", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "You do not have the permission to edit grayscale rule. Only those who have the permission to edit or release the namespace can edit grayscale rule. If you need to edit grayscale rule, please contact the project administrator to apply for the permission.", "Component.Namespace.Branch.GrayScaleRule.AppId": "Grayscale AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "Grayscale IP List", "Component.Namespace.Branch.GrayScaleRule.Operator": "Operation", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "Modify", "Component.Namespace.Branch.GrayScaleRule.Delete": "Delete", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "Create Rule", "Component.Namespace.Branch.Instance.RefreshList": "Refresh List", "Component.Namespace.Branch.Instance.ItemToSee": "View configuration", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "Configuration Fetched Time", "Component.Namespace.Branch.Instance.LoadMore": "Refresh list", "Component.Namespace.Branch.Instance.NoInstance": "No instance information", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "Add", "Component.Namespace.Branch.History.Modified": "Update", "Component.Namespace.Branch.History.Deleted": "Delete", "Component.Namespace.Branch.History.LoadMore": "Load more", "Component.Namespace.Branch.History.NoHistory": "No Change History", "Component.Namespace.Header.Title.Private": "Private", "Component.Namespace.Header.Title.PrivateTips": "The configuration of private namespace ({{namespace.baseInfo.namespaceName}}) can be only fetched by clients whose AppId is {{appId}}", "Component.Namespace.Header.Title.Public": "Public", "Component.Namespace.Header.Title.PublicTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) can be fetched by any client.", "Component.Namespace.Header.Title.Extend": "Association", "Component.Namespace.Header.Title.ExtendTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) will override the configuration of the public namespace, and the combined configuration can only be fetched by clients whose AppId is {{appId}}.", "Component.Namespace.Header.Title.ExpandAndCollapse": "[Expand/Collapse]", "Component.Namespace.Header.Title.Master": "Main Version", "Component.Namespace.Header.Title.Grayscale": "Grayscale Version", "Component.Namespace.Master.LoadNamespace": "Load Namespace", "Component.Namespace.Master.LoadNamespaceTips": "Load Namespace", "Component.Namespace.Master.Items.Changed": "Modified", "Component.Namespace.Master.Items.ChangedUser": "Current modifier", "Component.Namespace.Master.Items.Publish": "Release", "Component.Namespace.Master.Items.PublishTips": "Release configuration", "Component.Namespace.Master.Items.Rollback": "Rollback", "Component.Namespace.Master.Items.RollbackTips": "Rollback released configuration", "Component.Namespace.Master.Items.PublishHistory": "Release History", "Component.Namespace.Master.Items.PublishHistoryTips": "View the release history", "Component.Namespace.Master.Items.Grant": "Authorize", "Component.Namespace.Master.Items.GrantTips": "Manage the configuration edit and release permission", "Component.Namespace.Master.Items.Grayscale": "Grayscale", "Component.Namespace.Master.Items.GrayscaleTips": "Create a test version", "Component.Namespace.Master.Items.RequestPermission": "Apply for configuration permission", "Component.Namespace.Master.Items.RequestPermissionTips": "You do not have any configuration permission. Please apply.", "Component.Namespace.Master.Items.DeleteNamespace": "Delete Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Master.Items.ItemList": "Table", "Component.Namespace.Master.Items.ItemListByText": "Text", "Component.Namespace.Master.Items.ItemHistory": "Change History", "Component.Namespace.Master.Items.ItemInstance": "Instance List", "Component.Namespace.Master.Items.CopyText": "Copy", "Component.Namespace.Master.Items.GrammarCheck": "Syntax Check", "Component.Namespace.Master.Items.CancelChanged": "Cancel", "Component.Namespace.Master.Items.Change": "Modify", "Component.Namespace.Master.Items.SummitChanged": "Submit", "Component.Namespace.Master.Items.SortByKey": "Filter the configurations by key", "Component.Namespace.Master.Items.FilterItem": "Filter", "Component.Namespace.Master.Items.RevokeItemTips": "Revoke configuration changes", "Component.Namespace.Master.Items.RevokeItem" :"Revoke", "Component.Namespace.Master.Items.SyncItemTips": "Synchronize configurations among environments", "Component.Namespace.Master.Items.SyncItem": "Synchronize", "Component.Namespace.Master.Items.DiffItemTips": "Compare the configurations among environments", "Component.Namespace.Master.Items.DiffItem": "Compare", "Component.Namespace.Master.Items.AddItem": "Add Configuration", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: This namespace has never been released. Apollo client will not be able to fetch the configuration and will record 404 log information. Please release it in time.", "Component.Namespace.Master.Items.Body.FilterByKey": "Input key to filter", "Component.Namespace.Master.Items.Body.PublishState": "Release Status", "Component.Namespace.Master.Items.Body.Sort": "Sort", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Master.Items.Body.ItemOperator": "Operation", "Component.Namespace.Master.Items.Body.NoPublish": "Unreleased", "Component.Namespace.Master.Items.Body.NoPublishTitle": "Click to view released values", "Component.Namespace.Master.Items.Body.NoPublishTips": "New configuration, no released value", "Component.Namespace.Master.Items.Body.Published": "Released", "Component.Namespace.Master.Items.Body.PublishedTitle": "Effective configuration", "Component.Namespace.Master.Items.Body.ClickToSee": "Click to view", "Component.Namespace.Master.Items.Body.Grayscale": "Gray", "Component.Namespace.Master.Items.Body.HaveGrayscale": "This configuration has grayscale configuration. Click to view the value of grayscale.", "Component.Namespace.Master.Items.Body.NewAdded": "New", "Component.Namespace.Master.Items.Body.NewAddedTips": "New Configuration", "Component.Namespace.Master.Items.Body.Modified": "Modified", "Component.Namespace.Master.Items.Body.ModifiedTips": "Modified Configuration", "Component.Namespace.Master.Items.Body.Deleted": "Deleted", "Component.Namespace.Master.Items.Body.DeletedTips": "Deleted Configuration", "Component.Namespace.Master.Items.Body.ModifyTips": "Modify", "Component.Namespace.Master.Items.Body.DeleteTips": "Delete", "Component.Namespace.Master.Items.Body.Link.Title": "Overridden Configuration", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "No Overridden Configuration", "Component.Namespace.Master.Items.Body.Public.Title": "Public Configuration", "Component.Namespace.Master.Items.Body.Public.Published": "Released Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublish": "Unreleased Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "Owner of the current public namespace", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "hasn't associated this namespace, please contact the owner of {{namespace.parentAppId}} to associate this namespace in the {{namespace.parentAppId}} project.", "Component.Namespace.Master.Items.Body.Public.NoPublished": "No Released Configuration", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "Override this configuration", "Component.Namespace.Master.Items.Body.NoPublished.Title": "No public configuration", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "Released Value", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "Unreleased Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "Add", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "Update", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "Delete", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "No Change History", "Component.Namespace.Master.Items.Body.Instance.Tips": "Tips: Only show instances who have fetched configurations in the last 24 hrs ", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "Instances using the latest configuration", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "Instances using outdated configuration", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "All Instances", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "Refresh List", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "View Configuration", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "Configuration fetched time", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "No Instance Information", "Component.PublishDeny.Title": "Release Restriction", "Component.PublishDeny.Tips1": "You can't release! The operators to edit and release the configurations in {{env}} environment must be different, please find someone else who has the release permission of this namespace to do the release operation.", "Component.PublishDeny.Tips2": "(If it is non working time or a special situation, you may release by clicking the 'Emergency Release' button.)", "Component.PublishDeny.EmergencyPublish": "Emergency Release", "Component.PublishDeny.Close": "Close", "Component.Publish.Title": "Release", "Component.Publish.Tips": "(Only the released configurations can be fetched by clients, and this release will only be applied to the current environment: {{env}})", "Component.Publish.Grayscale": "Grayscale Release", "Component.Publish.GrayscaleTips": "(The grayscale configurations are only applied to the instances specified in grayscale rules)", "Component.Publish.AllPublish": "Full Release", "Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)", "Component.Publish.ToSeeChange": "View changes", "Component.Publish.PublishedValue": "Released values", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "Unreleased values", "Component.Publish.ModifyUser": "Modifier", "Component.Publish.ModifyTime": "Modified Time", "Component.Publish.NewAdded": "New", "Component.Publish.NewAddedTips": "New Configuration", "Component.Publish.Modified": "Modified", "Component.Publish.ModifiedTips": "Modified Configuration", "Component.Publish.Deleted": "Deleted", "Component.Publish.DeletedTips": "Deleted Configuration", "Component.Publish.MasterValue": "Main version value", "Component.Publish.GrayValue": "Grayscale version value", "Component.Publish.GrayPublishedValue": "Released grayscale version value", "Component.Publish.GrayNoPublishedValue": "Unreleased grayscale version value", "Component.Publish.ItemNoChange": "No configuration changes", "Component.Publish.GrayItemNoChange": "No configuration changes", "Component.Publish.NoGrayItems": "No grayscale changes", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "Release", "Component.Rollback.To": "roll back to", "Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page", "Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations", "Component.Rollback.ClickToView": "Click to view", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "Before Rollback", "Component.Rollback.RollbackAfterValue": "After Rollback", "Component.Rollback.Added": "Add", "Component.Rollback.Modified": "Update", "Component.Rollback.Deleted": "Delete", "Component.Rollback.NoChange": "No configuration changes", "Component.Rollback.OpRollback": "Rollback", "Component.ShowText.Title": "View", "Login.Login": "Login", "Login.UserNameOrPasswordIncorrect": "Incorrect username or password", "Login.LogoutSuccessfully": "Logout Successfully", "Index.MyProject": "My projects", "Index.CreateProject": "Create project", "Index.LoadMore": "Load more", "Index.FavoriteItems": "Favorite projects", "Index.Topping": "Top", "Index.FavoriteTip": "You haven't favorited any items yet. You can favorite items on the project homepage.", "Index.RecentlyViewedItems": "Recent projects", "Index.GetCreateAppRoleFailed": "Failed to get the information of create project permission", "Index.Topped": "Top Successfully", "Index.CancelledFavorite": "Remove favorite successfully", "Cluster.CreateCluster": "Create Cluster", "Cluster.Tips.1": "By adding clusters, the same program can use different configuration in different clusters (such as different data centers)", "Cluster.Tips.2": "If the different clusters use the same configuration, there is no need to create clusters", "Cluster.Tips.3": "By default, Apollo reads IDC attributes in /opt/settings/server.properties(Linux) or C:\\opt\\settings\\server.properties(Windows) files on the machine as cluster names, such as SHAJQ (Jinqiao Data Center), SHAOY (Ouyang Data Center)", "Cluster.Tips.4": "The cluster name created here should be consistent with the IDC attribute in server.properties on the machine", "Cluster.CreateNameTips": "(Cluster names such as SHAJQ, SHAOY or customized clusters such as SHAJQ-xx, SHAJQ-yy)", "Cluster.ChooseEnvironment": "Environment", "Cluster.LoadingEnvironmentError": "Error in loading environment information", "Cluster.ClusterCreated": "Create cluster successfully", "Cluster.ClusterCreateFailed": "Failed to create cluster", "Cluster.PleaseChooseEnvironment": "Please select the environment", "Config.Title": "Apollo Configuration Center", "Config.AppIdNotFound": "doesn't exist, ", "Config.ClickByCreate": "click to create", "Config.EnvList": "Environments", "Config.EnvListTips": "Manage the configuration of different environments and clusters by switching environments and clusters", "Config.ProjectInfo": "Project Info", "Config.ModifyBasicProjectInfo": "Modify project's basic information", "Config.Favorite": "Favorite", "Config.CancelFavorite": "Cancel Favorite", "Config.MissEnv": "Missing environment", "Config.MissNamespace": "Missing Namespace", "Config.ProjectManage": "Manage Project", "Config.AccessKeyManage": "Manage AccessKey", "Config.CreateAppMissEnv": "Recover Environments", "Config.CreateAppMissNamespace": "Recover Namespaces", "Config.AddCluster": "Add Cluster", "Config.AddNamespace": "Add Namespace", "Config.CurrentlyOperatorEnv": "Current environment", "Config.DoNotRemindAgain": "No longer prompt", "Config.Note": "Note", "Config.ClusterIsDefaultTipContent": "All instances that do not belong to the '{{name}}' cluster will fetch the default cluster (current page) configuration, and those that belong to the '{{name}}' cluster will use the corresponding cluster configuration!", "Config.ClusterIsCustomTipContent": "Instances belonging to the '{{name}}' cluster will only fetch the configuration of the '{{name}}' cluster (the current page), and the default cluster configuration will only be fetched when the corresponding namespace has not been released in the current cluster.", "Config.HasNotPublishNamespace": "The following environment/cluster has unreleased configurations, the client will not fetch the unreleased configurations, please release them in time.", "Config.RevokeItem.DialogTitle": "Revoke configuration changes", "Config.RevokeItem.DialogContent": "Modified but unpublished configurations in the current namespace will be revoked. Are you sure to revoke the configuration changes?", "Config.DeleteItem.DialogTitle": "Delete configuration", "Config.DeleteItem.DialogContent": "You are deleting the configuration whose Key is <b>'{{config.key}}'</b> Value is <b>'{{config.value}}'</b>. <br> Are you sure to delete the configuration?", "Config.PublishNoPermission.DialogTitle": "Release", "Config.PublishNoPermission.DialogContent": "You do not have release permission. Please ask the project administrators '{{masterUsers}}' to authorize release permission.", "Config.ModifyNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.ModifyNoPermission.DialogContent": "Please ask the project administrators '{{masterUsers}}' to authorize release or edit permission.", "Config.MasterNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.MasterNoPermission.DialogContent": "You are not this project's administrator. Only project administrators have the permission to add clusters and namespaces. Please ask the project administrators '{{masterUsers}}' to assign administrator permission", "Config.NamespaceLocked.DialogTitle": "Edit not allowed", "Config.NamespaceLocked.DialogContent": "Current namespace is being edited by '{{lockOwner}}', and a release phase can only be edited by one person.", "Config.RollbackAlert.DialogTitle": "Rollback", "Config.RollbackAlert.DialogContent": "Are you sure to roll back?", "Config.EmergencyPublishAlert.DialogTitle": "Emergency release", "Config.EmergencyPublishAlert.DialogContent": "Are you sure to perform the emergency release?", "Config.DeleteBranch.DialogTitle": "Delete grayscale", "Config.DeleteBranch.DialogContent": "Deleting grayscale will lose the grayscale configurations. Are you sure to delete it?", "Config.UpdateRuleTips.DialogTitle": "Update gray rule prompt", "Config.UpdateRuleTips.DialogContent": "Grayscale rules are in effect. However there are unreleased configurations in grayscale version, they won't be effective until a manual grayscale release is performed.", "Config.MergeAndReleaseDeny.DialogTitle": "Full release", "Config.MergeAndReleaseDeny.DialogContent": "The main version has unreleased configuration. Please release the main version first.", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "Missing gray rule prompt", "Config.GrayReleaseWithoutRulesTips.DialogContent": "The grayscale version has not configured any grayscale rule. Please configure the grayscale rules.", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "Delete namespace warning", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> instances using namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'), and deleting namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Instance List\"</ins> to confirm the instance information. If you confirm that the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "Delete namespace warning information", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> instances using the grayscale version of namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}') configuration, and deleting Namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Grayscale Version\"=> \"Instance List\"</ins> to confirm the instance information. If you confirm the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "Please enter appId", "Config.SyntaxCheckFailed.DialogTitle": "Syntax Check Error", "Config.SyntaxCheckFailed.DialogContent": "Delete Namespace Failure Tip", "Config.CreateBranchTips.DialogTitle": "Create Grayscale Notice", "Config.CreateBranchTips.DialogContent": "By creating grayscale version, you can do grayscale test for some configurations. <br> Grayscale process is as follows: <br> &nbsp; &nbsp; 1. Create grayscale version <br> &nbsp; &nbsp; 2. Configure grayscale configuration items <br> &nbsp; &nbsp; 3. Configure grayscale rules. If it is a private namespace, it can be grayed according to the IP of client. If it is a public namespace, it can be grayed according to both appId and the IP. <br> &nbsp; &nbsp; 4. Grayscale release <br> Grayscale version has two final results: <b> Full release and Abandon grayscale</b> <br> <b>Full release</b>: grayscale configurations are merged with the main version and released, all clients will use the merged configurations <br> <b> Abandon grayscale</b>: Delete grayscale version. All clients will use the configurations of the main version<br> Notice: <br> &nbsp; &nbsp; 1. If the grayscale version has been released, then the grayscale rules will be effective immediately without the need to release grayscale configuration again.", "Config.ProjectMissEnvInfos": "There are missing environments in the current project, please click \"Recover Environments\" on the left side of the page to do the recovery.", "Config.ProjectMissNamespaceInfos": "There are missing namespaces in the current environment. Please click \"Recover Namespaces\" on the left side of the page to do the recovery.", "Config.SystemError": "System error, please try again or contact the system administrator", "Config.FavoriteSuccessfully": "Favorite Successfully", "Config.FavoriteFailed": "Failed to favorite", "Config.CancelledFavorite": "Cancel favorite successfully", "Config.CancelFavoriteFailed": "Failed to cancel the favorite", "Config.GetUserInfoFailed": "Failed to obtain user login information", "Config.LoadingAllNamespaceError": "Failed to load configuration", "Config.CancelFavoriteError": "Failure to Cancel Collection", "Config.Deleted": "Delete Successfully", "Config.DeleteFailed": "Failed to delete", "Config.GrayscaleCreated": "Create Grayscale Successfully", "Config.GrayscaleCreateFailed": "Failed to create grayscale", "Config.BranchDeleted": "Delete branch successfully", "Config.BranchDeleteFailed": "Failed to delete branch", "Config.DeleteNamespaceFailedTips": "The following projects are associated with this public namespace and they must all be deleted deleting the public Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "Failed to delete", "Config.DeleteNamespaceNoPermissionFailedTips": "You do not have Project Administrator permission. Only Administrators can delete namespace. Please ask Project Administrators [{{users}}] to delete namespace.", "Delete.Title": "Delete applications, clusters, AppNamespace", "Delete.DeleteApp": "Delete application", "Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)", "Delete.AppIdTips": "(Please query application information before deleting)", "Delete.AppInfo": "Application information", "Delete.DeleteCluster": "Delete clusters", "Delete.DeleteClusterTips": "(Because deleting clusters has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the cluster before deleting it.)", "Delete.EnvName": "Environment Name", "Delete.ClusterNameTips": "(Please query cluster information before deletion)", "Delete.ClusterInfo": "Cluster information", "Delete.DeleteNamespace": "Delete AppNamespace", "Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!", "Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace", "Delete.AppNamespaceName": "AppNamespace name", "Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace Information", "Delete.IsRootUserTips": "The current page is only accessible to Apollo administrators", "Delete.PleaseEnterAppId": "Please enter appId", "Delete.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "Delete.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "Delete.ConfirmDeleteAppId": "Are you sure to delete AppId: '{{appId}}'?", "Delete.Deleted": "Delete Successfully", "Delete.PleaseEnterAppIdAndEnvAndCluster": "Please enter appId, environment, and cluster name", "Delete.ClusterInfoContent": "AppId: '{{appId}}' environment: '{{env}}' cluster name: '{{clusterName}}'", "Delete.ConfirmDeleteCluster": "Are you sure to delete the cluster? AppId: '{{appId}}' environment: '{{env}}' cluster name:'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "Please enter appId and AppNamespace names", "Delete.AppNamespaceInfoContent": "AppId: '{{appId}}' AppNamespace name: '{{namespace}}' isPublic: '{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "Are you sure to delete AppNamespace and Namespace for all environments? AppId: '{{appId}}' environment: 'All environments' AppNamespace name: '{{namespace}}'", "Namespace.Title": "New Namespace", "Namespace.UnderstandMore": "(Click to learn more about Namespace)", "Namespace.Link.Tips1": "Applications can override the configuration of a public namespace by associating a public namespace", "Namespace.Link.Tips2": "If the application does not need to override the configuration of the public namespace, then there is no need to associate the public namespace", "Namespace.CreatePublic.Tips1": "The configuration of the public Namespace can be fetched by any application", "Namespace.CreatePublic.Tips2": "Configuration of public components or the need for multiple applications to share the same configuration can be achieved by creating a public namespace.", "Namespace.CreatePublic.Tips3": "If other applications need to override the configuration of the public namespace, you can associate the public namespace in other applications, and then configure the configuration that needs to be overridden in the associated namespace.", "Namespace.CreatePublic.Tips4": "If other applications do not need to override the configuration of public namespace, then there is no need to associate public namespace in other applications.", "Namespace.CreatePrivate.Tips1": "The configuration of a private Namespace can only be fetched by the application to which it belongs.", "Namespace.CreatePrivate.Tips2": "Group management configuration can be achieved by creating a private namespace", "Namespace.CreatePrivate.Tips3": "The format of private namespaces can be xml, yml, yaml, json, txt. You can get the content of namespace in non-property format through the ConfigFile interface in apollo-client.", "Namespace.CreatePrivate.Tips4": "The 1.3.0 and above versions of apollo-client provide better support for yaml/yml. Config objects can be obtained directly through ConfigService.getConfig(\"someNamespace.yml\"), or through @EnableApolloConfig(\"someNamespace.yml\") or apollo.bootstrap.namespaces=someNamespace.yml to inject YML configuration into Spring/Spring Boot", "Namespace.CreateNamespace": "Create Namespace", "Namespace.AssociationPublicNamespace": "Associate Public Namespace", "Namespace.ChooseCluster": "Select Cluster", "Namespace.NamespaceName": "Name", "Namespace.AutoAddDepartmentPrefix": "Add department prefix", "Namespace.AutoAddDepartmentPrefixTips": "(The name of a public namespace needs to be globally unique, and adding a department prefix helps ensure global uniqueness)", "Namespace.NamespaceType": "Type", "Namespace.NamespaceType.Public": "Public", "Namespace.NamespaceType.Private": "Private", "Namespace.Remark": "Remarks", "Namespace.Namespace": "Namespace", "Namespace.PleaseChooseNamespace": "Please select namespace", "Namespace.LoadingPublicNamespaceError": "Failed to load public namespace", "Namespace.LoadingAppInfoError": "Failed to load App information", "Namespace.PleaseChooseCluster": "Select Cluster", "Namespace.CheckNamespaceNameLengthTip": "The namespace name should not be longer than 32 characters. Department prefix:'{{departmentLength}}' characters, name {{namespaceLength}} characters", "ServiceConfig.Title": "System Configuration", "ServiceConfig.Tips": "(Maintain Apollo PortalDB.ServerConfig table data, will override configuration items if they already exist, or create configuration items. Configuration updates take effect automatically in a minute)", "ServiceConfig.Key": "Key", "ServiceConfig.KeyTips": "(Please query the configuration information before modifying the configuration)", "ServiceConfig.Value": "Value", "ServiceConfig.Comment": "Comment", "ServiceConfig.Saved": "Save Successfully", "ServiceConfig.SaveFailed": "Failed to Save", "ServiceConfig.PleaseEnterKey": "Please enter key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' does not exist. Click Save to create the configuration item.", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' already exists. Click Save will override the configuration item.", "AccessKey.Tips.1": "Add up to 5 access keys per environment.", "AccessKey.Tips.2": "Once the environment has any enabled access key, the client will be required to configure access key, or the configurations cannot be obtained.", "AccessKey.Tips.3": "Configure the access key to prevent unauthorized clients from obtaining the application configuration. The configuration method is as follows(requires apollo-client version 1.6.0+):", "AccessKey.Tips.3.1": "Via jvm parameter -Dapollo.access-key.secret", "AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "Configure apollo.access-key.secret via META-INF/app.properties or application.properties (note that the multi-environment secret is different)", "AccessKey.NoAccessKeyServiceTips": "There are no access keys in this environment.", "AccessKey.ConfigAccessKeys.Secret": "Access Key Secret", "AccessKey.ConfigAccessKeys.Status": "Status", "AccessKey.ConfigAccessKeys.LastModify": "Last Modifier", "AccessKey.ConfigAccessKeys.LastModifyTime": "Last Modified Time", "AccessKey.ConfigAccessKeys.Operator": "Operation", "AccessKey.Operator.Disable": "Disable", "AccessKey.Operator.Enable": "Enable", "AccessKey.Operator.Disabled": "Disabled", "AccessKey.Operator.Enabled": "Enabled", "AccessKey.Operator.Remove": "Remove", "AccessKey.Operator.CreateSuccess": "Access key created successfully", "AccessKey.Operator.DisabledSuccess": "Access key disabled successfully", "AccessKey.Operator.EnabledSuccess": "Access key enabled successfully", "AccessKey.Operator.RemoveSuccess": "Access key removed successfully", "AccessKey.Operator.CreateError": "Access key created failed", "AccessKey.Operator.DisabledError": "Access key disabled failed", "AccessKey.Operator.EnabledError": "Access key enabled failed", "AccessKey.Operator.RemoveError": "Access key removed failed", "AccessKey.Operator.DisabledTips": "Are you sure you want to disable the access key?", "AccessKey.Operator.EnabledTips": "Are you sure you want to enable the access key?", "AccessKey.Operator.RemoveTips": "Are you sure you want to remove the access key?", "AccessKey.LoadError": "Error Loading access keys", "SystemInfo.Title": "System Information", "SystemInfo.SystemVersion": "System version", "SystemInfo.Tips1": "The environment list comes from the <strong>apollo.portal.envs</strong> configuration in Apollo PortalDB.ServerConfig, and can be configured in <a href=\"{{serverConfigUrl}}\">System Configuration</a> page. For more information, please refer the <strong>apollo.portal.envs - supportable environment list</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Tips2": "The meta server address shows the meta server information for this environment configuration. For more information, please refer the <strong>Configuring meta service information for apollo-portal</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "(Current environment status is abnormal, please diagnose with the system information below and Check Health results of AdminService)", "SystemInfo.MetaServerAddress": "Meta server address", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "Check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.Title": "System Permission Management", "SystemRole.AddCreateAppRoleToUser": "Create application permission for users", "SystemRole.AddCreateAppRoleToUserTips": "(When role.create-application.enabled=true is set in system configurations, only super admin and those accounts with Create application permission can create application)", "SystemRole.ChooseUser": "Select User", "SystemRole.Add": "Add", "SystemRole.AuthorizedUser": "Users with permission", "SystemRole.ModifyAppAdminUser": "Modify Application Administrator Allocation Permissions", "SystemRole.ModifyAppAdminUserTips": "(When role.manage-app-master.enabled=true is set in system configurations, only super admin and those accounts with application administrator allocation permissions can modify the application's administrators)", "SystemRole.AppIdTips": "(Please query the application information first)", "SystemRole.AppInfo": "Application information", "SystemRole.AllowAppMasterAssignRole": "Allow this user to add Master as an administrator", "SystemRole.DeleteAppMasterAssignRole": "Disallow this user to add Master as an administrator", "SystemRole.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.PleaseChooseUser": "Please select a user", "SystemRole.Added": "Add Successfully", "SystemRole.AddFailed": "Failed to add", "SystemRole.Deleted": "Delete Successfully", "SystemRole.DeleteFailed": "Failed to Delete", "SystemRole.GetCanCreateProjectUsersError": "Error getting user list with create project permission", "SystemRole.PleaseEnterAppId": "Please enter appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "SystemRole.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "SystemRole.DeleteMasterAssignRoleTips": "Are you sure to disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.DeletedMasterAssignRoleTips": "Disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "SystemRole.AllowAppMasterAssignRoleTips": "Are you sure to allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.AllowedAppMasterAssignRoleTips": "Allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "UserMange.Title": "User Management", "UserMange.TitleTips": "(Only valid for the default Spring Security simple authentication method: - Dapollo_profile = github,auth)", "UserMange.UserName": "User Login Name", "UserMange.UserDisplayName": "User Display Name", "UserMange.UserNameTips": "If the user name entered does not exist, will create a new one. If it already exists, then it will be updated.", "UserMange.Pwd": "Password", "UserMange.Email": "Email", "UserMange.Created": "Create user successfully", "UserMange.CreateFailed": "Failed to create user", "Open.Manage.Title": "Open Platform", "Open.Manage.CreateThirdApp": "Create third-party applications", "Open.Manage.CreateThirdAppTips": "(Note: Third-party applications can manage configuration through Apollo Open Platform)", "Open.Manage.ThirdAppId": "Third party appId", "Open.Manage.ThirdAppIdTips": "(Please check if the third-party application has already exists first)", "Open.Manage.ThirdAppName": "Third party application name", "Open.Manage.ThirdAppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "Open.Manage.ProjectOwner": "Owner", "Open.Manage.Create": "Create", "Open.Manage.GrantPermission": "Authorization", "Open.Manage.GrantPermissionTips": "(Namespace level permissions include edit and release namespace. Application level permissions include creating namespace, edit or release any namespace in the application.)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "Managed AppId", "Open.Manage.ManagedNamespace": "Managed Namespace", "Open.Manage.ManagedNamespaceTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Open.Manage.GrantType": "Authorization type", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "Environments", "Open.Manage.GrantEnvTips": "(If you don't select any environment, then will have permissions to all environments.)", "Open.Manage.PleaseEnterAppId": "Please enter appId", "Open.Manage.AppNotCreated": "App('{{appId}}') does not exist, please create it first", "Open.Manage.GrantSuccessfully": "Authorize Successfully", "Open.Manage.GrantFailed": "Failed to authorize", "Namespace.Role.Title": "Permission Management", "Namespace.Role.GrantModifyTo": "Permission to edit", "Namespace.Role.GrantModifyTo2": "(Can edit the configuration)", "Namespace.Role.AllEnv": "All environments", "Namespace.Role.GrantPublishTo": "Permission to release", "Namespace.Role.GrantPublishTo2": "(Can release the configuration)", "Namespace.Role.Add": "Add", "Namespace.Role.NoPermission": "You do not have permission!", "Namespace.Role.InitNamespacePermissionError": "Error initializing authorization", "Namespace.Role.GetEnvGrantUserError": "Failed to load authorized users for '{{env}}'", "Namespace.Role.GetGrantUserError": "Failed to load authorized users", "Namespace.Role.PleaseChooseUser": "Please select the user", "Namespace.Role.Added": "Add Successfully", "Namespace.Role.AddFailed": "Failed to add", "Namespace.Role.Deleted": "Delete Successfully", "Namespace.Role.DeleteFailed": "Failed to Delete", "Config.Sync.Title": "Synchronize Configuration", "Config.Sync.FistStep": "(Step 1: Select Synchronization Information)", "Config.Sync.SecondStep": "(Step 2: Check Diff)", "Config.Sync.PreviousStep": "Previous step", "Config.Sync.NextStep": "Next step", "Config.Sync.Sync": "Synchronize", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "Configurations between multiple environments and clusters can be maintained by synchronize configuration", "Config.Sync.Tips2": "It should be noted that the configurations will not take effect until they are released after synchronization.", "Config.Sync.SyncNamespace": "Synchronized Namespace", "Config.Sync.SyncToCluster": "Synchronize to which cluster", "Config.Sync.NeedToSyncItem": "Configuration to synchronize", "Config.Sync.SortByLastModifyTime": "Filter by last update time", "Config.Sync.BeginTime": "Start time", "Config.Sync.EndTime": "End time", "Config.Sync.Filter": "Filter", "Config.Sync.Rest": "Reset", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "No updated configuration", "Config.Sync.IgnoreSync": "Ignore synchronization", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "Before Sync", "Config.Sync.Step2SyncAfter": "After Sync", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "Operation", "Config.Sync.NewAdd": "Add", "Config.Sync.NoSyncItem": "Do not synchronize the configuration", "Config.Sync.Delete": "Delete", "Config.Sync.Update": "Update", "Config.Sync.SyncSuccessfully": "Synchronize Successfully!", "Config.Sync.SyncFailed": "Failed to Synchronize!", "Config.Sync.LoadingItemsError": "Error loading configuration", "Config.Sync.PleaseChooseNeedSyncItems": "Please select the configuration that needs synchronization", "Config.Sync.PleaseChooseCluster": "Select Cluster", "Config.History.Title": "Release History", "Config.History.MasterVersionPublish": "Main version release", "Config.History.MasterVersionRollback": "Main version rollback", "Config.History.GrayscaleOperator": "Grayscale operation", "Config.History.PublishHistory": "Release History", "Config.History.OperationType0": "Normal release", "Config.History.OperationType1": "Rollback", "Config.History.OperationType2": "Grayscale Release", "Config.History.OperationType3": "Update Gray Rules", "Config.History.OperationType4": "Full Grayscale Release", "Config.History.OperationType5": "Grayscale Release(Main Version Release)", "Config.History.OperationType6": "Grayscale Release(Main Version Rollback)", "Config.History.OperationType7": "Abandon Grayscale", "Config.History.OperationType8": "Delete Grayscale(Full Release)", "Config.History.UrgentPublish": "Emergency Release", "Config.History.LoadMore": "Load more", "Config.History.Abandoned": "Abandoned", "Config.History.RollbackTo": "Rollback To This Release", "Config.History.RollbackToTips": "Rollback released configuration to this release", "Config.History.ChangedItem": "Changed Configuration", "Config.History.ChangedItemTips": "View changes between this release and the previous release", "Config.History.AllItem": "Full Configuration", "Config.History.AllItemTips": "View all configurations for this release", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "Add", "Config.History.ChangeTypeModify": "Update", "Config.History.ChangeTypeDelete": "Delete", "Config.History.NoChange": "No configuration changes", "Config.History.NoItem": "No configuration", "Config.History.GrayscaleRule": "Grayscale Rule", "Config.History.GrayscaleAppId": "Grayscale AppId", "Config.History.GrayscaleIp": "Grayscale IP", "Config.History.NoGrayscaleRule": "No Grayscale Rule", "Config.History.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the release history.", "Config.History.NoPublishHistory": "No release history", "Config.History.LoadingHistoryError": "No release history", "Config.Diff.Title": "Compare Configuration", "Config.Diff.FirstStep": "(Step 1: Select what to compare)", "Config.Diff.SecondStep": "(Step 2: View the differences)", "Config.Diff.PreviousStep": "Previous step", "Config.Diff.NextStep": "Next step", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters", "Config.Diff.DiffCluster": "Clusters to be compared", "Config.Diff.HasDiffComment": "Whether to compare comments or not", "Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters", "ConfigExport.Title": "Config Export", "ConfigExport.TitleTips" : "Super administrators will download the configuration of all projects, normal users will only download the configuration of their own projects", "ConfigExport.Download": "Download", "App.CreateProject": "Create Project", "App.AppIdTips": "(Application's unique identifiers)", "App.AppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.AppOwnerTips": "(After enabling the application administrator allocation restrictions, the application owner and project administrator are default to current account, not subject to change)", "App.AppAdminTips1": "(The application owner has project administrator permission by default.", "App.AppAdminTips2": "Project administrators can create namespace, cluster, and assign user permissions)", "App.AccessKey.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.Title": "Manage Project", "App.Setting.Admin": "Administrators", "App.Setting.AdminTips": "(Project administrators have the following permissions: 1. Create namespace 2. Create clusters 3. Manage project and namespace permissions)", "App.Setting.Add": "Add", "App.Setting.BasicInfo": "Basic information", "App.Setting.ProjectName": "App Name", "App.Setting.ProjectNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.Setting.ProjectOwner": "Owner", "App.Setting.Modify": "Modify project information", "App.Setting.Cancel": "Cancel", "App.Setting.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.DeleteAdmin": "Delete Administrator", "App.Setting.CanNotDeleteAllAdmin": "Cannot delete all administrators", "App.Setting.PleaseChooseUser": "Please select a user", "App.Setting.Added": "Add Successfully", "App.Setting.AddFailed": "Failed to Add", "App.Setting.Deleted": "Delete Successfully", "App.Setting.DeleteFailed": "Failed to Delete", "App.Setting.Modified": "Update Successfully", "Valdr.App.AppId.Size": "AppId cannot be longer than 64 characters", "Valdr.App.AppId.Required": "AppId cannot be empty", "Valdr.App.appName.Size": "The app name cannot be longer than 128 characters", "Valdr.App.appName.Required": "App name cannot be empty", "Valdr.Cluster.ClusterName.Size": "Cluster names cannot be longer than 32 characters", "Valdr.Cluster.ClusterName.Required": "Cluster name cannot be empty", "Valdr.AppNamespace.NamespaceName.Size": "Namespace name cannot be longer than 32 characters", "Valdr.AppNamespace.NamespaceName.Required": "Namespace name cannot be empty", "Valdr.AppNamespace.Comment.Size": "Comment length should not exceed 64 characters", "Valdr.Item.Key.Size": "Key cannot be longer than 128 characters", "Valdr.Item.Key.Required": "Key can't be empty", "Valdr.Item.Comment.Size": "Comment length should not exceed 256 characters", "Valdr.Release.ReleaseName.Size": "Release Name cannot be longer than 64 characters", "Valdr.Release.ReleaseName.Required": "Release Name cannot be empty", "Valdr.Release.Comment.Size": "Comment length should not exceed 256 characters", "ApolloConfirmDialog.DefaultConfirmBtnName": "OK", "ApolloConfirmDialog.SearchPlaceHolder": "Search items (App Id, App Name)", "RulesModal.ChooseInstances": "Select from the list of instances", "RulesModal.InvalidIp": "Illegal IP Address: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "Grayscale AppId cannot be empty", "RulesModal.AppIdExistsRule": "Rules already exist for AppId='{{appId}}'", "RulesModal.IpListCanNotBeNull": "IP list cannot be empty", "ItemModal.KeyExists": "Key='{{key}}' already exists", "ItemModal.AddedTips": "Add Successfully. need to release configuration to take effect", "ItemModal.AddFailed": "Failed to Add", "ItemModal.PleaseChooseCluster": "Please Select Cluster", "ItemModal.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ItemModal.ModifyFailed": "Failed to Update", "ItemModal.Tabs": "Tab-character", "ItemModal.NewLine": "Newline-character", "ItemModal.Space": "Blank-space", "ApolloNsPanel.LoadingHistoryError": "Failed to load change history", "ApolloNsPanel.LoadingGrayscaleError": "Failed to load change history", "ApolloNsPanel.Deleted": "Delete Successfully", "ApolloNsPanel.GrayscaleModified": "Update grayscale rules successfully", "ApolloNsPanel.GrayscaleModifyFailed": "Failed to update grayscale rules", "ApolloNsPanel.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ApolloNsPanel.ModifyFailed": "Failed to Update", "ApolloNsPanel.GrammarIsRight": "Syntax is correct", "ReleaseModal.Published": "Release Successfully", "ReleaseModal.PublishFailed": "Failed to Release", "ReleaseModal.GrayscalePublished": "Grayscale Release Successfully", "ReleaseModal.GrayscalePublishFailed": "Failed to Grayscale Release", "ReleaseModal.AllPublished": "Full Release Successfully", "ReleaseModal.AllPublishFailed": "Failed to Full Release", "Rollback.NoRollbackList": "No released history to rollback", "Rollback.SameAsCurrentRelease": "This release is the same as current release", "Rollback.RollbackSuccessfully": "Rollback Successfully", "Rollback.RollbackFailed": "Failed to Rollback", "Revoke.RevokeFailed": "Failed to Revoke", "Revoke.RevokeSuccessfully": "Revoke Successfully" }
{ "Common.Title": "Apollo Configuration Center", "Common.Ctrip": "Ctrip", "Common.CtripDepartment": "Framework R&D Department", "Common.Nav.ShowNavBar": "Display navigation bar", "Common.Nav.HideNavBar": "Hide navigation bar", "Common.Nav.Help": "Help", "Common.Nav.AdminTools": "Admin Tools", "Common.Nav.NonAdminTools": "Tools", "Common.Nav.UserManage": "User Management", "Common.Nav.SystemRoleManage": "System Permission Management", "Common.Nav.OpenMange": "Open Platform Authorization Management", "Common.Nav.SystemConfig": "System Configuration", "Common.Nav.DeleteApp-Cluster-Namespace": "Delete Apps, Clusters, AppNamespace", "Common.Nav.SystemInfo": "System Information", "Common.Nav.ConfigExport": "Config Export", "Common.Nav.Logout": "Logout", "Common.Department": "Department", "Common.Cluster": "Cluster", "Common.Environment": "Environment", "Common.Email": "Email", "Common.AppId": "App Id", "Common.Namespace": "Namespace", "Common.AppName": "App Name", "Common.AppOwner": "App Owner", "Common.AppOwnerLong": "App Owner", "Common.AppAdmin": "App Administrators", "Common.ClusterName": "Cluster Name", "Common.Submit": "Submit", "Common.Save": "Save", "Common.Created": "Create Successfully", "Common.CreateFailed": "Fail to Create", "Common.Deleted": "Delete Successfully", "Common.DeleteFailed": "Fail to Delete", "Common.ReturnToIndex": "Return to project page", "Common.Cancel": "Cancel", "Common.Ok": "OK", "Common.Search": "Query", "Common.IsRootUser": "Current page is only accessible to Apollo administrator.", "Common.PleaseChooseDepartment": "Please select department", "Common.PleaseChooseOwner": "Please select app owner", "Common.LoginExpiredTips": "Your login is expired. Please refresh the page and try again.", "Component.DeleteNamespace.Title": "Delete Namespace", "Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?", "Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?", "Component.GrayscalePublishRule.Title": "Edit Grayscale Rule", "Component.GrayscalePublishRule.AppId": "Grayscale AppId", "Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule", "Component.GrayscalePublishRule.AcceptPartInstance": "Apply to some instances", "Component.GrayscalePublishRule.AcceptAllInstance": "Apply to all instances", "Component.GrayscalePublishRule.IP": "Grayscale IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(The list of instances are filtered by the typed AppId automatically)", "Component.GrayscalePublishRule.IpTips": "Can't find the IP you want? You may ", "Component.GrayscalePublishRule.EnterIp": "enter IP manually", "Component.GrayscalePublishRule.EnterIpTips": "Enter the list of IP, using ',' as the separator, and then click the Add button.", "Component.GrayscalePublishRule.Add": "Add", "Component.ConfigItem.Title": "Add Configuration", "Component.ConfigItem.TitleTips": "(Reminder: Configuration can be added in batch via text mode)", "Component.ConfigItem.AddGrayscaleItem": "Add Grayscale Configuration", "Component.ConfigItem.ModifyItem": "Modify Configuration", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "Note: Hidden characters (Spaces, Newline, Tab) easily cause configuration errors. If you want to check hidden characters in Value, please click", "Component.ConfigItem.ItemValueShowDetection": "Check Hidden Characters", "Component.ConfigItem.ItemValueNotHiddenChars": "No Hidden Characters", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "Select Cluster", "Component.MergePublish.Title": "Full Release", "Component.MergePublish.Tips": "Full release will merge the configurations of grayscale version into the main version and release them.", "Component.MergePublish.NextStep": "After full release, choose which behavior you want", "Component.MergePublish.DeleteGrayscale": "Delete grayscale version", "Component.MergePublish.ReservedGrayscale": "Keep grayscale version", "Component.Namespace.Branch.IsChanged": "Modified", "Component.Namespace.Branch.ChangeUser": "Current Modifier", "Component.Namespace.Branch.ContinueGrayscalePublish": "Continue to Grayscale Release", "Component.Namespace.Branch.GrayscalePublish": "Grayscale Release", "Component.Namespace.Branch.MergeToMasterAndPublish": "Merge to the main version and release the main version's configurations ", "Component.Namespace.Branch.AllPublish": "Full Release", "Component.Namespace.Branch.DiscardGrayscaleVersion": "Abandon Grayscale Version", "Component.Namespace.Branch.DiscardGrayscale": "Abandon Grayscale", "Component.Namespace.Branch.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Branch.Tab.Configuration": "Configuration", "Component.Namespace.Branch.Tab.GrayscaleRule": "Grayscale Rule", "Component.Namespace.Branch.Tab.GrayscaleInstance": "Grayscale Instance List", "Component.Namespace.Branch.Tab.ChangeHistory": "Change History", "Component.Namespace.Branch.Body.Item": "Grayscale Configuration", "Component.Namespace.Branch.Body.AddedItem": "Add Grayscale Configuration", "Component.Namespace.Branch.Body.PublishState": "Release Status", "Component.Namespace.Branch.Body.ItemSort": "Sort", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "Value of Main Version", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "Grayscale value", "Component.Namespace.Branch.Body.ItemComment": "Comment", "Component.Namespace.Branch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Branch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Branch.Body.ItemOperator": "Operation", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "Click to view released values", "Component.Namespace.Branch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.Branch.Body.ItemPublished": "Released", "Component.Namespace.Branch.Body.ItemEffective": "Effective configuration", "Component.Namespace.Branch.Body.ClickToSee": "Click to view", "Component.Namespace.Branch.Body.DeletedItem": "Deleted configuration", "Component.Namespace.Branch.Body.Delete": "Deleted", "Component.Namespace.Branch.Body.ChangedFromMaster": "Configuration modified from the main version", "Component.Namespace.Branch.Body.ModifiedItem": "Modified configuration", "Component.Namespace.Branch.Body.Modify": "Modified", "Component.Namespace.Branch.Body.AddedByGrayscale": "Specific configuration for grayscale version", "Component.Namespace.Branch.Body.Added": "New", "Component.Namespace.Branch.Body.Op.Modify": "Modify", "Component.Namespace.Branch.Body.Op.Delete": "Delete", "Component.Namespace.MasterBranch.Body.Title": "Configuration of the main version", "Component.Namespace.MasterBranch.Body.PublishState": "Release Status", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "Comment", "Component.Namespace.MasterBranch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.MasterBranch.Body.ItemOperator": "Operation", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "Click to check released values", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.MasterBranch.Body.ItemEffective": "Effective configuration", "Component.Namespace.MasterBranch.Body.ItemPublished": "Released", "Component.Namespace.MasterBranch.Body.AddedItem": "New configuration", "Component.Namespace.MasterBranch.Body.ModifyItem": "Modify the grayscale configuration", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "You do not have the permission to edit grayscale rule. Only those who have the permission to edit or release the namespace can edit grayscale rule. If you need to edit grayscale rule, please contact the project administrator to apply for the permission.", "Component.Namespace.Branch.GrayScaleRule.AppId": "Grayscale AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "Grayscale IP List", "Component.Namespace.Branch.GrayScaleRule.Operator": "Operation", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "Modify", "Component.Namespace.Branch.GrayScaleRule.Delete": "Delete", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "Create Rule", "Component.Namespace.Branch.Instance.RefreshList": "Refresh List", "Component.Namespace.Branch.Instance.ItemToSee": "View configuration", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "Configuration Fetched Time", "Component.Namespace.Branch.Instance.LoadMore": "Refresh list", "Component.Namespace.Branch.Instance.NoInstance": "No instance information", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "Add", "Component.Namespace.Branch.History.Modified": "Update", "Component.Namespace.Branch.History.Deleted": "Delete", "Component.Namespace.Branch.History.LoadMore": "Load more", "Component.Namespace.Branch.History.NoHistory": "No Change History", "Component.Namespace.Header.Title.Private": "Private", "Component.Namespace.Header.Title.PrivateTips": "The configuration of private namespace ({{namespace.baseInfo.namespaceName}}) can be only fetched by clients whose AppId is {{appId}}", "Component.Namespace.Header.Title.Public": "Public", "Component.Namespace.Header.Title.PublicTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) can be fetched by any client.", "Component.Namespace.Header.Title.Extend": "Association", "Component.Namespace.Header.Title.ExtendTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) will override the configuration of the public namespace, and the combined configuration can only be fetched by clients whose AppId is {{appId}}.", "Component.Namespace.Header.Title.ExpandAndCollapse": "[Expand/Collapse]", "Component.Namespace.Header.Title.Master": "Main Version", "Component.Namespace.Header.Title.Grayscale": "Grayscale Version", "Component.Namespace.Master.LoadNamespace": "Load Namespace", "Component.Namespace.Master.LoadNamespaceTips": "Load Namespace", "Component.Namespace.Master.Items.Changed": "Modified", "Component.Namespace.Master.Items.ChangedUser": "Current modifier", "Component.Namespace.Master.Items.Publish": "Release", "Component.Namespace.Master.Items.PublishTips": "Release configuration", "Component.Namespace.Master.Items.Rollback": "Rollback", "Component.Namespace.Master.Items.RollbackTips": "Rollback released configuration", "Component.Namespace.Master.Items.PublishHistory": "Release History", "Component.Namespace.Master.Items.PublishHistoryTips": "View the release history", "Component.Namespace.Master.Items.Grant": "Authorize", "Component.Namespace.Master.Items.GrantTips": "Manage the configuration edit and release permission", "Component.Namespace.Master.Items.Grayscale": "Grayscale", "Component.Namespace.Master.Items.GrayscaleTips": "Create a test version", "Component.Namespace.Master.Items.RequestPermission": "Apply for configuration permission", "Component.Namespace.Master.Items.RequestPermissionTips": "You do not have any configuration permission. Please apply.", "Component.Namespace.Master.Items.DeleteNamespace": "Delete Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Master.Items.ItemList": "Table", "Component.Namespace.Master.Items.ItemListByText": "Text", "Component.Namespace.Master.Items.ItemHistory": "Change History", "Component.Namespace.Master.Items.ItemInstance": "Instance List", "Component.Namespace.Master.Items.CopyText": "Copy", "Component.Namespace.Master.Items.GrammarCheck": "Syntax Check", "Component.Namespace.Master.Items.CancelChanged": "Cancel", "Component.Namespace.Master.Items.Change": "Modify", "Component.Namespace.Master.Items.SummitChanged": "Submit", "Component.Namespace.Master.Items.SortByKey": "Filter the configurations by key", "Component.Namespace.Master.Items.FilterItem": "Filter", "Component.Namespace.Master.Items.RevokeItemTips": "Revoke configuration changes", "Component.Namespace.Master.Items.RevokeItem" :"Revoke", "Component.Namespace.Master.Items.SyncItemTips": "Synchronize configurations among environments", "Component.Namespace.Master.Items.SyncItem": "Synchronize", "Component.Namespace.Master.Items.DiffItemTips": "Compare the configurations among environments", "Component.Namespace.Master.Items.DiffItem": "Compare", "Component.Namespace.Master.Items.AddItem": "Add Configuration", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: This namespace has never been released. Apollo client will not be able to fetch the configuration and will record 404 log information. Please release it in time.", "Component.Namespace.Master.Items.Body.FilterByKey": "Input key to filter", "Component.Namespace.Master.Items.Body.PublishState": "Release Status", "Component.Namespace.Master.Items.Body.Sort": "Sort", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Master.Items.Body.ItemOperator": "Operation", "Component.Namespace.Master.Items.Body.NoPublish": "Unreleased", "Component.Namespace.Master.Items.Body.NoPublishTitle": "Click to view released values", "Component.Namespace.Master.Items.Body.NoPublishTips": "New configuration, no released value", "Component.Namespace.Master.Items.Body.Published": "Released", "Component.Namespace.Master.Items.Body.PublishedTitle": "Effective configuration", "Component.Namespace.Master.Items.Body.ClickToSee": "Click to view", "Component.Namespace.Master.Items.Body.Grayscale": "Gray", "Component.Namespace.Master.Items.Body.HaveGrayscale": "This configuration has grayscale configuration. Click to view the value of grayscale.", "Component.Namespace.Master.Items.Body.NewAdded": "New", "Component.Namespace.Master.Items.Body.NewAddedTips": "New Configuration", "Component.Namespace.Master.Items.Body.Modified": "Modified", "Component.Namespace.Master.Items.Body.ModifiedTips": "Modified Configuration", "Component.Namespace.Master.Items.Body.Deleted": "Deleted", "Component.Namespace.Master.Items.Body.DeletedTips": "Deleted Configuration", "Component.Namespace.Master.Items.Body.ModifyTips": "Modify", "Component.Namespace.Master.Items.Body.DeleteTips": "Delete", "Component.Namespace.Master.Items.Body.Link.Title": "Overridden Configuration", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "No Overridden Configuration", "Component.Namespace.Master.Items.Body.Public.Title": "Public Configuration", "Component.Namespace.Master.Items.Body.Public.Published": "Released Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublish": "Unreleased Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "Owner of the current public namespace", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "hasn't associated this namespace, please contact the owner of {{namespace.parentAppId}} to associate this namespace in the {{namespace.parentAppId}} project.", "Component.Namespace.Master.Items.Body.Public.NoPublished": "No Released Configuration", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "Override this configuration", "Component.Namespace.Master.Items.Body.NoPublished.Title": "No public configuration", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "Released Value", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "Unreleased Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "Add", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "Update", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "Delete", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "No Change History", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory": "Filter History", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey": "Filter the history by key", "Component.Namespace.Master.Items.Body.Instance.Tips": "Tips: Only show instances who have fetched configurations in the last 24 hrs ", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "Instances using the latest configuration", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "Instances using outdated configuration", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "All Instances", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "Refresh List", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "View Configuration", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "Configuration fetched time", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "No Instance Information", "Component.PublishDeny.Title": "Release Restriction", "Component.PublishDeny.Tips1": "You can't release! The operators to edit and release the configurations in {{env}} environment must be different, please find someone else who has the release permission of this namespace to do the release operation.", "Component.PublishDeny.Tips2": "(If it is non working time or a special situation, you may release by clicking the 'Emergency Release' button.)", "Component.PublishDeny.EmergencyPublish": "Emergency Release", "Component.PublishDeny.Close": "Close", "Component.Publish.Title": "Release", "Component.Publish.Tips": "(Only the released configurations can be fetched by clients, and this release will only be applied to the current environment: {{env}})", "Component.Publish.Grayscale": "Grayscale Release", "Component.Publish.GrayscaleTips": "(The grayscale configurations are only applied to the instances specified in grayscale rules)", "Component.Publish.AllPublish": "Full Release", "Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)", "Component.Publish.ToSeeChange": "View changes", "Component.Publish.PublishedValue": "Released values", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "Unreleased values", "Component.Publish.ModifyUser": "Modifier", "Component.Publish.ModifyTime": "Modified Time", "Component.Publish.NewAdded": "New", "Component.Publish.NewAddedTips": "New Configuration", "Component.Publish.Modified": "Modified", "Component.Publish.ModifiedTips": "Modified Configuration", "Component.Publish.Deleted": "Deleted", "Component.Publish.DeletedTips": "Deleted Configuration", "Component.Publish.MasterValue": "Main version value", "Component.Publish.GrayValue": "Grayscale version value", "Component.Publish.GrayPublishedValue": "Released grayscale version value", "Component.Publish.GrayNoPublishedValue": "Unreleased grayscale version value", "Component.Publish.ItemNoChange": "No configuration changes", "Component.Publish.GrayItemNoChange": "No configuration changes", "Component.Publish.NoGrayItems": "No grayscale changes", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "Release", "Component.Rollback.To": "roll back to", "Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page", "Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations", "Component.Rollback.ClickToView": "Click to view", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "Before Rollback", "Component.Rollback.RollbackAfterValue": "After Rollback", "Component.Rollback.Added": "Add", "Component.Rollback.Modified": "Update", "Component.Rollback.Deleted": "Delete", "Component.Rollback.NoChange": "No configuration changes", "Component.Rollback.OpRollback": "Rollback", "Component.ShowText.Title": "View", "Login.Login": "Login", "Login.UserNameOrPasswordIncorrect": "Incorrect username or password", "Login.LogoutSuccessfully": "Logout Successfully", "Index.MyProject": "My projects", "Index.CreateProject": "Create project", "Index.LoadMore": "Load more", "Index.FavoriteItems": "Favorite projects", "Index.Topping": "Top", "Index.FavoriteTip": "You haven't favorited any items yet. You can favorite items on the project homepage.", "Index.RecentlyViewedItems": "Recent projects", "Index.GetCreateAppRoleFailed": "Failed to get the information of create project permission", "Index.Topped": "Top Successfully", "Index.CancelledFavorite": "Remove favorite successfully", "Cluster.CreateCluster": "Create Cluster", "Cluster.Tips.1": "By adding clusters, the same program can use different configuration in different clusters (such as different data centers)", "Cluster.Tips.2": "If the different clusters use the same configuration, there is no need to create clusters", "Cluster.Tips.3": "By default, Apollo reads IDC attributes in /opt/settings/server.properties(Linux) or C:\\opt\\settings\\server.properties(Windows) files on the machine as cluster names, such as SHAJQ (Jinqiao Data Center), SHAOY (Ouyang Data Center)", "Cluster.Tips.4": "The cluster name created here should be consistent with the IDC attribute in server.properties on the machine", "Cluster.CreateNameTips": "(Cluster names such as SHAJQ, SHAOY or customized clusters such as SHAJQ-xx, SHAJQ-yy)", "Cluster.ChooseEnvironment": "Environment", "Cluster.LoadingEnvironmentError": "Error in loading environment information", "Cluster.ClusterCreated": "Create cluster successfully", "Cluster.ClusterCreateFailed": "Failed to create cluster", "Cluster.PleaseChooseEnvironment": "Please select the environment", "Config.Title": "Apollo Configuration Center", "Config.AppIdNotFound": "doesn't exist, ", "Config.ClickByCreate": "click to create", "Config.EnvList": "Environments", "Config.EnvListTips": "Manage the configuration of different environments and clusters by switching environments and clusters", "Config.ProjectInfo": "Project Info", "Config.ModifyBasicProjectInfo": "Modify project's basic information", "Config.Favorite": "Favorite", "Config.CancelFavorite": "Cancel Favorite", "Config.MissEnv": "Missing environment", "Config.MissNamespace": "Missing Namespace", "Config.ProjectManage": "Manage Project", "Config.AccessKeyManage": "Manage AccessKey", "Config.CreateAppMissEnv": "Recover Environments", "Config.CreateAppMissNamespace": "Recover Namespaces", "Config.AddCluster": "Add Cluster", "Config.AddNamespace": "Add Namespace", "Config.CurrentlyOperatorEnv": "Current environment", "Config.DoNotRemindAgain": "No longer prompt", "Config.Note": "Note", "Config.ClusterIsDefaultTipContent": "All instances that do not belong to the '{{name}}' cluster will fetch the default cluster (current page) configuration, and those that belong to the '{{name}}' cluster will use the corresponding cluster configuration!", "Config.ClusterIsCustomTipContent": "Instances belonging to the '{{name}}' cluster will only fetch the configuration of the '{{name}}' cluster (the current page), and the default cluster configuration will only be fetched when the corresponding namespace has not been released in the current cluster.", "Config.HasNotPublishNamespace": "The following environment/cluster has unreleased configurations, the client will not fetch the unreleased configurations, please release them in time.", "Config.RevokeItem.DialogTitle": "Revoke configuration changes", "Config.RevokeItem.DialogContent": "Modified but unpublished configurations in the current namespace will be revoked. Are you sure to revoke the configuration changes?", "Config.DeleteItem.DialogTitle": "Delete configuration", "Config.DeleteItem.DialogContent": "You are deleting the configuration whose Key is <b>'{{config.key}}'</b> Value is <b>'{{config.value}}'</b>. <br> Are you sure to delete the configuration?", "Config.PublishNoPermission.DialogTitle": "Release", "Config.PublishNoPermission.DialogContent": "You do not have release permission. Please ask the project administrators '{{masterUsers}}' to authorize release permission.", "Config.ModifyNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.ModifyNoPermission.DialogContent": "Please ask the project administrators '{{masterUsers}}' to authorize release or edit permission.", "Config.MasterNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.MasterNoPermission.DialogContent": "You are not this project's administrator. Only project administrators have the permission to add clusters and namespaces. Please ask the project administrators '{{masterUsers}}' to assign administrator permission", "Config.NamespaceLocked.DialogTitle": "Edit not allowed", "Config.NamespaceLocked.DialogContent": "Current namespace is being edited by '{{lockOwner}}', and a release phase can only be edited by one person.", "Config.RollbackAlert.DialogTitle": "Rollback", "Config.RollbackAlert.DialogContent": "Are you sure to roll back?", "Config.EmergencyPublishAlert.DialogTitle": "Emergency release", "Config.EmergencyPublishAlert.DialogContent": "Are you sure to perform the emergency release?", "Config.DeleteBranch.DialogTitle": "Delete grayscale", "Config.DeleteBranch.DialogContent": "Deleting grayscale will lose the grayscale configurations. Are you sure to delete it?", "Config.UpdateRuleTips.DialogTitle": "Update gray rule prompt", "Config.UpdateRuleTips.DialogContent": "Grayscale rules are in effect. However there are unreleased configurations in grayscale version, they won't be effective until a manual grayscale release is performed.", "Config.MergeAndReleaseDeny.DialogTitle": "Full release", "Config.MergeAndReleaseDeny.DialogContent": "The main version has unreleased configuration. Please release the main version first.", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "Missing gray rule prompt", "Config.GrayReleaseWithoutRulesTips.DialogContent": "The grayscale version has not configured any grayscale rule. Please configure the grayscale rules.", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "Delete namespace warning", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> instances using namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'), and deleting namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Instance List\"</ins> to confirm the instance information. If you confirm that the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "Delete namespace warning information", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> instances using the grayscale version of namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}') configuration, and deleting Namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Grayscale Version\"=> \"Instance List\"</ins> to confirm the instance information. If you confirm the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "Please enter appId", "Config.SyntaxCheckFailed.DialogTitle": "Syntax Check Error", "Config.SyntaxCheckFailed.DialogContent": "Delete Namespace Failure Tip", "Config.CreateBranchTips.DialogTitle": "Create Grayscale Notice", "Config.CreateBranchTips.DialogContent": "By creating grayscale version, you can do grayscale test for some configurations. <br> Grayscale process is as follows: <br> &nbsp; &nbsp; 1. Create grayscale version <br> &nbsp; &nbsp; 2. Configure grayscale configuration items <br> &nbsp; &nbsp; 3. Configure grayscale rules. If it is a private namespace, it can be grayed according to the IP of client. If it is a public namespace, it can be grayed according to both appId and the IP. <br> &nbsp; &nbsp; 4. Grayscale release <br> Grayscale version has two final results: <b> Full release and Abandon grayscale</b> <br> <b>Full release</b>: grayscale configurations are merged with the main version and released, all clients will use the merged configurations <br> <b> Abandon grayscale</b>: Delete grayscale version. All clients will use the configurations of the main version<br> Notice: <br> &nbsp; &nbsp; 1. If the grayscale version has been released, then the grayscale rules will be effective immediately without the need to release grayscale configuration again.", "Config.ProjectMissEnvInfos": "There are missing environments in the current project, please click \"Recover Environments\" on the left side of the page to do the recovery.", "Config.ProjectMissNamespaceInfos": "There are missing namespaces in the current environment. Please click \"Recover Namespaces\" on the left side of the page to do the recovery.", "Config.SystemError": "System error, please try again or contact the system administrator", "Config.FavoriteSuccessfully": "Favorite Successfully", "Config.FavoriteFailed": "Failed to favorite", "Config.CancelledFavorite": "Cancel favorite successfully", "Config.CancelFavoriteFailed": "Failed to cancel the favorite", "Config.GetUserInfoFailed": "Failed to obtain user login information", "Config.LoadingAllNamespaceError": "Failed to load configuration", "Config.CancelFavoriteError": "Failure to Cancel Collection", "Config.Deleted": "Delete Successfully", "Config.DeleteFailed": "Failed to delete", "Config.GrayscaleCreated": "Create Grayscale Successfully", "Config.GrayscaleCreateFailed": "Failed to create grayscale", "Config.BranchDeleted": "Delete branch successfully", "Config.BranchDeleteFailed": "Failed to delete branch", "Config.DeleteNamespaceFailedTips": "The following projects are associated with this public namespace and they must all be deleted deleting the public Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "Failed to delete", "Config.DeleteNamespaceNoPermissionFailedTips": "You do not have Project Administrator permission. Only Administrators can delete namespace. Please ask Project Administrators [{{users}}] to delete namespace.", "Delete.Title": "Delete applications, clusters, AppNamespace", "Delete.DeleteApp": "Delete application", "Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)", "Delete.AppIdTips": "(Please query application information before deleting)", "Delete.AppInfo": "Application information", "Delete.DeleteCluster": "Delete clusters", "Delete.DeleteClusterTips": "(Because deleting clusters has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the cluster before deleting it.)", "Delete.EnvName": "Environment Name", "Delete.ClusterNameTips": "(Please query cluster information before deletion)", "Delete.ClusterInfo": "Cluster information", "Delete.DeleteNamespace": "Delete AppNamespace", "Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!", "Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace", "Delete.AppNamespaceName": "AppNamespace name", "Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace Information", "Delete.IsRootUserTips": "The current page is only accessible to Apollo administrators", "Delete.PleaseEnterAppId": "Please enter appId", "Delete.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "Delete.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "Delete.ConfirmDeleteAppId": "Are you sure to delete AppId: '{{appId}}'?", "Delete.Deleted": "Delete Successfully", "Delete.PleaseEnterAppIdAndEnvAndCluster": "Please enter appId, environment, and cluster name", "Delete.ClusterInfoContent": "AppId: '{{appId}}' environment: '{{env}}' cluster name: '{{clusterName}}'", "Delete.ConfirmDeleteCluster": "Are you sure to delete the cluster? AppId: '{{appId}}' environment: '{{env}}' cluster name:'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "Please enter appId and AppNamespace names", "Delete.AppNamespaceInfoContent": "AppId: '{{appId}}' AppNamespace name: '{{namespace}}' isPublic: '{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "Are you sure to delete AppNamespace and Namespace for all environments? AppId: '{{appId}}' environment: 'All environments' AppNamespace name: '{{namespace}}'", "Namespace.Title": "New Namespace", "Namespace.UnderstandMore": "(Click to learn more about Namespace)", "Namespace.Link.Tips1": "Applications can override the configuration of a public namespace by associating a public namespace", "Namespace.Link.Tips2": "If the application does not need to override the configuration of the public namespace, then there is no need to associate the public namespace", "Namespace.CreatePublic.Tips1": "The configuration of the public Namespace can be fetched by any application", "Namespace.CreatePublic.Tips2": "Configuration of public components or the need for multiple applications to share the same configuration can be achieved by creating a public namespace.", "Namespace.CreatePublic.Tips3": "If other applications need to override the configuration of the public namespace, you can associate the public namespace in other applications, and then configure the configuration that needs to be overridden in the associated namespace.", "Namespace.CreatePublic.Tips4": "If other applications do not need to override the configuration of public namespace, then there is no need to associate public namespace in other applications.", "Namespace.CreatePrivate.Tips1": "The configuration of a private Namespace can only be fetched by the application to which it belongs.", "Namespace.CreatePrivate.Tips2": "Group management configuration can be achieved by creating a private namespace", "Namespace.CreatePrivate.Tips3": "The format of private namespaces can be xml, yml, yaml, json, txt. You can get the content of namespace in non-property format through the ConfigFile interface in apollo-client.", "Namespace.CreatePrivate.Tips4": "The 1.3.0 and above versions of apollo-client provide better support for yaml/yml. Config objects can be obtained directly through ConfigService.getConfig(\"someNamespace.yml\"), or through @EnableApolloConfig(\"someNamespace.yml\") or apollo.bootstrap.namespaces=someNamespace.yml to inject YML configuration into Spring/Spring Boot", "Namespace.CreateNamespace": "Create Namespace", "Namespace.AssociationPublicNamespace": "Associate Public Namespace", "Namespace.ChooseCluster": "Select Cluster", "Namespace.NamespaceName": "Name", "Namespace.AutoAddDepartmentPrefix": "Add department prefix", "Namespace.AutoAddDepartmentPrefixTips": "(The name of a public namespace needs to be globally unique, and adding a department prefix helps ensure global uniqueness)", "Namespace.NamespaceType": "Type", "Namespace.NamespaceType.Public": "Public", "Namespace.NamespaceType.Private": "Private", "Namespace.Remark": "Remarks", "Namespace.Namespace": "Namespace", "Namespace.PleaseChooseNamespace": "Please select namespace", "Namespace.LoadingPublicNamespaceError": "Failed to load public namespace", "Namespace.LoadingAppInfoError": "Failed to load App information", "Namespace.PleaseChooseCluster": "Select Cluster", "Namespace.CheckNamespaceNameLengthTip": "The namespace name should not be longer than 32 characters. Department prefix:'{{departmentLength}}' characters, name {{namespaceLength}} characters", "ServiceConfig.Title": "System Configuration", "ServiceConfig.Tips": "(Maintain Apollo PortalDB.ServerConfig table data, will override configuration items if they already exist, or create configuration items. Configuration updates take effect automatically in a minute)", "ServiceConfig.Key": "Key", "ServiceConfig.KeyTips": "(Please query the configuration information before modifying the configuration)", "ServiceConfig.Value": "Value", "ServiceConfig.Comment": "Comment", "ServiceConfig.Saved": "Save Successfully", "ServiceConfig.SaveFailed": "Failed to Save", "ServiceConfig.PleaseEnterKey": "Please enter key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' does not exist. Click Save to create the configuration item.", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' already exists. Click Save will override the configuration item.", "AccessKey.Tips.1": "Add up to 5 access keys per environment.", "AccessKey.Tips.2": "Once the environment has any enabled access key, the client will be required to configure access key, or the configurations cannot be obtained.", "AccessKey.Tips.3": "Configure the access key to prevent unauthorized clients from obtaining the application configuration. The configuration method is as follows(requires apollo-client version 1.6.0+):", "AccessKey.Tips.3.1": "Via jvm parameter -Dapollo.access-key.secret", "AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "Configure apollo.access-key.secret via META-INF/app.properties or application.properties (note that the multi-environment secret is different)", "AccessKey.NoAccessKeyServiceTips": "There are no access keys in this environment.", "AccessKey.ConfigAccessKeys.Secret": "Access Key Secret", "AccessKey.ConfigAccessKeys.Status": "Status", "AccessKey.ConfigAccessKeys.LastModify": "Last Modifier", "AccessKey.ConfigAccessKeys.LastModifyTime": "Last Modified Time", "AccessKey.ConfigAccessKeys.Operator": "Operation", "AccessKey.Operator.Disable": "Disable", "AccessKey.Operator.Enable": "Enable", "AccessKey.Operator.Disabled": "Disabled", "AccessKey.Operator.Enabled": "Enabled", "AccessKey.Operator.Remove": "Remove", "AccessKey.Operator.CreateSuccess": "Access key created successfully", "AccessKey.Operator.DisabledSuccess": "Access key disabled successfully", "AccessKey.Operator.EnabledSuccess": "Access key enabled successfully", "AccessKey.Operator.RemoveSuccess": "Access key removed successfully", "AccessKey.Operator.CreateError": "Access key created failed", "AccessKey.Operator.DisabledError": "Access key disabled failed", "AccessKey.Operator.EnabledError": "Access key enabled failed", "AccessKey.Operator.RemoveError": "Access key removed failed", "AccessKey.Operator.DisabledTips": "Are you sure you want to disable the access key?", "AccessKey.Operator.EnabledTips": "Are you sure you want to enable the access key?", "AccessKey.Operator.RemoveTips": "Are you sure you want to remove the access key?", "AccessKey.LoadError": "Error Loading access keys", "SystemInfo.Title": "System Information", "SystemInfo.SystemVersion": "System version", "SystemInfo.Tips1": "The environment list comes from the <strong>apollo.portal.envs</strong> configuration in Apollo PortalDB.ServerConfig, and can be configured in <a href=\"{{serverConfigUrl}}\">System Configuration</a> page. For more information, please refer the <strong>apollo.portal.envs - supportable environment list</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Tips2": "The meta server address shows the meta server information for this environment configuration. For more information, please refer the <strong>Configuring meta service information for apollo-portal</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "(Current environment status is abnormal, please diagnose with the system information below and Check Health results of AdminService)", "SystemInfo.MetaServerAddress": "Meta server address", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "Check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.Title": "System Permission Management", "SystemRole.AddCreateAppRoleToUser": "Create application permission for users", "SystemRole.AddCreateAppRoleToUserTips": "(When role.create-application.enabled=true is set in system configurations, only super admin and those accounts with Create application permission can create application)", "SystemRole.ChooseUser": "Select User", "SystemRole.Add": "Add", "SystemRole.AuthorizedUser": "Users with permission", "SystemRole.ModifyAppAdminUser": "Modify Application Administrator Allocation Permissions", "SystemRole.ModifyAppAdminUserTips": "(When role.manage-app-master.enabled=true is set in system configurations, only super admin and those accounts with application administrator allocation permissions can modify the application's administrators)", "SystemRole.AppIdTips": "(Please query the application information first)", "SystemRole.AppInfo": "Application information", "SystemRole.AllowAppMasterAssignRole": "Allow this user to add Master as an administrator", "SystemRole.DeleteAppMasterAssignRole": "Disallow this user to add Master as an administrator", "SystemRole.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.PleaseChooseUser": "Please select a user", "SystemRole.Added": "Add Successfully", "SystemRole.AddFailed": "Failed to add", "SystemRole.Deleted": "Delete Successfully", "SystemRole.DeleteFailed": "Failed to Delete", "SystemRole.GetCanCreateProjectUsersError": "Error getting user list with create project permission", "SystemRole.PleaseEnterAppId": "Please enter appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "SystemRole.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "SystemRole.DeleteMasterAssignRoleTips": "Are you sure to disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.DeletedMasterAssignRoleTips": "Disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "SystemRole.AllowAppMasterAssignRoleTips": "Are you sure to allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.AllowedAppMasterAssignRoleTips": "Allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "UserMange.Title": "User Management", "UserMange.TitleTips": "(Only valid for the default Spring Security simple authentication method: - Dapollo_profile = github,auth)", "UserMange.UserName": "User Login Name", "UserMange.UserDisplayName": "User Display Name", "UserMange.UserNameTips": "If the user name entered does not exist, will create a new one. If it already exists, then it will be updated.", "UserMange.Pwd": "Password", "UserMange.Email": "Email", "UserMange.Created": "Create user successfully", "UserMange.CreateFailed": "Failed to create user", "Open.Manage.Title": "Open Platform", "Open.Manage.CreateThirdApp": "Create third-party applications", "Open.Manage.CreateThirdAppTips": "(Note: Third-party applications can manage configuration through Apollo Open Platform)", "Open.Manage.ThirdAppId": "Third party appId", "Open.Manage.ThirdAppIdTips": "(Please check if the third-party application has already exists first)", "Open.Manage.ThirdAppName": "Third party application name", "Open.Manage.ThirdAppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "Open.Manage.ProjectOwner": "Owner", "Open.Manage.Create": "Create", "Open.Manage.GrantPermission": "Authorization", "Open.Manage.GrantPermissionTips": "(Namespace level permissions include edit and release namespace. Application level permissions include creating namespace, edit or release any namespace in the application.)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "Managed AppId", "Open.Manage.ManagedNamespace": "Managed Namespace", "Open.Manage.ManagedNamespaceTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Open.Manage.GrantType": "Authorization type", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "Environments", "Open.Manage.GrantEnvTips": "(If you don't select any environment, then will have permissions to all environments.)", "Open.Manage.PleaseEnterAppId": "Please enter appId", "Open.Manage.AppNotCreated": "App('{{appId}}') does not exist, please create it first", "Open.Manage.GrantSuccessfully": "Authorize Successfully", "Open.Manage.GrantFailed": "Failed to authorize", "Namespace.Role.Title": "Permission Management", "Namespace.Role.GrantModifyTo": "Permission to edit", "Namespace.Role.GrantModifyTo2": "(Can edit the configuration)", "Namespace.Role.AllEnv": "All environments", "Namespace.Role.GrantPublishTo": "Permission to release", "Namespace.Role.GrantPublishTo2": "(Can release the configuration)", "Namespace.Role.Add": "Add", "Namespace.Role.NoPermission": "You do not have permission!", "Namespace.Role.InitNamespacePermissionError": "Error initializing authorization", "Namespace.Role.GetEnvGrantUserError": "Failed to load authorized users for '{{env}}'", "Namespace.Role.GetGrantUserError": "Failed to load authorized users", "Namespace.Role.PleaseChooseUser": "Please select the user", "Namespace.Role.Added": "Add Successfully", "Namespace.Role.AddFailed": "Failed to add", "Namespace.Role.Deleted": "Delete Successfully", "Namespace.Role.DeleteFailed": "Failed to Delete", "Config.Sync.Title": "Synchronize Configuration", "Config.Sync.FistStep": "(Step 1: Select Synchronization Information)", "Config.Sync.SecondStep": "(Step 2: Check Diff)", "Config.Sync.PreviousStep": "Previous step", "Config.Sync.NextStep": "Next step", "Config.Sync.Sync": "Synchronize", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "Configurations between multiple environments and clusters can be maintained by synchronize configuration", "Config.Sync.Tips2": "It should be noted that the configurations will not take effect until they are released after synchronization.", "Config.Sync.SyncNamespace": "Synchronized Namespace", "Config.Sync.SyncToCluster": "Synchronize to which cluster", "Config.Sync.NeedToSyncItem": "Configuration to synchronize", "Config.Sync.SortByLastModifyTime": "Filter by last update time", "Config.Sync.BeginTime": "Start time", "Config.Sync.EndTime": "End time", "Config.Sync.Filter": "Filter", "Config.Sync.Rest": "Reset", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "No updated configuration", "Config.Sync.IgnoreSync": "Ignore synchronization", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "Before Sync", "Config.Sync.Step2SyncAfter": "After Sync", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "Operation", "Config.Sync.NewAdd": "Add", "Config.Sync.NoSyncItem": "Do not synchronize the configuration", "Config.Sync.Delete": "Delete", "Config.Sync.Update": "Update", "Config.Sync.SyncSuccessfully": "Synchronize Successfully!", "Config.Sync.SyncFailed": "Failed to Synchronize!", "Config.Sync.LoadingItemsError": "Error loading configuration", "Config.Sync.PleaseChooseNeedSyncItems": "Please select the configuration that needs synchronization", "Config.Sync.PleaseChooseCluster": "Select Cluster", "Config.History.Title": "Release History", "Config.History.MasterVersionPublish": "Main version release", "Config.History.MasterVersionRollback": "Main version rollback", "Config.History.GrayscaleOperator": "Grayscale operation", "Config.History.PublishHistory": "Release History", "Config.History.OperationType0": "Normal release", "Config.History.OperationType1": "Rollback", "Config.History.OperationType2": "Grayscale Release", "Config.History.OperationType3": "Update Gray Rules", "Config.History.OperationType4": "Full Grayscale Release", "Config.History.OperationType5": "Grayscale Release(Main Version Release)", "Config.History.OperationType6": "Grayscale Release(Main Version Rollback)", "Config.History.OperationType7": "Abandon Grayscale", "Config.History.OperationType8": "Delete Grayscale(Full Release)", "Config.History.UrgentPublish": "Emergency Release", "Config.History.LoadMore": "Load more", "Config.History.Abandoned": "Abandoned", "Config.History.RollbackTo": "Rollback To This Release", "Config.History.RollbackToTips": "Rollback released configuration to this release", "Config.History.ChangedItem": "Changed Configuration", "Config.History.ChangedItemTips": "View changes between this release and the previous release", "Config.History.AllItem": "Full Configuration", "Config.History.AllItemTips": "View all configurations for this release", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "Add", "Config.History.ChangeTypeModify": "Update", "Config.History.ChangeTypeDelete": "Delete", "Config.History.NoChange": "No configuration changes", "Config.History.NoItem": "No configuration", "Config.History.GrayscaleRule": "Grayscale Rule", "Config.History.GrayscaleAppId": "Grayscale AppId", "Config.History.GrayscaleIp": "Grayscale IP", "Config.History.NoGrayscaleRule": "No Grayscale Rule", "Config.History.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the release history.", "Config.History.NoPublishHistory": "No release history", "Config.History.LoadingHistoryError": "No release history", "Config.Diff.Title": "Compare Configuration", "Config.Diff.FirstStep": "(Step 1: Select what to compare)", "Config.Diff.SecondStep": "(Step 2: View the differences)", "Config.Diff.PreviousStep": "Previous step", "Config.Diff.NextStep": "Next step", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters", "Config.Diff.DiffCluster": "Clusters to be compared", "Config.Diff.HasDiffComment": "Whether to compare comments or not", "Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters", "ConfigExport.Title": "Config Export", "ConfigExport.TitleTips" : "Super administrators will download the configuration of all projects, normal users will only download the configuration of their own projects", "ConfigExport.Download": "Download", "App.CreateProject": "Create Project", "App.AppIdTips": "(Application's unique identifiers)", "App.AppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.AppOwnerTips": "(After enabling the application administrator allocation restrictions, the application owner and project administrator are default to current account, not subject to change)", "App.AppAdminTips1": "(The application owner has project administrator permission by default.", "App.AppAdminTips2": "Project administrators can create namespace, cluster, and assign user permissions)", "App.AccessKey.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.Title": "Manage Project", "App.Setting.Admin": "Administrators", "App.Setting.AdminTips": "(Project administrators have the following permissions: 1. Create namespace 2. Create clusters 3. Manage project and namespace permissions)", "App.Setting.Add": "Add", "App.Setting.BasicInfo": "Basic information", "App.Setting.ProjectName": "App Name", "App.Setting.ProjectNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.Setting.ProjectOwner": "Owner", "App.Setting.Modify": "Modify project information", "App.Setting.Cancel": "Cancel", "App.Setting.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.DeleteAdmin": "Delete Administrator", "App.Setting.CanNotDeleteAllAdmin": "Cannot delete all administrators", "App.Setting.PleaseChooseUser": "Please select a user", "App.Setting.Added": "Add Successfully", "App.Setting.AddFailed": "Failed to Add", "App.Setting.Deleted": "Delete Successfully", "App.Setting.DeleteFailed": "Failed to Delete", "App.Setting.Modified": "Update Successfully", "Valdr.App.AppId.Size": "AppId cannot be longer than 64 characters", "Valdr.App.AppId.Required": "AppId cannot be empty", "Valdr.App.appName.Size": "The app name cannot be longer than 128 characters", "Valdr.App.appName.Required": "App name cannot be empty", "Valdr.Cluster.ClusterName.Size": "Cluster names cannot be longer than 32 characters", "Valdr.Cluster.ClusterName.Required": "Cluster name cannot be empty", "Valdr.AppNamespace.NamespaceName.Size": "Namespace name cannot be longer than 32 characters", "Valdr.AppNamespace.NamespaceName.Required": "Namespace name cannot be empty", "Valdr.AppNamespace.Comment.Size": "Comment length should not exceed 64 characters", "Valdr.Item.Key.Size": "Key cannot be longer than 128 characters", "Valdr.Item.Key.Required": "Key can't be empty", "Valdr.Item.Comment.Size": "Comment length should not exceed 256 characters", "Valdr.Release.ReleaseName.Size": "Release Name cannot be longer than 64 characters", "Valdr.Release.ReleaseName.Required": "Release Name cannot be empty", "Valdr.Release.Comment.Size": "Comment length should not exceed 256 characters", "ApolloConfirmDialog.DefaultConfirmBtnName": "OK", "ApolloConfirmDialog.SearchPlaceHolder": "Search items (App Id, App Name)", "RulesModal.ChooseInstances": "Select from the list of instances", "RulesModal.InvalidIp": "Illegal IP Address: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "Grayscale AppId cannot be empty", "RulesModal.AppIdExistsRule": "Rules already exist for AppId='{{appId}}'", "RulesModal.IpListCanNotBeNull": "IP list cannot be empty", "ItemModal.KeyExists": "Key='{{key}}' already exists", "ItemModal.AddedTips": "Add Successfully. need to release configuration to take effect", "ItemModal.AddFailed": "Failed to Add", "ItemModal.PleaseChooseCluster": "Please Select Cluster", "ItemModal.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ItemModal.ModifyFailed": "Failed to Update", "ItemModal.Tabs": "Tab-character", "ItemModal.NewLine": "Newline-character", "ItemModal.Space": "Blank-space", "ApolloNsPanel.LoadingHistoryError": "Failed to load change history", "ApolloNsPanel.LoadingGrayscaleError": "Failed to load change history", "ApolloNsPanel.Deleted": "Delete Successfully", "ApolloNsPanel.GrayscaleModified": "Update grayscale rules successfully", "ApolloNsPanel.GrayscaleModifyFailed": "Failed to update grayscale rules", "ApolloNsPanel.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ApolloNsPanel.ModifyFailed": "Failed to Update", "ApolloNsPanel.GrammarIsRight": "Syntax is correct", "ReleaseModal.Published": "Release Successfully", "ReleaseModal.PublishFailed": "Failed to Release", "ReleaseModal.GrayscalePublished": "Grayscale Release Successfully", "ReleaseModal.GrayscalePublishFailed": "Failed to Grayscale Release", "ReleaseModal.AllPublished": "Full Release Successfully", "ReleaseModal.AllPublishFailed": "Failed to Full Release", "Rollback.NoRollbackList": "No released history to rollback", "Rollback.SameAsCurrentRelease": "This release is the same as current release", "Rollback.RollbackSuccessfully": "Rollback Successfully", "Rollback.RollbackFailed": "Failed to Rollback", "Revoke.RevokeFailed": "Failed to Revoke", "Revoke.RevokeSuccessfully": "Revoke Successfully" }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/i18n/zh-CN.json
{ "Common.Title": "Apollo配置中心", "Common.Ctrip": "携程", "Common.CtripDepartment": "框架研发部", "Common.Nav.ShowNavBar": "显示导航栏", "Common.Nav.HideNavBar": "隐藏导航栏", "Common.Nav.Help": "帮助", "Common.Nav.AdminTools": "管理员工具", "Common.Nav.NonAdminTools": "工具", "Common.Nav.UserManage": "用户管理", "Common.Nav.SystemRoleManage": "系统权限管理", "Common.Nav.OpenMange": "开放平台授权管理", "Common.Nav.SystemConfig": "系统参数", "Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace", "Common.Nav.SystemInfo": "系统信息", "Common.Nav.ConfigExport": "配置导出", "Common.Nav.Logout": "退出", "Common.Department": "部门", "Common.Cluster": "集群", "Common.Environment": "环境", "Common.Email": "邮箱", "Common.AppId": "AppId", "Common.Namespace": "Namespace", "Common.AppName": "应用名称", "Common.AppOwner": "负责人", "Common.AppOwnerLong": "应用负责人", "Common.AppAdmin": "应用管理员", "Common.ClusterName": "集群名称", "Common.Submit": "提交", "Common.Save": "保存", "Common.Created": "创建成功", "Common.CreateFailed": "创建失败", "Common.Deleted": "删除成功", "Common.DeleteFailed": "删除失败", "Common.ReturnToIndex": "返回到应用首页", "Common.Cancel": "取消", "Common.Ok": "确定", "Common.Search": "查询", "Common.IsRootUser": "当前页面只对Apollo管理员开放", "Common.PleaseChooseDepartment": "请选择部门", "Common.PleaseChooseOwner": "请选择应用负责人", "Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试", "Component.DeleteNamespace.Title": "删除Namespace", "Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置，确定要删除吗?", "Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置，且页面会提示缺失Namespace（除非使用管理员工具删除AppNamespace），确定要删除吗?", "Component.GrayscalePublishRule.Title": "编辑灰度规则", "Component.GrayscalePublishRule.AppId": "灰度的AppId", "Component.GrayscalePublishRule.AcceptRule": "灰度应用规则", "Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例", "Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例", "Component.GrayscalePublishRule.IP": "灰度的IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)", "Component.GrayscalePublishRule.IpTips": "没找到你想要的IP？可以", "Component.GrayscalePublishRule.EnterIp": "手动输入IP", "Component.GrayscalePublishRule.EnterIpTips": "输入IP列表，英文逗号隔开，输入完后点击添加按钮", "Component.GrayscalePublishRule.Add": "添加", "Component.ConfigItem.Title": "添加配置项", "Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)", "Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项", "Component.ConfigItem.ModifyItem": "修改配置项", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错，如果需要检测Value中隐藏字符，请点击", "Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符", "Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "选择集群", "Component.MergePublish.Title": "全量发布", "Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支，并发布。", "Component.MergePublish.NextStep": "全量发布后,您希望", "Component.MergePublish.DeleteGrayscale": "删除灰度版本", "Component.MergePublish.ReservedGrayscale": "保留灰度版本", "Component.Namespace.Branch.IsChanged": "有修改", "Component.Namespace.Branch.ChangeUser": "当前修改者", "Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布", "Component.Namespace.Branch.GrayscalePublish": "灰度发布", "Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置", "Component.Namespace.Branch.AllPublish": "全量发布", "Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本", "Component.Namespace.Branch.DiscardGrayscale": "放弃灰度", "Component.Namespace.Branch.NoPermissionTips": "您不是该应用的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。", "Component.Namespace.Branch.Tab.Configuration": "配置", "Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则", "Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表", "Component.Namespace.Branch.Tab.ChangeHistory": "更改历史", "Component.Namespace.Branch.Body.Item": "灰度的配置", "Component.Namespace.Branch.Body.AddedItem": "新增灰度配置", "Component.Namespace.Branch.Body.PublishState": "发布状态", "Component.Namespace.Branch.Body.ItemSort": "排序", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值", "Component.Namespace.Branch.Body.ItemComment": "备注", "Component.Namespace.Branch.Body.ItemLastModify": "最后修改人", "Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Branch.Body.ItemOperator": "操作", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.Branch.Body.ItemNoPublish": "未发布", "Component.Namespace.Branch.Body.ItemPublished": "已发布", "Component.Namespace.Branch.Body.ItemEffective": "已生效的配置", "Component.Namespace.Branch.Body.ClickToSee": "点击查看", "Component.Namespace.Branch.Body.DeletedItem": "删除的配置", "Component.Namespace.Branch.Body.Delete": "删", "Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置", "Component.Namespace.Branch.Body.ModifiedItem": "修改的配置", "Component.Namespace.Branch.Body.Modify": "改", "Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置", "Component.Namespace.Branch.Body.Added": "新", "Component.Namespace.Branch.Body.Op.Modify": "修改", "Component.Namespace.Branch.Body.Op.Delete": "删除", "Component.Namespace.MasterBranch.Body.Title": "主版本的配置", "Component.Namespace.MasterBranch.Body.PublishState": "发布状态", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "备注", "Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.MasterBranch.Body.ItemOperator": "操作", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布", "Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置", "Component.Namespace.MasterBranch.Body.ItemPublished": "已发布", "Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置", "Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找应用管理员申请权限.", "Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表", "Component.Namespace.Branch.GrayScaleRule.Operator": "操作", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "修改", "Component.Namespace.Branch.GrayScaleRule.Delete": "删除", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则", "Component.Namespace.Branch.Instance.RefreshList": "刷新列表", "Component.Namespace.Branch.Instance.ItemToSee": "查看配置", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间", "Component.Namespace.Branch.Instance.LoadMore": "刷新列表", "Component.Namespace.Branch.Instance.NoInstance": "无实例信息", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "新增", "Component.Namespace.Branch.History.Modified": "更新", "Component.Namespace.Branch.History.Deleted": "删除", "Component.Namespace.Branch.History.LoadMore": "加载更多", "Component.Namespace.Branch.History.NoHistory": "无更改历史", "Component.Namespace.Header.Title.Private": "私有", "Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.Public": "公共", "Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到", "Component.Namespace.Header.Title.Extend": "关联", "Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]", "Component.Namespace.Header.Title.Master": "主版本", "Component.Namespace.Header.Title.Grayscale": "灰度版本", "Component.Namespace.Master.LoadNamespace": "加载Namespace", "Component.Namespace.Master.LoadNamespaceTips": "加载Namespace", "Component.Namespace.Master.Items.Changed": "有修改", "Component.Namespace.Master.Items.ChangedUser": "当前修改者", "Component.Namespace.Master.Items.Publish": "发布", "Component.Namespace.Master.Items.PublishTips": "发布配置", "Component.Namespace.Master.Items.Rollback": "回滚", "Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置", "Component.Namespace.Master.Items.PublishHistory": "发布历史", "Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史", "Component.Namespace.Master.Items.Grant": "授权", "Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限", "Component.Namespace.Master.Items.Grayscale": "灰度", "Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本", "Component.Namespace.Master.Items.RequestPermission": "申请配置权限", "Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请", "Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "您不是该应用的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。", "Component.Namespace.Master.Items.ItemList": "表格", "Component.Namespace.Master.Items.ItemListByText": "文本", "Component.Namespace.Master.Items.ItemHistory": "更改历史", "Component.Namespace.Master.Items.ItemInstance": "实例列表", "Component.Namespace.Master.Items.CopyText": "复制文本", "Component.Namespace.Master.Items.GrammarCheck": "语法检查", "Component.Namespace.Master.Items.CancelChanged": "取消修改", "Component.Namespace.Master.Items.Change": "修改配置", "Component.Namespace.Master.Items.SummitChanged": "提交修改", "Component.Namespace.Master.Items.SortByKey": "按Key过滤配置", "Component.Namespace.Master.Items.FilterItem": "过滤配置", "Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置", "Component.Namespace.Master.Items.SyncItem": "同步配置", "Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改", "Component.Namespace.Master.Items.RevokeItem": "撤销配置", "Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置", "Component.Namespace.Master.Items.DiffItem": "比较配置", "Component.Namespace.Master.Items.AddItem": "新增配置", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。", "Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤", "Component.Namespace.Master.Items.Body.PublishState": "发布状态", "Component.Namespace.Master.Items.Body.Sort": "排序", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "备注", "Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Master.Items.Body.ItemOperator": "操作", "Component.Namespace.Master.Items.Body.NoPublish": "未发布", "Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值", "Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值", "Component.Namespace.Master.Items.Body.Published": "已发布", "Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置", "Component.Namespace.Master.Items.Body.ClickToSee": "点击查看", "Component.Namespace.Master.Items.Body.Grayscale": "灰", "Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值", "Component.Namespace.Master.Items.Body.NewAdded": "新", "Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置", "Component.Namespace.Master.Items.Body.Modified": "改", "Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置", "Component.Namespace.Master.Items.Body.Deleted": "删", "Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置", "Component.Namespace.Master.Items.Body.ModifyTips": "修改", "Component.Namespace.Master.Items.Body.DeleteTips": "删除", "Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置", "Component.Namespace.Master.Items.Body.Public.Title": "公共的配置", "Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}应用里关联此namespace", "Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置", "Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史", "Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息", "Component.PublishDeny.Title": "发布受限", "Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人，请找另一个具有当前namespace发布权的人操作发布~", "Component.PublishDeny.Tips2": "（如果是非工作时间或者特殊情况，您可以通过点击'紧急发布'按钮进行发布）", "Component.PublishDeny.EmergencyPublish": "紧急发布", "Component.PublishDeny.Close": "关闭", "Component.Publish.Title": "发布", "Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到，此次发布只会作用于当前环境:{{env}})", "Component.Publish.Grayscale": "灰度发布", "Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)", "Component.Publish.AllPublish": "全量发布", "Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)", "Component.Publish.ToSeeChange": "查看变更", "Component.Publish.PublishedValue": "发布的值", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "未发布的值", "Component.Publish.ModifyUser": "修改人", "Component.Publish.ModifyTime": "修改时间", "Component.Publish.NewAdded": "新", "Component.Publish.NewAddedTips": "新增的配置", "Component.Publish.Modified": "改", "Component.Publish.ModifiedTips": "修改的配置", "Component.Publish.Deleted": "删", "Component.Publish.DeletedTips": "删除的配置", "Component.Publish.MasterValue": "主版本值", "Component.Publish.GrayValue": "灰度版本的值", "Component.Publish.GrayPublishedValue": "灰度版本发布的值", "Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值", "Component.Publish.ItemNoChange": "配置没有变化", "Component.Publish.GrayItemNoChange": "灰度配置没有变化", "Component.Publish.NoGrayItems": "没有灰度的配置项", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "发布", "Component.Rollback.To": "回滚到", "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本", "Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置", "Component.Rollback.ClickToView": "点击查看", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "回滚前", "Component.Rollback.RollbackAfterValue": "回滚后", "Component.Rollback.Added": "新增", "Component.Rollback.Modified": "更新", "Component.Rollback.Deleted": "删除", "Component.Rollback.NoChange": "配置没有变化", "Component.Rollback.OpRollback": "回滚", "Component.ShowText.Title": "查看", "Login.Login": "登录", "Login.UserNameOrPasswordIncorrect": "用户名或密码错误", "Login.LogoutSuccessfully": "登出成功", "Index.MyProject": "我的应用", "Index.CreateProject": "创建应用", "Index.LoadMore": "加载更多", "Index.FavoriteItems": "收藏的应用", "Index.Topping": "置顶", "Index.FavoriteTip": "您还没有收藏过任何应用，在应用主页可以收藏应用哟~", "Index.RecentlyViewedItems": "最近浏览的应用", "Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败", "Index.Topped": "置顶成功", "Index.CancelledFavorite": "取消收藏成功", "Cluster.CreateCluster": "新建集群", "Cluster.Tips.1": "通过添加集群，可以使同一份程序在不同的集群（如不同的数据中心）使用不同的配置", "Cluster.Tips.2": "如果不同集群使用一样的配置，则没有必要创建集群", "Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字， 如SHAJQ（金桥数据中心）、SHAOY（欧阳数据中心)", "Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致", "Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)", "Cluster.ChooseEnvironment": "选择环境", "Cluster.LoadingEnvironmentError": "加载环境信息出错", "Cluster.ClusterCreated": "集群创建成功", "Cluster.ClusterCreateFailed": "集群创建失败", "Cluster.PleaseChooseEnvironment": "请选择环境", "Config.Title": "Apollo配置中心", "Config.AppIdNotFound": "不存在，", "Config.ClickByCreate": "点击创建", "Config.EnvList": "环境列表", "Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置", "Config.ProjectInfo": "应用信息", "Config.ModifyBasicProjectInfo": "修改应用基本信息", "Config.Favorite": "收藏", "Config.CancelFavorite": "取消收藏", "Config.MissEnv": "缺失的环境", "Config.MissNamespace": "缺失的Namespace", "Config.ProjectManage": "管理应用", "Config.AccessKeyManage": "管理密钥", "Config.CreateAppMissEnv": "补缺环境", "Config.CreateAppMissNamespace": "补缺Namespace", "Config.AddCluster": "添加集群", "Config.AddNamespace": "添加Namespace", "Config.CurrentlyOperatorEnv": "当前操作环境", "Config.DoNotRemindAgain": "不再提示", "Config.Note": "注意", "Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群（当前页面）的配置，属于 '{{name}}' 的实例会使用对应集群的配置！", "Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群（当前页面）的配置，只有当对应namespace在当前集群没有发布过配置时，才会使用default集群的配置。", "Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置，客户端获取不到未发布的配置，请及时发布。", "Config.RevokeItem.DialogTitle": "撤销配置", "Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销，确定要撤销么?", "Config.DeleteItem.DialogTitle": "删除配置", "Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?", "Config.PublishNoPermission.DialogTitle": "发布", "Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找应用管理员 '{{masterUsers}}' 分配发布权限", "Config.ModifyNoPermission.DialogTitle": "申请配置权限", "Config.ModifyNoPermission.DialogContent": "请找应用管理员 '{{masterUsers}}' 分配编辑或发布权限", "Config.MasterNoPermission.DialogTitle": "申请配置权限", "Config.MasterNoPermission.DialogContent": "您不是应用管理员， 只有应用管理员才有添加集群、namespace的权限。如需管理员权限，请找应用管理员 '{{masterUsers}}' 分配管理员权限", "Config.NamespaceLocked.DialogTitle": "编辑受限", "Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑，一次发布只能被一个人修改.", "Config.RollbackAlert.DialogTitle": "回滚", "Config.RollbackAlert.DialogContent": "确定要回滚吗?", "Config.EmergencyPublishAlert.DialogTitle": "紧急发布", "Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?", "Config.DeleteBranch.DialogTitle": "删除灰度", "Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置，确定要删除吗?", "Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示", "Config.UpdateRuleTips.DialogContent": "灰度规则已生效，但发现灰度版本有未发布的配置，这些配置需要手动灰度发布才会生效", "Config.MergeAndReleaseDeny.DialogTitle": "全量发布", "Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置，请先发布主版本配置", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示", "Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则，请配置灰度规则", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')，删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId", "Config.SyntaxCheckFailed.DialogTitle": "语法检查错误", "Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示", "Config.CreateBranchTips.DialogTitle": "创建灰度须知", "Config.CreateBranchTips.DialogContent": "通过创建灰度版本，您可以对某些配置做灰度测试<br>灰度流程为:<br>&nbsp;&nbsp;1.创建灰度版本 <br>&nbsp;&nbsp;2.配置灰度配置项<br>&nbsp;&nbsp;3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度，如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br>&nbsp;&nbsp;4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布，所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本，所有的客户端都会使用回主版本的配置<br>注意事项:<br>&nbsp;&nbsp;1.如果灰度版本已经有灰度发布过，那么修改灰度规则后，无需再次灰度发布就立即生效", "Config.ProjectMissEnvInfos": "当前应用有环境缺失，请点击页面左侧『补缺环境』补齐数据", "Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失，请点击页面左侧『补缺Namespace』补齐数据", "Config.SystemError": "系统出错,请重试或联系系统负责人", "Config.FavoriteSuccessfully": "收藏成功", "Config.FavoriteFailed": "收藏失败", "Config.CancelledFavorite": "取消收藏成功", "Config.CancelFavoriteFailed": "取消收藏失败", "Config.GetUserInfoFailed": "获取用户登录信息失败", "Config.LoadingAllNamespaceError": "加载配置信息出错", "Config.CancelFavoriteError": "取消收藏失败", "Config.Deleted": "删除成功", "Config.DeleteFailed": "删除失败", "Config.GrayscaleCreated": "创建灰度成功", "Config.GrayscaleCreateFailed": "创建灰度失败", "Config.BranchDeleted": "分支删除成功", "Config.BranchDeleteFailed": "分支删除失败", "Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace，必须先删除全部已关联的Namespace才能删除公共Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败", "Config.DeleteNamespaceNoPermissionFailedTips": "您没有应用管理员权限，只有管理员才能删除Namespace，请找应用管理员 [{{users}}] 删除Namespace", "Delete.Title": "删除应用、集群、AppNamespace", "Delete.DeleteApp": "删除应用", "Delete.DeleteAppTips": "(由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作)", "Delete.AppIdTips": "(删除前请先查询应用信息)", "Delete.AppInfo": "应用信息", "Delete.DeleteCluster": "删除集群", "Delete.DeleteClusterTips": "(由于删除集群影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该集群的配置后再做删除动作)", "Delete.EnvName": "环境名称", "Delete.ClusterNameTips": "(删除前请先查询应用集群信息)", "Delete.ClusterInfo": "集群信息", "Delete.DeleteNamespace": "删除AppNamespace", "Delete.DeleteNamespaceTips": "（注意，所有环境的Namespace和AppNamespace都会被删除！如果只是要删除某个环境的Namespace，让用户到应用页面中自行删除！）", "Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace，不过无法删除AppNamespace元信息，因为删除AppNamespace影响面较大，所以现在暂时只允许系统管理员删除，对于公共Namespace需要确保没有应用关联了该AppNamespace。", "Delete.AppNamespaceName": "AppNamespace名称", "Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace信息", "Delete.IsRootUserTips": "当前页面只对Apollo管理员开放", "Delete.PleaseEnterAppId": "请输入appId", "Delete.AppIdNotFound": "AppId: '{{appId}}'不存在！", "Delete.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}'", "Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'？", "Delete.Deleted": "删除成功", "Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称", "Delete.ClusterInfoContent": "AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'", "Delete.ConfirmDeleteCluster": "确认删除集群？AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称", "Delete.AppNamespaceInfoContent": "AppId：'{{appId}}' AppNamespace名称：'{{namespace}}' isPublic：'{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace？appId: '{{appId}}' 环境：'所有环境' AppNamespace名称：'{{namespace}}'", "Namespace.Title": "新建Namespace", "Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)", "Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置", "Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置，那么无需关联公共Namespace", "Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何应用读取", "Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置，或多个应用共享同一份配置的需求", "Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置，可以在其它应用那里关联公共Namespace，然后在关联的Namespace里面配置需要覆盖的配置即可", "Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置，那么就不需要在其它应用那里关联公共Namespace", "Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到", "Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置", "Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容", "Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持，可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象，也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去", "Namespace.CreateNamespace": "创建Namespace", "Namespace.AssociationPublicNamespace": "关联公共Namespace", "Namespace.ChooseCluster": "选择集群", "Namespace.NamespaceName": "名称", "Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀", "Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一，添加部门前缀有助于保证全局唯一性)", "Namespace.NamespaceType": "类型", "Namespace.NamespaceType.Public": "public", "Namespace.NamespaceType.Private": "private", "Namespace.Remark": "备注", "Namespace.Namespace": "namespace", "Namespace.PleaseChooseNamespace": "请选择Namespace", "Namespace.LoadingPublicNamespaceError": "加载公共namespace错误", "Namespace.LoadingAppInfoError": "加载App信息出错", "Namespace.PleaseChooseCluster": "请选择集群", "Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀：'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符", "ServiceConfig.Title": "应用配置", "ServiceConfig.Tips": "（维护ApolloPortalDB.ServerConfig表数据，如果已存在配置项则会覆盖，否则会创建配置项。配置更新后，一分钟后自动生效）", "ServiceConfig.Key": "key", "ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)", "ServiceConfig.Value": "value", "ServiceConfig.Comment": "comment", "ServiceConfig.Saved": "保存成功", "ServiceConfig.SaveFailed": "保存失败", "ServiceConfig.PleaseEnterKey": "请输入key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在，点击保存后会创建该配置项", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在，点击保存后会覆盖该配置项", "AccessKey.Tips.1": "每个环境最多可添加5个访问密钥", "AccessKey.Tips.2": "一旦该环境有启用的访问密钥，客户端将被要求配置密钥，否则无法获取配置", "AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置，配置方式如下（需要apollo-client 1.6.0+版本）：", "AccessKey.Tips.3.1": "通过jvm参数-Dapollo.access-key.secret", "AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.access-key.secret（注意多环境secret不一样）", "AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥", "AccessKey.ConfigAccessKeys.Secret": "访问密钥", "AccessKey.ConfigAccessKeys.Status": "状态", "AccessKey.ConfigAccessKeys.LastModify": "最后修改人", "AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间", "AccessKey.ConfigAccessKeys.Operator": "操作", "AccessKey.Operator.Disable": "禁用", "AccessKey.Operator.Enable": "启用", "AccessKey.Operator.Disabled": "已禁用", "AccessKey.Operator.Enabled": "已启用", "AccessKey.Operator.Remove": "删除", "AccessKey.Operator.CreateSuccess": "访问密钥创建成功", "AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功", "AccessKey.Operator.EnabledSuccess": "访问密钥启用成功", "AccessKey.Operator.RemoveSuccess": "访问密钥删除成功", "AccessKey.Operator.CreateError": "访问密钥创建失败", "AccessKey.Operator.DisabledError": "访问密钥禁用失败", "AccessKey.Operator.EnabledError": "访问密钥启用失败", "AccessKey.Operator.RemoveError": "访问密钥删除失败", "AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?", "AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?", "AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?", "AccessKey.LoadError": "加载访问密钥出错", "SystemInfo.Title": "系统信息", "SystemInfo.SystemVersion": "系统版本", "SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置，可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。", "SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "（当前环境状态异常，请结合下方系统信息和AdminService的Check Health结果排查）", "SystemInfo.MetaServerAddress": "Meta server地址", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.Title": "系统权限管理", "SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限", "SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建应用)", "SystemRole.ChooseUser": "用户选择", "SystemRole.Add": "添加", "SystemRole.AuthorizedUser": "已拥有权限用户", "SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限", "SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改应用管理员)", "SystemRole.AppIdTips": "(请先查询应用信息)", "SystemRole.AppInfo": "应用信息", "SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master", "SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master", "SystemRole.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.PleaseChooseUser": "请选择用户名", "SystemRole.Added": "添加成功", "SystemRole.AddFailed": "添加失败", "SystemRole.Deleted": "删除成功", "SystemRole.DeleteFailed": "删除失败", "SystemRole.GetCanCreateProjectUsersError": "获取拥有创建应用权限的用户列表出错", "SystemRole.PleaseEnterAppId": "请输入appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在！", "SystemRole.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}", "SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？", "SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？", "SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "UserMange.Title": "用户管理", "UserMange.TitleTips": "（仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth）", "UserMange.UserName": "用户登录账户", "UserMange.UserDisplayName": "用户名称", "UserMange.UserNameTips": "输入的用户名如果不存在，则新建。若已存在，则更新。", "UserMange.Pwd": "密码", "UserMange.Email": "邮箱", "UserMange.Created": "创建用户成功", "UserMange.CreateFailed": "创建用户失败", "Open.Manage.Title": "开放平台", "Open.Manage.CreateThirdApp": "创建第三方应用", "Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)", "Open.Manage.ThirdAppId": "第三方应用ID", "Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)", "Open.Manage.ThirdAppName": "第三方应用名称", "Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "Open.Manage.ProjectOwner": "应用负责人", "Open.Manage.Create": "创建", "Open.Manage.GrantPermission": "赋权", "Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "被管理的AppId", "Open.Manage.ManagedNamespace": "被管理的Namespace", "Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)", "Open.Manage.GrantType": "授权类型", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "环境", "Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限，如果提示Namespace's role does not exist，请先打开该Namespace的授权页面触发一下权限的初始化动作)", "Open.Manage.PleaseEnterAppId": "请输入appId", "Open.Manage.AppNotCreated": "App('{{appId}}')未创建，请先创建", "Open.Manage.GrantSuccessfully": "赋权成功", "Open.Manage.GrantFailed": "赋权失败", "Namespace.Role.Title": "权限管理", "Namespace.Role.GrantModifyTo": "修改权", "Namespace.Role.GrantModifyTo2": "(可以修改配置)", "Namespace.Role.AllEnv": "所有环境", "Namespace.Role.GrantPublishTo": "发布权", "Namespace.Role.GrantPublishTo2": "(可以发布配置)", "Namespace.Role.Add": "添加", "Namespace.Role.NoPermission": "您没有权限哟!", "Namespace.Role.InitNamespacePermissionError": "初始化授权出错", "Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错", "Namespace.Role.GetGrantUserError": "加载授权用户出错", "Namespace.Role.PleaseChooseUser": "请选择用户", "Namespace.Role.Added": "添加成功", "Namespace.Role.AddFailed": "添加失败", "Namespace.Role.Deleted": "删除成功", "Namespace.Role.DeleteFailed": "删除失败", "Config.Sync.Title": "同步配置", "Config.Sync.FistStep": "(第一步:选择同步信息)", "Config.Sync.SecondStep": "(第二步:检查Diff)", "Config.Sync.PreviousStep": "上一步", "Config.Sync.NextStep": "下一步", "Config.Sync.Sync": "同步", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "通过同步配置功能，可以使多个环境、集群间的配置保持一致", "Config.Sync.Tips2": "需要注意的是，同步完之后需要发布后才会对应用生效", "Config.Sync.SyncNamespace": "同步的Namespace", "Config.Sync.SyncToCluster": "同步到哪个集群", "Config.Sync.NeedToSyncItem": "需要同步的配置", "Config.Sync.SortByLastModifyTime": "按最后更新时间过滤", "Config.Sync.BeginTime": "开始时间", "Config.Sync.EndTime": "结束时间", "Config.Sync.Filter": "过滤", "Config.Sync.Rest": "重置", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "没有更新的配置", "Config.Sync.IgnoreSync": "忽略同步", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "同步前", "Config.Sync.Step2SyncAfter": "同步后", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "操作", "Config.Sync.NewAdd": "新增", "Config.Sync.NoSyncItem": "不同步该配置", "Config.Sync.Delete": "删除", "Config.Sync.Update": "更新", "Config.Sync.SyncSuccessfully": "同步成功!", "Config.Sync.SyncFailed": "同步失败!", "Config.Sync.LoadingItemsError": "加载配置出错", "Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置", "Config.Sync.PleaseChooseCluster": "请选择集群", "Config.History.Title": "发布历史", "Config.History.MasterVersionPublish": "主版本发布", "Config.History.MasterVersionRollback": "主版本回滚", "Config.History.GrayscaleOperator": "灰度操作", "Config.History.PublishHistory": "发布历史", "Config.History.OperationType0": "普通发布", "Config.History.OperationType1": "回滚", "Config.History.OperationType2": "灰度发布", "Config.History.OperationType3": "更新灰度规则", "Config.History.OperationType4": "灰度全量发布", "Config.History.OperationType5": "灰度发布(主版本发布)", "Config.History.OperationType6": "灰度发布(主版本回滚)", "Config.History.OperationType7": "放弃灰度", "Config.History.OperationType8": "删除灰度(全量发布)", "Config.History.UrgentPublish": "紧急发布", "Config.History.LoadMore": "加载更多", "Config.History.Abandoned": "已废弃", "Config.History.RollbackTo": "回滚到此版本", "Config.History.RollbackToTips": "回滚已发布的配置到此版本", "Config.History.ChangedItem": "变更的配置", "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更", "Config.History.AllItem": "全部配置", "Config.History.AllItemTips": "查看此次发布的所有配置信息", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "新增", "Config.History.ChangeTypeModify": "修改", "Config.History.ChangeTypeDelete": "删除", "Config.History.NoChange": "无配置更改", "Config.History.NoItem": "无配置", "Config.History.GrayscaleRule": "灰度规则", "Config.History.GrayscaleAppId": "灰度的AppId", "Config.History.GrayscaleIp": "灰度的IP", "Config.History.NoGrayscaleRule": "无灰度规则", "Config.History.NoPermissionTips": "您不是该应用的管理员，也没有该Namespace的编辑或发布权限，无法查看发布历史", "Config.History.NoPublishHistory": "无发布历史信息", "Config.History.LoadingHistoryError": "无发布历史信息", "Config.Diff.Title": "比较配置", "Config.Diff.FirstStep": "(第一步:选择比较信息)", "Config.Diff.SecondStep": "(第二步:查看差异配置)", "Config.Diff.PreviousStep": "上一步", "Config.Diff.NextStep": "下一步", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异", "Config.Diff.DiffCluster": "要比较的集群", "Config.Diff.HasDiffComment": "是否比较注释", "Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群", "ConfigExport.Title": "配置导出", "ConfigExport.TitleTips" : "超级管理员会下载所有应用的配置，普通用户只会下载自己应用的配置", "ConfigExport.Download": "下载", "App.CreateProject": "创建应用", "App.AppIdTips": "（应用唯一标识）", "App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.AppOwnerTips": "(开启应用管理员分配权限控制后，应用负责人和应用管理员默认为本账号，不可选择)", "App.AppAdminTips1": "(应用负责人默认具有应用管理员权限，", "App.AppAdminTips2": "应用管理员可以创建Namespace和集群、分配用户权限)", "App.AccessKey.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限", "App.Setting.Title": "应用管理", "App.Setting.Admin": "管理员", "App.Setting.AdminTips": "(应用管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理应用、Namespace权限)", "App.Setting.Add": "添加", "App.Setting.BasicInfo": "基本信息", "App.Setting.ProjectName": "应用名称", "App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.Setting.ProjectOwner": "应用负责人", "App.Setting.Modify": "修改应用信息", "App.Setting.Cancel": "取消修改", "App.Setting.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限", "App.Setting.DeleteAdmin": "删除管理员", "App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员", "App.Setting.PleaseChooseUser": "请选择用户", "App.Setting.Added": "添加成功", "App.Setting.AddFailed": "添加失败", "App.Setting.Deleted": "删除成功", "App.Setting.DeleteFailed": "删除失败", "App.Setting.Modified": "修改成功", "Valdr.App.AppId.Size": "AppId长度不能多于64个字符", "Valdr.App.AppId.Required": "AppId不能为空", "Valdr.App.appName.Size": "应用名称长度不能多于128个字符", "Valdr.App.appName.Required": "应用名称不能为空", "Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符", "Valdr.Cluster.ClusterName.Required": "集群名称不能为空", "Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符", "Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空", "Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符", "Valdr.Item.Key.Size": "Key长度不能多于128个字符", "Valdr.Item.Key.Required": "Key不能为空", "Valdr.Item.Comment.Size": "备注长度不能多于256个字符", "Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符", "Valdr.Release.ReleaseName.Required": "Release Name不能为空", "Valdr.Release.Comment.Size": "备注长度不能多于256个字符", "ApolloConfirmDialog.DefaultConfirmBtnName": "确认", "ApolloConfirmDialog.SearchPlaceHolder": "搜索应用(AppId、应用名)", "RulesModal.ChooseInstances": "从实例列表中选择", "RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空", "RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则", "RulesModal.IpListCanNotBeNull": "IP列表不能为空", "ItemModal.KeyExists": "key='{{key}}' 已存在", "ItemModal.AddedTips": "添加成功,如需生效请发布", "ItemModal.AddFailed": "添加失败", "ItemModal.PleaseChooseCluster": "请选择集群", "ItemModal.ModifiedTips": "更新成功, 如需生效请发布", "ItemModal.ModifyFailed": "更新失败", "ItemModal.Tabs": "制表符", "ItemModal.NewLine": "换行符", "ItemModal.Space": "空格", "ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错", "ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错", "ApolloNsPanel.Deleted": "删除成功", "ApolloNsPanel.GrayscaleModified": "灰度规则更新成功", "ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败", "ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布", "ApolloNsPanel.ModifyFailed": "更新失败", "ApolloNsPanel.GrammarIsRight": "语法正确！", "ReleaseModal.Published": "发布成功", "ReleaseModal.PublishFailed": "发布失败", "ReleaseModal.GrayscalePublished": "灰度发布成功", "ReleaseModal.GrayscalePublishFailed": "灰度发布失败", "ReleaseModal.AllPublished": "全量发布成功", "ReleaseModal.AllPublishFailed": "全量发布失败", "Rollback.NoRollbackList": "没有可以回滚的发布历史", "Rollback.SameAsCurrentRelease": "该版本与当前版本相同", "Rollback.RollbackSuccessfully": "回滚成功", "Rollback.RollbackFailed": "回滚失败", "Revoke.RevokeFailed": "撤销失败", "Revoke.RevokeSuccessfully": "撤销成功" }
{ "Common.Title": "Apollo配置中心", "Common.Ctrip": "携程", "Common.CtripDepartment": "框架研发部", "Common.Nav.ShowNavBar": "显示导航栏", "Common.Nav.HideNavBar": "隐藏导航栏", "Common.Nav.Help": "帮助", "Common.Nav.AdminTools": "管理员工具", "Common.Nav.NonAdminTools": "工具", "Common.Nav.UserManage": "用户管理", "Common.Nav.SystemRoleManage": "系统权限管理", "Common.Nav.OpenMange": "开放平台授权管理", "Common.Nav.SystemConfig": "系统参数", "Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace", "Common.Nav.SystemInfo": "系统信息", "Common.Nav.ConfigExport": "配置导出", "Common.Nav.Logout": "退出", "Common.Department": "部门", "Common.Cluster": "集群", "Common.Environment": "环境", "Common.Email": "邮箱", "Common.AppId": "AppId", "Common.Namespace": "Namespace", "Common.AppName": "应用名称", "Common.AppOwner": "负责人", "Common.AppOwnerLong": "应用负责人", "Common.AppAdmin": "应用管理员", "Common.ClusterName": "集群名称", "Common.Submit": "提交", "Common.Save": "保存", "Common.Created": "创建成功", "Common.CreateFailed": "创建失败", "Common.Deleted": "删除成功", "Common.DeleteFailed": "删除失败", "Common.ReturnToIndex": "返回到应用首页", "Common.Cancel": "取消", "Common.Ok": "确定", "Common.Search": "查询", "Common.IsRootUser": "当前页面只对Apollo管理员开放", "Common.PleaseChooseDepartment": "请选择部门", "Common.PleaseChooseOwner": "请选择应用负责人", "Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试", "Component.DeleteNamespace.Title": "删除Namespace", "Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置，确定要删除吗?", "Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置，且页面会提示缺失Namespace（除非使用管理员工具删除AppNamespace），确定要删除吗?", "Component.GrayscalePublishRule.Title": "编辑灰度规则", "Component.GrayscalePublishRule.AppId": "灰度的AppId", "Component.GrayscalePublishRule.AcceptRule": "灰度应用规则", "Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例", "Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例", "Component.GrayscalePublishRule.IP": "灰度的IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)", "Component.GrayscalePublishRule.IpTips": "没找到你想要的IP？可以", "Component.GrayscalePublishRule.EnterIp": "手动输入IP", "Component.GrayscalePublishRule.EnterIpTips": "输入IP列表，英文逗号隔开，输入完后点击添加按钮", "Component.GrayscalePublishRule.Add": "添加", "Component.ConfigItem.Title": "添加配置项", "Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)", "Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项", "Component.ConfigItem.ModifyItem": "修改配置项", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错，如果需要检测Value中隐藏字符，请点击", "Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符", "Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "选择集群", "Component.MergePublish.Title": "全量发布", "Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支，并发布。", "Component.MergePublish.NextStep": "全量发布后,您希望", "Component.MergePublish.DeleteGrayscale": "删除灰度版本", "Component.MergePublish.ReservedGrayscale": "保留灰度版本", "Component.Namespace.Branch.IsChanged": "有修改", "Component.Namespace.Branch.ChangeUser": "当前修改者", "Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布", "Component.Namespace.Branch.GrayscalePublish": "灰度发布", "Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置", "Component.Namespace.Branch.AllPublish": "全量发布", "Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本", "Component.Namespace.Branch.DiscardGrayscale": "放弃灰度", "Component.Namespace.Branch.NoPermissionTips": "您不是该应用的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。", "Component.Namespace.Branch.Tab.Configuration": "配置", "Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则", "Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表", "Component.Namespace.Branch.Tab.ChangeHistory": "更改历史", "Component.Namespace.Branch.Body.Item": "灰度的配置", "Component.Namespace.Branch.Body.AddedItem": "新增灰度配置", "Component.Namespace.Branch.Body.PublishState": "发布状态", "Component.Namespace.Branch.Body.ItemSort": "排序", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值", "Component.Namespace.Branch.Body.ItemComment": "备注", "Component.Namespace.Branch.Body.ItemLastModify": "最后修改人", "Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Branch.Body.ItemOperator": "操作", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.Branch.Body.ItemNoPublish": "未发布", "Component.Namespace.Branch.Body.ItemPublished": "已发布", "Component.Namespace.Branch.Body.ItemEffective": "已生效的配置", "Component.Namespace.Branch.Body.ClickToSee": "点击查看", "Component.Namespace.Branch.Body.DeletedItem": "删除的配置", "Component.Namespace.Branch.Body.Delete": "删", "Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置", "Component.Namespace.Branch.Body.ModifiedItem": "修改的配置", "Component.Namespace.Branch.Body.Modify": "改", "Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置", "Component.Namespace.Branch.Body.Added": "新", "Component.Namespace.Branch.Body.Op.Modify": "修改", "Component.Namespace.Branch.Body.Op.Delete": "删除", "Component.Namespace.MasterBranch.Body.Title": "主版本的配置", "Component.Namespace.MasterBranch.Body.PublishState": "发布状态", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "备注", "Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.MasterBranch.Body.ItemOperator": "操作", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布", "Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置", "Component.Namespace.MasterBranch.Body.ItemPublished": "已发布", "Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置", "Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找应用管理员申请权限.", "Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表", "Component.Namespace.Branch.GrayScaleRule.Operator": "操作", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "修改", "Component.Namespace.Branch.GrayScaleRule.Delete": "删除", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则", "Component.Namespace.Branch.Instance.RefreshList": "刷新列表", "Component.Namespace.Branch.Instance.ItemToSee": "查看配置", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间", "Component.Namespace.Branch.Instance.LoadMore": "刷新列表", "Component.Namespace.Branch.Instance.NoInstance": "无实例信息", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "新增", "Component.Namespace.Branch.History.Modified": "更新", "Component.Namespace.Branch.History.Deleted": "删除", "Component.Namespace.Branch.History.LoadMore": "加载更多", "Component.Namespace.Branch.History.NoHistory": "无更改历史", "Component.Namespace.Header.Title.Private": "私有", "Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.Public": "公共", "Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到", "Component.Namespace.Header.Title.Extend": "关联", "Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]", "Component.Namespace.Header.Title.Master": "主版本", "Component.Namespace.Header.Title.Grayscale": "灰度版本", "Component.Namespace.Master.LoadNamespace": "加载Namespace", "Component.Namespace.Master.LoadNamespaceTips": "加载Namespace", "Component.Namespace.Master.Items.Changed": "有修改", "Component.Namespace.Master.Items.ChangedUser": "当前修改者", "Component.Namespace.Master.Items.Publish": "发布", "Component.Namespace.Master.Items.PublishTips": "发布配置", "Component.Namespace.Master.Items.Rollback": "回滚", "Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置", "Component.Namespace.Master.Items.PublishHistory": "发布历史", "Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史", "Component.Namespace.Master.Items.Grant": "授权", "Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限", "Component.Namespace.Master.Items.Grayscale": "灰度", "Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本", "Component.Namespace.Master.Items.RequestPermission": "申请配置权限", "Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请", "Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "您不是该应用的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。", "Component.Namespace.Master.Items.ItemList": "表格", "Component.Namespace.Master.Items.ItemListByText": "文本", "Component.Namespace.Master.Items.ItemHistory": "更改历史", "Component.Namespace.Master.Items.ItemInstance": "实例列表", "Component.Namespace.Master.Items.CopyText": "复制文本", "Component.Namespace.Master.Items.GrammarCheck": "语法检查", "Component.Namespace.Master.Items.CancelChanged": "取消修改", "Component.Namespace.Master.Items.Change": "修改配置", "Component.Namespace.Master.Items.SummitChanged": "提交修改", "Component.Namespace.Master.Items.SortByKey": "按Key过滤配置", "Component.Namespace.Master.Items.FilterItem": "过滤配置", "Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置", "Component.Namespace.Master.Items.SyncItem": "同步配置", "Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改", "Component.Namespace.Master.Items.RevokeItem": "撤销配置", "Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置", "Component.Namespace.Master.Items.DiffItem": "比较配置", "Component.Namespace.Master.Items.AddItem": "新增配置", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。", "Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤", "Component.Namespace.Master.Items.Body.PublishState": "发布状态", "Component.Namespace.Master.Items.Body.Sort": "排序", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "备注", "Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Master.Items.Body.ItemOperator": "操作", "Component.Namespace.Master.Items.Body.NoPublish": "未发布", "Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值", "Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值", "Component.Namespace.Master.Items.Body.Published": "已发布", "Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置", "Component.Namespace.Master.Items.Body.ClickToSee": "点击查看", "Component.Namespace.Master.Items.Body.Grayscale": "灰", "Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值", "Component.Namespace.Master.Items.Body.NewAdded": "新", "Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置", "Component.Namespace.Master.Items.Body.Modified": "改", "Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置", "Component.Namespace.Master.Items.Body.Deleted": "删", "Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置", "Component.Namespace.Master.Items.Body.ModifyTips": "修改", "Component.Namespace.Master.Items.Body.DeleteTips": "删除", "Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置", "Component.Namespace.Master.Items.Body.Public.Title": "公共的配置", "Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}应用里关联此namespace", "Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置", "Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory": "过滤更改历史", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey": "按key过滤更改历史", "Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息", "Component.PublishDeny.Title": "发布受限", "Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人，请找另一个具有当前namespace发布权的人操作发布~", "Component.PublishDeny.Tips2": "（如果是非工作时间或者特殊情况，您可以通过点击'紧急发布'按钮进行发布）", "Component.PublishDeny.EmergencyPublish": "紧急发布", "Component.PublishDeny.Close": "关闭", "Component.Publish.Title": "发布", "Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到，此次发布只会作用于当前环境:{{env}})", "Component.Publish.Grayscale": "灰度发布", "Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)", "Component.Publish.AllPublish": "全量发布", "Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)", "Component.Publish.ToSeeChange": "查看变更", "Component.Publish.PublishedValue": "发布的值", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "未发布的值", "Component.Publish.ModifyUser": "修改人", "Component.Publish.ModifyTime": "修改时间", "Component.Publish.NewAdded": "新", "Component.Publish.NewAddedTips": "新增的配置", "Component.Publish.Modified": "改", "Component.Publish.ModifiedTips": "修改的配置", "Component.Publish.Deleted": "删", "Component.Publish.DeletedTips": "删除的配置", "Component.Publish.MasterValue": "主版本值", "Component.Publish.GrayValue": "灰度版本的值", "Component.Publish.GrayPublishedValue": "灰度版本发布的值", "Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值", "Component.Publish.ItemNoChange": "配置没有变化", "Component.Publish.GrayItemNoChange": "灰度配置没有变化", "Component.Publish.NoGrayItems": "没有灰度的配置项", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "发布", "Component.Rollback.To": "回滚到", "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本", "Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置", "Component.Rollback.ClickToView": "点击查看", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "回滚前", "Component.Rollback.RollbackAfterValue": "回滚后", "Component.Rollback.Added": "新增", "Component.Rollback.Modified": "更新", "Component.Rollback.Deleted": "删除", "Component.Rollback.NoChange": "配置没有变化", "Component.Rollback.OpRollback": "回滚", "Component.ShowText.Title": "查看", "Login.Login": "登录", "Login.UserNameOrPasswordIncorrect": "用户名或密码错误", "Login.LogoutSuccessfully": "登出成功", "Index.MyProject": "我的应用", "Index.CreateProject": "创建应用", "Index.LoadMore": "加载更多", "Index.FavoriteItems": "收藏的应用", "Index.Topping": "置顶", "Index.FavoriteTip": "您还没有收藏过任何应用，在应用主页可以收藏应用哟~", "Index.RecentlyViewedItems": "最近浏览的应用", "Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败", "Index.Topped": "置顶成功", "Index.CancelledFavorite": "取消收藏成功", "Cluster.CreateCluster": "新建集群", "Cluster.Tips.1": "通过添加集群，可以使同一份程序在不同的集群（如不同的数据中心）使用不同的配置", "Cluster.Tips.2": "如果不同集群使用一样的配置，则没有必要创建集群", "Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字， 如SHAJQ（金桥数据中心）、SHAOY（欧阳数据中心)", "Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致", "Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)", "Cluster.ChooseEnvironment": "选择环境", "Cluster.LoadingEnvironmentError": "加载环境信息出错", "Cluster.ClusterCreated": "集群创建成功", "Cluster.ClusterCreateFailed": "集群创建失败", "Cluster.PleaseChooseEnvironment": "请选择环境", "Config.Title": "Apollo配置中心", "Config.AppIdNotFound": "不存在，", "Config.ClickByCreate": "点击创建", "Config.EnvList": "环境列表", "Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置", "Config.ProjectInfo": "应用信息", "Config.ModifyBasicProjectInfo": "修改应用基本信息", "Config.Favorite": "收藏", "Config.CancelFavorite": "取消收藏", "Config.MissEnv": "缺失的环境", "Config.MissNamespace": "缺失的Namespace", "Config.ProjectManage": "管理应用", "Config.AccessKeyManage": "管理密钥", "Config.CreateAppMissEnv": "补缺环境", "Config.CreateAppMissNamespace": "补缺Namespace", "Config.AddCluster": "添加集群", "Config.AddNamespace": "添加Namespace", "Config.CurrentlyOperatorEnv": "当前操作环境", "Config.DoNotRemindAgain": "不再提示", "Config.Note": "注意", "Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群（当前页面）的配置，属于 '{{name}}' 的实例会使用对应集群的配置！", "Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群（当前页面）的配置，只有当对应namespace在当前集群没有发布过配置时，才会使用default集群的配置。", "Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置，客户端获取不到未发布的配置，请及时发布。", "Config.RevokeItem.DialogTitle": "撤销配置", "Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销，确定要撤销么?", "Config.DeleteItem.DialogTitle": "删除配置", "Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?", "Config.PublishNoPermission.DialogTitle": "发布", "Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找应用管理员 '{{masterUsers}}' 分配发布权限", "Config.ModifyNoPermission.DialogTitle": "申请配置权限", "Config.ModifyNoPermission.DialogContent": "请找应用管理员 '{{masterUsers}}' 分配编辑或发布权限", "Config.MasterNoPermission.DialogTitle": "申请配置权限", "Config.MasterNoPermission.DialogContent": "您不是应用管理员， 只有应用管理员才有添加集群、namespace的权限。如需管理员权限，请找应用管理员 '{{masterUsers}}' 分配管理员权限", "Config.NamespaceLocked.DialogTitle": "编辑受限", "Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑，一次发布只能被一个人修改.", "Config.RollbackAlert.DialogTitle": "回滚", "Config.RollbackAlert.DialogContent": "确定要回滚吗?", "Config.EmergencyPublishAlert.DialogTitle": "紧急发布", "Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?", "Config.DeleteBranch.DialogTitle": "删除灰度", "Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置，确定要删除吗?", "Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示", "Config.UpdateRuleTips.DialogContent": "灰度规则已生效，但发现灰度版本有未发布的配置，这些配置需要手动灰度发布才会生效", "Config.MergeAndReleaseDeny.DialogTitle": "全量发布", "Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置，请先发布主版本配置", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示", "Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则，请配置灰度规则", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')，删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置，删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息，如确认相关实例都已经不再使用该Namespace配置，可以联系Apollo相关负责人删除实例信息（InstanceConfig）或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId", "Config.SyntaxCheckFailed.DialogTitle": "语法检查错误", "Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示", "Config.CreateBranchTips.DialogTitle": "创建灰度须知", "Config.CreateBranchTips.DialogContent": "通过创建灰度版本，您可以对某些配置做灰度测试<br>灰度流程为:<br>&nbsp;&nbsp;1.创建灰度版本 <br>&nbsp;&nbsp;2.配置灰度配置项<br>&nbsp;&nbsp;3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度，如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br>&nbsp;&nbsp;4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布，所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本，所有的客户端都会使用回主版本的配置<br>注意事项:<br>&nbsp;&nbsp;1.如果灰度版本已经有灰度发布过，那么修改灰度规则后，无需再次灰度发布就立即生效", "Config.ProjectMissEnvInfos": "当前应用有环境缺失，请点击页面左侧『补缺环境』补齐数据", "Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失，请点击页面左侧『补缺Namespace』补齐数据", "Config.SystemError": "系统出错,请重试或联系系统负责人", "Config.FavoriteSuccessfully": "收藏成功", "Config.FavoriteFailed": "收藏失败", "Config.CancelledFavorite": "取消收藏成功", "Config.CancelFavoriteFailed": "取消收藏失败", "Config.GetUserInfoFailed": "获取用户登录信息失败", "Config.LoadingAllNamespaceError": "加载配置信息出错", "Config.CancelFavoriteError": "取消收藏失败", "Config.Deleted": "删除成功", "Config.DeleteFailed": "删除失败", "Config.GrayscaleCreated": "创建灰度成功", "Config.GrayscaleCreateFailed": "创建灰度失败", "Config.BranchDeleted": "分支删除成功", "Config.BranchDeleteFailed": "分支删除失败", "Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace，必须先删除全部已关联的Namespace才能删除公共Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败", "Config.DeleteNamespaceNoPermissionFailedTips": "您没有应用管理员权限，只有管理员才能删除Namespace，请找应用管理员 [{{users}}] 删除Namespace", "Delete.Title": "删除应用、集群、AppNamespace", "Delete.DeleteApp": "删除应用", "Delete.DeleteAppTips": "(由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作)", "Delete.AppIdTips": "(删除前请先查询应用信息)", "Delete.AppInfo": "应用信息", "Delete.DeleteCluster": "删除集群", "Delete.DeleteClusterTips": "(由于删除集群影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该集群的配置后再做删除动作)", "Delete.EnvName": "环境名称", "Delete.ClusterNameTips": "(删除前请先查询应用集群信息)", "Delete.ClusterInfo": "集群信息", "Delete.DeleteNamespace": "删除AppNamespace", "Delete.DeleteNamespaceTips": "（注意，所有环境的Namespace和AppNamespace都会被删除！如果只是要删除某个环境的Namespace，让用户到应用页面中自行删除！）", "Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace，不过无法删除AppNamespace元信息，因为删除AppNamespace影响面较大，所以现在暂时只允许系统管理员删除，对于公共Namespace需要确保没有应用关联了该AppNamespace。", "Delete.AppNamespaceName": "AppNamespace名称", "Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace信息", "Delete.IsRootUserTips": "当前页面只对Apollo管理员开放", "Delete.PleaseEnterAppId": "请输入appId", "Delete.AppIdNotFound": "AppId: '{{appId}}'不存在！", "Delete.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}'", "Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'？", "Delete.Deleted": "删除成功", "Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称", "Delete.ClusterInfoContent": "AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'", "Delete.ConfirmDeleteCluster": "确认删除集群？AppId：'{{appId}}' 环境：'{{env}}' 集群名称：'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称", "Delete.AppNamespaceInfoContent": "AppId：'{{appId}}' AppNamespace名称：'{{namespace}}' isPublic：'{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace？appId: '{{appId}}' 环境：'所有环境' AppNamespace名称：'{{namespace}}'", "Namespace.Title": "新建Namespace", "Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)", "Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置", "Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置，那么无需关联公共Namespace", "Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何应用读取", "Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置，或多个应用共享同一份配置的需求", "Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置，可以在其它应用那里关联公共Namespace，然后在关联的Namespace里面配置需要覆盖的配置即可", "Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置，那么就不需要在其它应用那里关联公共Namespace", "Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到", "Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置", "Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容", "Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持，可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象，也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去", "Namespace.CreateNamespace": "创建Namespace", "Namespace.AssociationPublicNamespace": "关联公共Namespace", "Namespace.ChooseCluster": "选择集群", "Namespace.NamespaceName": "名称", "Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀", "Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一，添加部门前缀有助于保证全局唯一性)", "Namespace.NamespaceType": "类型", "Namespace.NamespaceType.Public": "public", "Namespace.NamespaceType.Private": "private", "Namespace.Remark": "备注", "Namespace.Namespace": "namespace", "Namespace.PleaseChooseNamespace": "请选择Namespace", "Namespace.LoadingPublicNamespaceError": "加载公共namespace错误", "Namespace.LoadingAppInfoError": "加载App信息出错", "Namespace.PleaseChooseCluster": "请选择集群", "Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀：'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符", "ServiceConfig.Title": "应用配置", "ServiceConfig.Tips": "（维护ApolloPortalDB.ServerConfig表数据，如果已存在配置项则会覆盖，否则会创建配置项。配置更新后，一分钟后自动生效）", "ServiceConfig.Key": "key", "ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)", "ServiceConfig.Value": "value", "ServiceConfig.Comment": "comment", "ServiceConfig.Saved": "保存成功", "ServiceConfig.SaveFailed": "保存失败", "ServiceConfig.PleaseEnterKey": "请输入key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在，点击保存后会创建该配置项", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在，点击保存后会覆盖该配置项", "AccessKey.Tips.1": "每个环境最多可添加5个访问密钥", "AccessKey.Tips.2": "一旦该环境有启用的访问密钥，客户端将被要求配置密钥，否则无法获取配置", "AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置，配置方式如下（需要apollo-client 1.6.0+版本）：", "AccessKey.Tips.3.1": "通过jvm参数-Dapollo.access-key.secret", "AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.access-key.secret（注意多环境secret不一样）", "AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥", "AccessKey.ConfigAccessKeys.Secret": "访问密钥", "AccessKey.ConfigAccessKeys.Status": "状态", "AccessKey.ConfigAccessKeys.LastModify": "最后修改人", "AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间", "AccessKey.ConfigAccessKeys.Operator": "操作", "AccessKey.Operator.Disable": "禁用", "AccessKey.Operator.Enable": "启用", "AccessKey.Operator.Disabled": "已禁用", "AccessKey.Operator.Enabled": "已启用", "AccessKey.Operator.Remove": "删除", "AccessKey.Operator.CreateSuccess": "访问密钥创建成功", "AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功", "AccessKey.Operator.EnabledSuccess": "访问密钥启用成功", "AccessKey.Operator.RemoveSuccess": "访问密钥删除成功", "AccessKey.Operator.CreateError": "访问密钥创建失败", "AccessKey.Operator.DisabledError": "访问密钥禁用失败", "AccessKey.Operator.EnabledError": "访问密钥启用失败", "AccessKey.Operator.RemoveError": "访问密钥删除失败", "AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?", "AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?", "AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?", "AccessKey.LoadError": "加载访问密钥出错", "SystemInfo.Title": "系统信息", "SystemInfo.SystemVersion": "系统版本", "SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置，可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。", "SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息，更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "（当前环境状态异常，请结合下方系统信息和AdminService的Check Health结果排查）", "SystemInfo.MetaServerAddress": "Meta server地址", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.Title": "系统权限管理", "SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限", "SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建应用)", "SystemRole.ChooseUser": "用户选择", "SystemRole.Add": "添加", "SystemRole.AuthorizedUser": "已拥有权限用户", "SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限", "SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改应用管理员)", "SystemRole.AppIdTips": "(请先查询应用信息)", "SystemRole.AppInfo": "应用信息", "SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master", "SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master", "SystemRole.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.PleaseChooseUser": "请选择用户名", "SystemRole.Added": "添加成功", "SystemRole.AddFailed": "添加失败", "SystemRole.Deleted": "删除成功", "SystemRole.DeleteFailed": "删除失败", "SystemRole.GetCanCreateProjectUsersError": "获取拥有创建应用权限的用户列表出错", "SystemRole.PleaseEnterAppId": "请输入appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在！", "SystemRole.AppInfoContent": "应用名：'{{appName}}' 部门：'{{departmentName}}({{departmentId}})' 负责人：'{{ownerName}}", "SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？", "SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限？", "SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "UserMange.Title": "用户管理", "UserMange.TitleTips": "（仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth）", "UserMange.UserName": "用户登录账户", "UserMange.UserDisplayName": "用户名称", "UserMange.UserNameTips": "输入的用户名如果不存在，则新建。若已存在，则更新。", "UserMange.Pwd": "密码", "UserMange.Email": "邮箱", "UserMange.Created": "创建用户成功", "UserMange.CreateFailed": "创建用户失败", "Open.Manage.Title": "开放平台", "Open.Manage.CreateThirdApp": "创建第三方应用", "Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)", "Open.Manage.ThirdAppId": "第三方应用ID", "Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)", "Open.Manage.ThirdAppName": "第三方应用名称", "Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "Open.Manage.ProjectOwner": "应用负责人", "Open.Manage.Create": "创建", "Open.Manage.GrantPermission": "赋权", "Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "被管理的AppId", "Open.Manage.ManagedNamespace": "被管理的Namespace", "Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀，例如apollo.xml)", "Open.Manage.GrantType": "授权类型", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "环境", "Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限，如果提示Namespace's role does not exist，请先打开该Namespace的授权页面触发一下权限的初始化动作)", "Open.Manage.PleaseEnterAppId": "请输入appId", "Open.Manage.AppNotCreated": "App('{{appId}}')未创建，请先创建", "Open.Manage.GrantSuccessfully": "赋权成功", "Open.Manage.GrantFailed": "赋权失败", "Namespace.Role.Title": "权限管理", "Namespace.Role.GrantModifyTo": "修改权", "Namespace.Role.GrantModifyTo2": "(可以修改配置)", "Namespace.Role.AllEnv": "所有环境", "Namespace.Role.GrantPublishTo": "发布权", "Namespace.Role.GrantPublishTo2": "(可以发布配置)", "Namespace.Role.Add": "添加", "Namespace.Role.NoPermission": "您没有权限哟!", "Namespace.Role.InitNamespacePermissionError": "初始化授权出错", "Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错", "Namespace.Role.GetGrantUserError": "加载授权用户出错", "Namespace.Role.PleaseChooseUser": "请选择用户", "Namespace.Role.Added": "添加成功", "Namespace.Role.AddFailed": "添加失败", "Namespace.Role.Deleted": "删除成功", "Namespace.Role.DeleteFailed": "删除失败", "Config.Sync.Title": "同步配置", "Config.Sync.FistStep": "(第一步:选择同步信息)", "Config.Sync.SecondStep": "(第二步:检查Diff)", "Config.Sync.PreviousStep": "上一步", "Config.Sync.NextStep": "下一步", "Config.Sync.Sync": "同步", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "通过同步配置功能，可以使多个环境、集群间的配置保持一致", "Config.Sync.Tips2": "需要注意的是，同步完之后需要发布后才会对应用生效", "Config.Sync.SyncNamespace": "同步的Namespace", "Config.Sync.SyncToCluster": "同步到哪个集群", "Config.Sync.NeedToSyncItem": "需要同步的配置", "Config.Sync.SortByLastModifyTime": "按最后更新时间过滤", "Config.Sync.BeginTime": "开始时间", "Config.Sync.EndTime": "结束时间", "Config.Sync.Filter": "过滤", "Config.Sync.Rest": "重置", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "没有更新的配置", "Config.Sync.IgnoreSync": "忽略同步", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "同步前", "Config.Sync.Step2SyncAfter": "同步后", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "操作", "Config.Sync.NewAdd": "新增", "Config.Sync.NoSyncItem": "不同步该配置", "Config.Sync.Delete": "删除", "Config.Sync.Update": "更新", "Config.Sync.SyncSuccessfully": "同步成功!", "Config.Sync.SyncFailed": "同步失败!", "Config.Sync.LoadingItemsError": "加载配置出错", "Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置", "Config.Sync.PleaseChooseCluster": "请选择集群", "Config.History.Title": "发布历史", "Config.History.MasterVersionPublish": "主版本发布", "Config.History.MasterVersionRollback": "主版本回滚", "Config.History.GrayscaleOperator": "灰度操作", "Config.History.PublishHistory": "发布历史", "Config.History.OperationType0": "普通发布", "Config.History.OperationType1": "回滚", "Config.History.OperationType2": "灰度发布", "Config.History.OperationType3": "更新灰度规则", "Config.History.OperationType4": "灰度全量发布", "Config.History.OperationType5": "灰度发布(主版本发布)", "Config.History.OperationType6": "灰度发布(主版本回滚)", "Config.History.OperationType7": "放弃灰度", "Config.History.OperationType8": "删除灰度(全量发布)", "Config.History.UrgentPublish": "紧急发布", "Config.History.LoadMore": "加载更多", "Config.History.Abandoned": "已废弃", "Config.History.RollbackTo": "回滚到此版本", "Config.History.RollbackToTips": "回滚已发布的配置到此版本", "Config.History.ChangedItem": "变更的配置", "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更", "Config.History.AllItem": "全部配置", "Config.History.AllItemTips": "查看此次发布的所有配置信息", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "新增", "Config.History.ChangeTypeModify": "修改", "Config.History.ChangeTypeDelete": "删除", "Config.History.NoChange": "无配置更改", "Config.History.NoItem": "无配置", "Config.History.GrayscaleRule": "灰度规则", "Config.History.GrayscaleAppId": "灰度的AppId", "Config.History.GrayscaleIp": "灰度的IP", "Config.History.NoGrayscaleRule": "无灰度规则", "Config.History.NoPermissionTips": "您不是该应用的管理员，也没有该Namespace的编辑或发布权限，无法查看发布历史", "Config.History.NoPublishHistory": "无发布历史信息", "Config.History.LoadingHistoryError": "无发布历史信息", "Config.Diff.Title": "比较配置", "Config.Diff.FirstStep": "(第一步:选择比较信息)", "Config.Diff.SecondStep": "(第二步:查看差异配置)", "Config.Diff.PreviousStep": "上一步", "Config.Diff.NextStep": "下一步", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异", "Config.Diff.DiffCluster": "要比较的集群", "Config.Diff.HasDiffComment": "是否比较注释", "Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群", "ConfigExport.Title": "配置导出", "ConfigExport.TitleTips" : "超级管理员会下载所有应用的配置，普通用户只会下载自己应用的配置", "ConfigExport.Download": "下载", "App.CreateProject": "创建应用", "App.AppIdTips": "（应用唯一标识）", "App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.AppOwnerTips": "(开启应用管理员分配权限控制后，应用负责人和应用管理员默认为本账号，不可选择)", "App.AppAdminTips1": "(应用负责人默认具有应用管理员权限，", "App.AppAdminTips2": "应用管理员可以创建Namespace和集群、分配用户权限)", "App.AccessKey.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限", "App.Setting.Title": "应用管理", "App.Setting.Admin": "管理员", "App.Setting.AdminTips": "(应用管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理应用、Namespace权限)", "App.Setting.Add": "添加", "App.Setting.BasicInfo": "基本信息", "App.Setting.ProjectName": "应用名称", "App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.Setting.ProjectOwner": "应用负责人", "App.Setting.Modify": "修改应用信息", "App.Setting.Cancel": "取消修改", "App.Setting.NoPermissionTips": "您没有权限操作，请找 [{{users}}] 开通权限", "App.Setting.DeleteAdmin": "删除管理员", "App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员", "App.Setting.PleaseChooseUser": "请选择用户", "App.Setting.Added": "添加成功", "App.Setting.AddFailed": "添加失败", "App.Setting.Deleted": "删除成功", "App.Setting.DeleteFailed": "删除失败", "App.Setting.Modified": "修改成功", "Valdr.App.AppId.Size": "AppId长度不能多于64个字符", "Valdr.App.AppId.Required": "AppId不能为空", "Valdr.App.appName.Size": "应用名称长度不能多于128个字符", "Valdr.App.appName.Required": "应用名称不能为空", "Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符", "Valdr.Cluster.ClusterName.Required": "集群名称不能为空", "Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符", "Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空", "Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符", "Valdr.Item.Key.Size": "Key长度不能多于128个字符", "Valdr.Item.Key.Required": "Key不能为空", "Valdr.Item.Comment.Size": "备注长度不能多于256个字符", "Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符", "Valdr.Release.ReleaseName.Required": "Release Name不能为空", "Valdr.Release.Comment.Size": "备注长度不能多于256个字符", "ApolloConfirmDialog.DefaultConfirmBtnName": "确认", "ApolloConfirmDialog.SearchPlaceHolder": "搜索应用(AppId、应用名)", "RulesModal.ChooseInstances": "从实例列表中选择", "RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空", "RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则", "RulesModal.IpListCanNotBeNull": "IP列表不能为空", "ItemModal.KeyExists": "key='{{key}}' 已存在", "ItemModal.AddedTips": "添加成功,如需生效请发布", "ItemModal.AddFailed": "添加失败", "ItemModal.PleaseChooseCluster": "请选择集群", "ItemModal.ModifiedTips": "更新成功, 如需生效请发布", "ItemModal.ModifyFailed": "更新失败", "ItemModal.Tabs": "制表符", "ItemModal.NewLine": "换行符", "ItemModal.Space": "空格", "ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错", "ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错", "ApolloNsPanel.Deleted": "删除成功", "ApolloNsPanel.GrayscaleModified": "灰度规则更新成功", "ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败", "ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布", "ApolloNsPanel.ModifyFailed": "更新失败", "ApolloNsPanel.GrammarIsRight": "语法正确！", "ReleaseModal.Published": "发布成功", "ReleaseModal.PublishFailed": "发布失败", "ReleaseModal.GrayscalePublished": "灰度发布成功", "ReleaseModal.GrayscalePublishFailed": "灰度发布失败", "ReleaseModal.AllPublished": "全量发布成功", "ReleaseModal.AllPublishFailed": "全量发布失败", "Rollback.NoRollbackList": "没有可以回滚的发布历史", "Rollback.SameAsCurrentRelease": "该版本与当前版本相同", "Rollback.RollbackSuccessfully": "回滚成功", "Rollback.RollbackFailed": "回滚失败", "Revoke.RevokeFailed": "撤销失败", "Revoke.RevokeSuccessfully": "撤销成功" }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ directive_module.directive('apollonspanel', directive); function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService, UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html', transclude: true, replace: true, scope: { namespace: '=', appId: '=', env: '=', cluster: '=', user: '=', lockCheck: '=', createItem: '=', editItem: '=', preDeleteItem: '=', preRevokeItem: '=', showText: '=', showNoModifyPermissionDialog: '=', preCreateBranch: '=', preDeleteBranch: '=', showMergeAndPublishGrayTips: '=', showBody: "=?", lazyLoad: "=?" }, link: function (scope) { //constants var namespace_view_type = { TEXT: 'text', TABLE: 'table', HISTORY: 'history', INSTANCE: 'instance', RULE: 'rule' }; var namespace_instance_view_type = { LATEST_RELEASE: 'latest_release', NOT_LATEST_RELEASE: 'not_latest_release', ALL: 'all' }; var operate_branch_storage_key = 'OperateBranch'; scope.refreshNamespace = refreshNamespace; scope.switchView = switchView; scope.toggleItemSearchInput = toggleItemSearchInput; scope.searchItems = searchItems; scope.loadCommitHistory = loadCommitHistory; scope.toggleTextEditStatus = toggleTextEditStatus; scope.goToSyncPage = goToSyncPage; scope.goToDiffPage = goToDiffPage; scope.modifyByText = modifyByText; scope.syntaxCheck = syntaxCheck; scope.goToParentAppConfigPage = goToParentAppConfigPage; scope.switchInstanceViewType = switchInstanceViewType; scope.switchBranch = switchBranch; scope.loadInstanceInfo = loadInstanceInfo; scope.refreshInstancesInfo = refreshInstancesInfo; scope.deleteRuleItem = deleteRuleItem; scope.rollback = rollback; scope.publish = publish; scope.mergeAndPublish = mergeAndPublish; scope.addRuleItem = addRuleItem; scope.editRuleItem = editRuleItem; scope.deleteNamespace = deleteNamespace; var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, function (context) { useRules(context.branch); }, scope.namespace.baseInfo.namespaceName); scope.$on('$destroy', function () { EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, subscriberId, scope.namespace.baseInfo.namespaceName); }); preInit(scope.namespace); if (!scope.lazyLoad || scope.namespace.initialized) { init(); } function preInit(namespace) { scope.showNamespaceBody = false; namespace.isLinkedNamespace = namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false; //namespace view name hide suffix namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace( ".properties", "").replace(".json", "").replace(".yml", "") .replace(".yaml", "").replace(".txt", ""); } function init() { initNamespace(scope.namespace); initOther(); scope.namespace.initialized = true; } function refreshNamespace() { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.namespace }); } function initNamespace(namespace, viewType) { namespace.hasBranch = false; namespace.isBranch = false; namespace.displayControl = { currentOperateBranch: 'master', showSearchInput: false, show: scope.showBody }; scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody; namespace.viewItems = namespace.items; namespace.isPropertiesFormat = namespace.format == 'properties'; namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml'; namespace.isTextEditing = false; namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.allInstances = []; namespace.allInstancesPage = 0; namespace.commitChangeBtnDisabled = false; generateNamespaceId(namespace); initNamespaceBranch(namespace); initNamespaceViewName(namespace); initNamespaceLock(namespace); initNamespaceInstancesCount(namespace); initPermission(namespace); initLinkedNamespace(namespace); loadInstanceInfo(namespace); function initNamespaceBranch(namespace) { NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.baseInfo) { return; } //namespace has branch namespace.hasBranch = true; namespace.branchName = result.baseInfo.clusterName; //init branch namespace.branch = result; namespace.branch.isBranch = true; namespace.branch.parentNamespace = namespace; namespace.branch.viewType = namespace_view_type.TABLE; namespace.branch.isPropertiesFormat = namespace.format == 'properties'; namespace.branch.allInstances = [];//master namespace all instances namespace.branch.latestReleaseInstances = []; namespace.branch.latestReleaseInstancesPage = 0; namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.branch.hasLoadInstances = false; namespace.branch.displayControl = { show: true }; generateNamespaceId(namespace.branch); initBranchItems(namespace.branch); initRules(namespace.branch); loadInstanceInfo(namespace.branch); initNamespaceLock(namespace.branch); initPermission(namespace); initUserOperateBranchScene(namespace); }); function initBranchItems(branch) { branch.masterItems = []; branch.branchItems = []; var masterItemsMap = {}; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { masterItemsMap[item.item.key] = item; } }); var branchItemsMap = {}; var itemModifiedCnt = 0; branch.items.forEach(function (item) { var key = item.item.key; var masterItem = masterItemsMap[key]; //modify master item and set item's masterReleaseValue if (masterItem) { item.masterItemExists = true; if (masterItem.isModified) { item.masterReleaseValue = masterItem.oldValue; } else { item.masterReleaseValue = masterItem.item.value; } } else {//delete branch item item.masterItemExists = false; } //delete master item. ignore if (item.isDeleted && masterItem) { if (item.masterReleaseValue != item.oldValue) { itemModifiedCnt++; branch.branchItems.push(item); } } else {//branch's item branchItemsMap[key] = item; if (item.isModified) { itemModifiedCnt++; } branch.branchItems.push(item); } }); branch.itemModifiedCnt = itemModifiedCnt; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { if (!branchItemsMap[item.item.key]) { branch.masterItems.push(item); } else { item.hasBranchValue = true; } } }) } } function generateNamespaceId(namespace) { namespace.id = Math.random().toString(36).substr(2); } function initPermission(namespace) { PermissionService.has_modify_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_modify_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } } }); PermissionService.has_release_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_release_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } } }); } function initLinkedNamespace(namespace) { if (!namespace.isPublic || !namespace.isLinkedNamespace) { return; } //load public namespace ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { var publicNamespace = result; namespace.publicNamespace = publicNamespace; var linkNamespaceItemKeys = []; namespace.items.forEach(function (item) { var key = item.item.key; linkNamespaceItemKeys.push(key); }); publicNamespace.viewItems = []; publicNamespace.items.forEach(function (item) { var key = item.item.key; if (key) { publicNamespace.viewItems.push(item); } item.covered = linkNamespaceItemKeys.indexOf(key) >= 0; if (item.isModified || item.isDeleted) { publicNamespace.isModified = true; } else if (key) { publicNamespace.hasPublishedItem = true; } }); loadParentNamespaceText(namespace); }); } function loadParentNamespaceText(namespace){ namespace.publicNamespaceText = ""; if(namespace.isLinkedNamespace) { namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace) } } function initNamespaceViewName(namespace) { if (!viewType) { if (namespace.isPropertiesFormat) { switchView(namespace, namespace_view_type.TABLE); } else { switchView(namespace, namespace_view_type.TEXT); } } else if (viewType == namespace_view_type.TABLE) { namespace.viewType = namespace_view_type.TABLE; } } function initNamespaceLock(namespace) { NamespaceLockService.get_namespace_lock(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.lockOwner = result.lockOwner; namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed; }); } function initUserOperateBranchScene(namespace) { var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join( "+"); if (!operateBranchStorage) { operateBranchStorage = {}; } if (!operateBranchStorage[namespaceId]) { operateBranchStorage[namespaceId] = namespace.branchName; } localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); switchBranch(operateBranchStorage[namespaceId], false); } } function initNamespaceInstancesCount(namespace) { InstanceService.getInstanceCountByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { namespace.instancesCount = result.num; }) } function initOther() { UserService.load_user().then(function (result) { scope.currentUser = result.userId; }); PermissionService.has_assign_user_permission(scope.appId) .then(function (result) { scope.hasAssignUserPermission = result.hasPermission; }, function (result) { }); } function switchBranch(branchName, forceShowBody) { if (branchName != 'master') { initRules(scope.namespace.branch); } if (forceShowBody) { scope.showNamespaceBody = true; } scope.namespace.displayControl.currentOperateBranch = branchName; //save to local storage var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); if (!operateBranchStorage) { return; } var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join( "+"); operateBranchStorage[namespaceId] = branchName; localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); } function switchView(namespace, viewType) { namespace.viewType = viewType; if (namespace_view_type.TEXT == viewType) { namespace.text = parseModel2Text(namespace); } else if (namespace_view_type.TABLE == viewType) { } else if (namespace_view_type.HISTORY == viewType) { loadCommitHistory(namespace); } else if (namespace_view_type.INSTANCE == viewType) { refreshInstancesInfo(namespace); } } function switchInstanceViewType(namespace, type) { namespace.instanceViewType = type; loadInstanceInfo(namespace); } function loadCommitHistory(namespace) { if (!namespace.commits) { namespace.commits = []; namespace.commitPage = 0; } var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } namespace.commitPage += 1; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } function loadInstanceInfo(namespace) { var size = 20; if (namespace.isBranch) { size = 2000; } var type = namespace.instanceViewType; if (namespace_instance_view_type.LATEST_RELEASE == type) { if (!namespace.latestRelease) { ReleaseService.findLatestActiveRelease(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.isLatestReleaseLoaded = true; if (!result) { namespace.latestReleaseInstances = {}; namespace.latestReleaseInstances.total = 0; return; } namespace.latestRelease = result; InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { namespace.latestReleaseInstances = result; namespace.latestReleaseInstancesPage++; }) }); } else { InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { if (result && result.content.length) { namespace.latestReleaseInstancesPage++; result.content.forEach(function (instance) { namespace.latestReleaseInstances.content.push( instance); }) } }) } } else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) { if (!namespace.latestRelease) { return; } InstanceService.findByReleasesNotIn(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, namespace.latestRelease.id) .then(function (result) { if (!result || result.length == 0) { return } var groupedInstances = {}, notLatestReleases = []; result.forEach(function (instance) { var configs = instance.configs; if (configs && configs.length > 0) { configs.forEach(function (instanceConfig) { var release = instanceConfig.release; //filter dirty data if (!release) { return; } if (!groupedInstances[release.id]) { groupedInstances[release.id] = []; notLatestReleases.push(release); } groupedInstances[release.id].push(instance); }) } }); namespace.notLatestReleases = notLatestReleases; namespace.notLatestReleaseInstances = groupedInstances; }) } else { InstanceService.findInstancesByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, '', namespace.allInstancesPage) .then(function (result) { if (result && result.content.length) { namespace.allInstancesPage++; result.content.forEach(function (instance) { namespace.allInstances.push(instance); }) } }); } } function refreshInstancesInfo(namespace) { namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.latestReleaseInstances = []; namespace.latestRelease = undefined; if (!namespace.isBranch) { namespace.notLatestReleaseNames = []; namespace.notLatestReleaseInstances = {}; namespace.allInstancesPage = 0; namespace.allInstances = []; } initNamespaceInstancesCount(namespace); loadInstanceInfo(namespace); } function initRules(branch) { NamespaceBranchService.findBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName) .then(function (result) { if (result.appId) { branch.rules = result; } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError')); }); } function addRuleItem(branch) { var newRuleItem = { clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '', clientIpList: [], draftIpList: [], isNew: true }; branch.editingRuleItem = newRuleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function editRuleItem(branch, ruleItem) { ruleItem.isNew = false; ruleItem.draftIpList = _.clone(ruleItem.clientIpList); branch.editingRuleItem = ruleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function deleteRuleItem(branch, ruleItem) { branch.rules.ruleItems.forEach(function (item, index) { if (item.clientAppId == ruleItem.clientAppId) { branch.rules.ruleItems.splice(index, 1); toastr.success($translate.instant('ApolloNsPanel.Deleted')); } }); useRules(branch); } function useRules(branch) { NamespaceBranchService.updateBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName, branch.rules ) .then(function (result) { toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified')); //show tips if branch has not release configs if (branch.itemModifiedCnt) { AppUtil.showModal("#updateRuleTips"); } setTimeout(function () { refreshInstancesInfo(branch); }, 1500); }, function (result) { AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed')); }) } function toggleTextEditStatus(namespace) { if (!scope.lockCheck(namespace)) { return; } namespace.isTextEditing = !namespace.isTextEditing; if (namespace.isTextEditing) {//切换为编辑状态 namespace.commited = false; namespace.backupText = namespace.text; namespace.editText = parseModel2Text(namespace); } else { if (!namespace.commited) {//取消编辑,则复原 namespace.text = namespace.backupText; } } } function goToSyncPage(namespace) { if (!scope.lockCheck(namespace)) { return false; } $window.location.href = AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function goToDiffPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function modifyByText(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; //prevent repeat submit if (namespace.commitChangeBtnDisabled) { return; } namespace.commitChangeBtnDisabled = true; ConfigService.modify_items(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.ModifiedTips')); //refresh all namespace items EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: namespace }); return true; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed')); namespace.commitChangeBtnDisabled = false; return false; } ); namespace.commited = true; } function syntaxCheck(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; ConfigService.syntax_check_text(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight')); }, function (result) { EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, { syntaxCheckMessage: AppUtil.pureErrorMsg(result) }); } ); } function goToParentAppConfigPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId; $window.location.reload(); } function parseModel2Text(namespace) { if (namespace.items.length == 0) { namespace.itemCnt = 0; return ""; } //文件模式 if (!namespace.isPropertiesFormat) { return parseNotPropertiesText(namespace); } else { return parsePropertiesText(namespace); } } function parseNotPropertiesText(namespace) { var text = namespace.items[0].item.value; var lineNum = text.split("\n").length; namespace.itemCnt = lineNum; return text; } function parsePropertiesText(namespace) { var result = ""; var itemCnt = 0; namespace.items.forEach(function (item) { //deleted key if (!item.item.dataChangeLastModifiedBy) { return; } if (item.item.key) { //use string \n to display as new line var itemValue = item.item.value.replace(/\n/g, "\\n"); result += item.item.key + " = " + itemValue + "\n"; } else { result += item.item.comment + "\n"; } itemCnt++; }); namespace.itemCnt = itemCnt; return result; } function toggleItemSearchInput(namespace) { namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput; } function searchItems(namespace) { var searchKey = namespace.searchKey.toLowerCase(); var items = []; namespace.items.forEach(function (item) { var key = item.item.key; if (key && key.toLowerCase().indexOf(searchKey) >= 0) { items.push(item); } }); namespace.viewItems = items; } //normal release and gray release function publish(namespace) { if (!namespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); return; } else if (namespace.lockOwner && scope.user == namespace.lockOwner) { //can not publish if config modified by himself EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: namespace, mergeAndPublish: false }); return; } if (namespace.isBranch) { namespace.mergeAndPublish = false; } EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: namespace }); } function mergeAndPublish(branch) { var parentNamespace = branch.parentNamespace; if (!parentNamespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); } else if (parentNamespace.itemModifiedCnt > 0) { AppUtil.showModal('#mergeAndReleaseDenyDialog'); } else if (branch.lockOwner && scope.user == branch.lockOwner) { EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: branch, mergeAndPublish: true }); } else { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch }); } } function rollback(namespace) { EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace }); } function deleteNamespace(namespace) { EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace }); } //theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min scope.aceConfig = { $blockScrolling: Infinity, showPrintMargin: false, theme: 'eclipse', mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format), onLoad: function (_editor) { _editor.$blockScrolling = Infinity; _editor.setOptions({ fontSize: 13, minLines: 10, maxLines: 20 }) } }; setTimeout(function () { scope.namespace.show = true; }, 70); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ directive_module.directive('apollonspanel', directive); function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService, UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html', transclude: true, replace: true, scope: { namespace: '=', appId: '=', env: '=', cluster: '=', user: '=', lockCheck: '=', createItem: '=', editItem: '=', preDeleteItem: '=', preRevokeItem: '=', showText: '=', showNoModifyPermissionDialog: '=', preCreateBranch: '=', preDeleteBranch: '=', showMergeAndPublishGrayTips: '=', showBody: "=?", lazyLoad: "=?" }, link: function (scope) { //constants var namespace_view_type = { TEXT: 'text', TABLE: 'table', HISTORY: 'history', INSTANCE: 'instance', RULE: 'rule' }; var namespace_instance_view_type = { LATEST_RELEASE: 'latest_release', NOT_LATEST_RELEASE: 'not_latest_release', ALL: 'all' }; var operate_branch_storage_key = 'OperateBranch'; scope.refreshNamespace = refreshNamespace; scope.switchView = switchView; scope.toggleItemSearchInput = toggleItemSearchInput; scope.toggleHistorySearchInput = toggleHistorySearchInput; scope.searchItems = searchItems; scope.searchHistory = searchHistory; scope.loadCommitHistory = loadCommitHistory; scope.toggleTextEditStatus = toggleTextEditStatus; scope.goToSyncPage = goToSyncPage; scope.goToDiffPage = goToDiffPage; scope.modifyByText = modifyByText; scope.syntaxCheck = syntaxCheck; scope.goToParentAppConfigPage = goToParentAppConfigPage; scope.switchInstanceViewType = switchInstanceViewType; scope.switchBranch = switchBranch; scope.loadInstanceInfo = loadInstanceInfo; scope.refreshInstancesInfo = refreshInstancesInfo; scope.deleteRuleItem = deleteRuleItem; scope.rollback = rollback; scope.publish = publish; scope.mergeAndPublish = mergeAndPublish; scope.addRuleItem = addRuleItem; scope.editRuleItem = editRuleItem; scope.deleteNamespace = deleteNamespace; var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, function (context) { useRules(context.branch); }, scope.namespace.baseInfo.namespaceName); scope.$on('$destroy', function () { EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, subscriberId, scope.namespace.baseInfo.namespaceName); }); preInit(scope.namespace); if (!scope.lazyLoad || scope.namespace.initialized) { init(); } function preInit(namespace) { scope.showNamespaceBody = false; namespace.isLinkedNamespace = namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false; //namespace view name hide suffix namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace( ".properties", "").replace(".json", "").replace(".yml", "") .replace(".yaml", "").replace(".txt", ""); } function init() { initNamespace(scope.namespace); initOther(); scope.namespace.initialized = true; } function refreshNamespace() { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.namespace }); } function initNamespace(namespace, viewType) { namespace.hasBranch = false; namespace.isBranch = false; namespace.displayControl = { currentOperateBranch: 'master', showSearchInput: false, showHistorySearchInput: false, show: scope.showBody }; scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody; namespace.viewItems = namespace.items; namespace.isPropertiesFormat = namespace.format == 'properties'; namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml'; namespace.isTextEditing = false; namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.allInstances = []; namespace.allInstancesPage = 0; namespace.commitChangeBtnDisabled = false; generateNamespaceId(namespace); initNamespaceBranch(namespace); initNamespaceViewName(namespace); initNamespaceLock(namespace); initNamespaceInstancesCount(namespace); initPermission(namespace); initLinkedNamespace(namespace); loadInstanceInfo(namespace); function initNamespaceBranch(namespace) { NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.baseInfo) { return; } //namespace has branch namespace.hasBranch = true; namespace.branchName = result.baseInfo.clusterName; //init branch namespace.branch = result; namespace.branch.isBranch = true; namespace.branch.parentNamespace = namespace; namespace.branch.viewType = namespace_view_type.TABLE; namespace.branch.isPropertiesFormat = namespace.format == 'properties'; namespace.branch.allInstances = [];//master namespace all instances namespace.branch.latestReleaseInstances = []; namespace.branch.latestReleaseInstancesPage = 0; namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.branch.hasLoadInstances = false; namespace.branch.displayControl = { show: true }; generateNamespaceId(namespace.branch); initBranchItems(namespace.branch); initRules(namespace.branch); loadInstanceInfo(namespace.branch); initNamespaceLock(namespace.branch); initPermission(namespace); initUserOperateBranchScene(namespace); }); function initBranchItems(branch) { branch.masterItems = []; branch.branchItems = []; var masterItemsMap = {}; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { masterItemsMap[item.item.key] = item; } }); var branchItemsMap = {}; var itemModifiedCnt = 0; branch.items.forEach(function (item) { var key = item.item.key; var masterItem = masterItemsMap[key]; //modify master item and set item's masterReleaseValue if (masterItem) { item.masterItemExists = true; if (masterItem.isModified) { item.masterReleaseValue = masterItem.oldValue; } else { item.masterReleaseValue = masterItem.item.value; } } else {//delete branch item item.masterItemExists = false; } //delete master item. ignore if (item.isDeleted && masterItem) { if (item.masterReleaseValue != item.oldValue) { itemModifiedCnt++; branch.branchItems.push(item); } } else {//branch's item branchItemsMap[key] = item; if (item.isModified) { itemModifiedCnt++; } branch.branchItems.push(item); } }); branch.itemModifiedCnt = itemModifiedCnt; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { if (!branchItemsMap[item.item.key]) { branch.masterItems.push(item); } else { item.hasBranchValue = true; } } }) } } function generateNamespaceId(namespace) { namespace.id = Math.random().toString(36).substr(2); } function initPermission(namespace) { PermissionService.has_modify_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_modify_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } } }); PermissionService.has_release_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_release_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } } }); } function initLinkedNamespace(namespace) { if (!namespace.isPublic || !namespace.isLinkedNamespace) { return; } //load public namespace ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { var publicNamespace = result; namespace.publicNamespace = publicNamespace; var linkNamespaceItemKeys = []; namespace.items.forEach(function (item) { var key = item.item.key; linkNamespaceItemKeys.push(key); }); publicNamespace.viewItems = []; publicNamespace.items.forEach(function (item) { var key = item.item.key; if (key) { publicNamespace.viewItems.push(item); } item.covered = linkNamespaceItemKeys.indexOf(key) >= 0; if (item.isModified || item.isDeleted) { publicNamespace.isModified = true; } else if (key) { publicNamespace.hasPublishedItem = true; } }); loadParentNamespaceText(namespace); }); } function loadParentNamespaceText(namespace){ namespace.publicNamespaceText = ""; if(namespace.isLinkedNamespace) { namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace) } } function initNamespaceViewName(namespace) { if (!viewType) { if (namespace.isPropertiesFormat) { switchView(namespace, namespace_view_type.TABLE); } else { switchView(namespace, namespace_view_type.TEXT); } } else if (viewType == namespace_view_type.TABLE) { namespace.viewType = namespace_view_type.TABLE; } } function initNamespaceLock(namespace) { NamespaceLockService.get_namespace_lock(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.lockOwner = result.lockOwner; namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed; }); } function initUserOperateBranchScene(namespace) { var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join( "+"); if (!operateBranchStorage) { operateBranchStorage = {}; } if (!operateBranchStorage[namespaceId]) { operateBranchStorage[namespaceId] = namespace.branchName; } localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); switchBranch(operateBranchStorage[namespaceId], false); } } function initNamespaceInstancesCount(namespace) { InstanceService.getInstanceCountByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { namespace.instancesCount = result.num; }) } function initOther() { UserService.load_user().then(function (result) { scope.currentUser = result.userId; }); PermissionService.has_assign_user_permission(scope.appId) .then(function (result) { scope.hasAssignUserPermission = result.hasPermission; }, function (result) { }); } function switchBranch(branchName, forceShowBody) { if (branchName != 'master') { initRules(scope.namespace.branch); } if (forceShowBody) { scope.showNamespaceBody = true; } scope.namespace.displayControl.currentOperateBranch = branchName; //save to local storage var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); if (!operateBranchStorage) { return; } var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join( "+"); operateBranchStorage[namespaceId] = branchName; localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); } function switchView(namespace, viewType) { namespace.viewType = viewType; if (namespace_view_type.TEXT == viewType) { namespace.text = parseModel2Text(namespace); } else if (namespace_view_type.TABLE == viewType) { } else if (namespace_view_type.HISTORY == viewType) { loadCommitHistory(namespace); } else if (namespace_view_type.INSTANCE == viewType) { refreshInstancesInfo(namespace); } } function switchInstanceViewType(namespace, type) { namespace.instanceViewType = type; loadInstanceInfo(namespace); } function loadCommitHistory(namespace) { if (!namespace.commits) { namespace.commits = []; namespace.commitPage = 0; } var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.HistorySearchKey, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } namespace.commitPage += 1; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } function loadInstanceInfo(namespace) { var size = 20; if (namespace.isBranch) { size = 2000; } var type = namespace.instanceViewType; if (namespace_instance_view_type.LATEST_RELEASE == type) { if (!namespace.latestRelease) { ReleaseService.findLatestActiveRelease(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.isLatestReleaseLoaded = true; if (!result) { namespace.latestReleaseInstances = {}; namespace.latestReleaseInstances.total = 0; return; } namespace.latestRelease = result; InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { namespace.latestReleaseInstances = result; namespace.latestReleaseInstancesPage++; }) }); } else { InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { if (result && result.content.length) { namespace.latestReleaseInstancesPage++; result.content.forEach(function (instance) { namespace.latestReleaseInstances.content.push( instance); }) } }) } } else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) { if (!namespace.latestRelease) { return; } InstanceService.findByReleasesNotIn(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, namespace.latestRelease.id) .then(function (result) { if (!result || result.length == 0) { return } var groupedInstances = {}, notLatestReleases = []; result.forEach(function (instance) { var configs = instance.configs; if (configs && configs.length > 0) { configs.forEach(function (instanceConfig) { var release = instanceConfig.release; //filter dirty data if (!release) { return; } if (!groupedInstances[release.id]) { groupedInstances[release.id] = []; notLatestReleases.push(release); } groupedInstances[release.id].push(instance); }) } }); namespace.notLatestReleases = notLatestReleases; namespace.notLatestReleaseInstances = groupedInstances; }) } else { InstanceService.findInstancesByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, '', namespace.allInstancesPage) .then(function (result) { if (result && result.content.length) { namespace.allInstancesPage++; result.content.forEach(function (instance) { namespace.allInstances.push(instance); }) } }); } } function refreshInstancesInfo(namespace) { namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.latestReleaseInstances = []; namespace.latestRelease = undefined; if (!namespace.isBranch) { namespace.notLatestReleaseNames = []; namespace.notLatestReleaseInstances = {}; namespace.allInstancesPage = 0; namespace.allInstances = []; } initNamespaceInstancesCount(namespace); loadInstanceInfo(namespace); } function initRules(branch) { NamespaceBranchService.findBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName) .then(function (result) { if (result.appId) { branch.rules = result; } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError')); }); } function addRuleItem(branch) { var newRuleItem = { clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '', clientIpList: [], draftIpList: [], isNew: true }; branch.editingRuleItem = newRuleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function editRuleItem(branch, ruleItem) { ruleItem.isNew = false; ruleItem.draftIpList = _.clone(ruleItem.clientIpList); branch.editingRuleItem = ruleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function deleteRuleItem(branch, ruleItem) { branch.rules.ruleItems.forEach(function (item, index) { if (item.clientAppId == ruleItem.clientAppId) { branch.rules.ruleItems.splice(index, 1); toastr.success($translate.instant('ApolloNsPanel.Deleted')); } }); useRules(branch); } function useRules(branch) { NamespaceBranchService.updateBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName, branch.rules ) .then(function (result) { toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified')); //show tips if branch has not release configs if (branch.itemModifiedCnt) { AppUtil.showModal("#updateRuleTips"); } setTimeout(function () { refreshInstancesInfo(branch); }, 1500); }, function (result) { AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed')); }) } function toggleTextEditStatus(namespace) { if (!scope.lockCheck(namespace)) { return; } namespace.isTextEditing = !namespace.isTextEditing; if (namespace.isTextEditing) {//切换为编辑状态 namespace.commited = false; namespace.backupText = namespace.text; namespace.editText = parseModel2Text(namespace); } else { if (!namespace.commited) {//取消编辑,则复原 namespace.text = namespace.backupText; } } } function goToSyncPage(namespace) { if (!scope.lockCheck(namespace)) { return false; } $window.location.href = AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function goToDiffPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function modifyByText(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; //prevent repeat submit if (namespace.commitChangeBtnDisabled) { return; } namespace.commitChangeBtnDisabled = true; ConfigService.modify_items(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.ModifiedTips')); //refresh all namespace items EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: namespace }); return true; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed')); namespace.commitChangeBtnDisabled = false; return false; } ); namespace.commited = true; } function syntaxCheck(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; ConfigService.syntax_check_text(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight')); }, function (result) { EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, { syntaxCheckMessage: AppUtil.pureErrorMsg(result) }); } ); } function goToParentAppConfigPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId; $window.location.reload(); } function parseModel2Text(namespace) { if (namespace.items.length == 0) { namespace.itemCnt = 0; return ""; } //文件模式 if (!namespace.isPropertiesFormat) { return parseNotPropertiesText(namespace); } else { return parsePropertiesText(namespace); } } function parseNotPropertiesText(namespace) { var text = namespace.items[0].item.value; var lineNum = text.split("\n").length; namespace.itemCnt = lineNum; return text; } function parsePropertiesText(namespace) { var result = ""; var itemCnt = 0; namespace.items.forEach(function (item) { //deleted key if (!item.item.dataChangeLastModifiedBy) { return; } if (item.item.key) { //use string \n to display as new line var itemValue = item.item.value.replace(/\n/g, "\\n"); result += item.item.key + " = " + itemValue + "\n"; } else { result += item.item.comment + "\n"; } itemCnt++; }); namespace.itemCnt = itemCnt; return result; } function toggleItemSearchInput(namespace) { namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput; } function searchItems(namespace) { var searchKey = namespace.searchKey.toLowerCase(); var items = []; namespace.items.forEach(function (item) { var key = item.item.key; if (key && key.toLowerCase().indexOf(searchKey) >= 0) { items.push(item); } }); namespace.viewItems = items; } function toggleHistorySearchInput(namespace) { namespace.displayControl.showHistorySearchInput = !namespace.displayControl.showHistorySearchInput; } function searchHistory(namespace) { namespace.commits = []; namespace.commitPage = 0; var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.HistorySearchKey, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } //normal release and gray release function publish(namespace) { if (!namespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); return; } else if (namespace.lockOwner && scope.user == namespace.lockOwner) { //can not publish if config modified by himself EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: namespace, mergeAndPublish: false }); return; } if (namespace.isBranch) { namespace.mergeAndPublish = false; } EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: namespace }); } function mergeAndPublish(branch) { var parentNamespace = branch.parentNamespace; if (!parentNamespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); } else if (parentNamespace.itemModifiedCnt > 0) { AppUtil.showModal('#mergeAndReleaseDenyDialog'); } else if (branch.lockOwner && scope.user == branch.lockOwner) { EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: branch, mergeAndPublish: true }); } else { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch }); } } function rollback(namespace) { EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace }); } function deleteNamespace(namespace) { EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace }); } //theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min scope.aceConfig = { $blockScrolling: Infinity, showPrintMargin: false, theme: 'eclipse', mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format), onLoad: function (_editor) { _editor.$blockScrolling = Infinity; _editor.setOptions({ fontSize: 13, minLines: 10, maxLines: 20 }) } }; setTimeout(function () { scope.namespace.show = true; }, 70); } } }
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/services/CommitService.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('CommitService', ['$resource', '$q','AppUtil', function ($resource, $q, AppUtil) { var commit_resource = $resource('', {}, { find_commits: { method: 'GET', isArray: true, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/commits?page=:page' } }); return { find_commits: function (appId, env, clusterName, namespaceName, page, size) { var d = $q.defer(); commit_resource.find_commits({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('CommitService', ['$resource', '$q','AppUtil', function ($resource, $q, AppUtil) { var commit_resource = $resource('', {}, { find_commits: { method: 'GET', isArray: true, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/commits?page=:page' } }); return { find_commits: function (appId, env, clusterName, namespaceName, key, page, size) { var d = $q.defer(); commit_resource.find_commits({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, key: key, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!--master panel body when not initialized--> <section class="master-panel-body" ng-if="!namespace.initialized"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}" ng-click="refreshNamespace()"> <img src="img/more.png"> {{'Component.Namespace.Master.LoadNamespace' | translate }} </button> </div> </div> </header> </section> <!--master panel body--> <section class="master-panel-body" ng-if="namespace.initialized && (namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> <span class="label label-primary no-radius namespace-label" ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)"> <img src="img/release.png"> {{'Component.Namespace.Master.Items.Publish' | translate }} </button> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}" ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.Rollback' | translate }} </button> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}"> <img src="img/release-history.png"> {{'Component.Namespace.Master.Items.PublishHistory' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}" href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}" ng-show="hasAssignUserPermission"> <img src="img/assign.png"> {{'Component.Namespace.Master.Items.Grant' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}" ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission" ng-click="preCreateBranch(namespace)"> <img src="img/test.png"> {{'Component.Namespace.Master.Items.Grayscale' | translate }} </a> <a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}" ng-click="showNoModifyPermissionDialog()" ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> {{'Component.Namespace.Master.Items.RequestPermission' | translate }} </a> <div class="btn-group" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <img src="img/operate.png"> <span class="caret"></span> </button> <ul class="dropdown-menu" style="right: 0; left: -160px;"> <li ng-click="deleteNamespace(namespace)"> <a style="color: red"> <img src="img/delete.png"> {{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a> </li> </ul> </div> </div> </div> </header> <div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden"> <span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span> </div> <!--second header--> <header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden"> <div class="row"> <div class="col-md-6 col-sm-6 pull-left"> <!--master branch nav tabs--> <ul class="nav nav-tabs"> <li role="presentation" ng-click="switchView(namespace, 'table')" ng-show="namespace.isPropertiesFormat"> <a ng-class="{node_active:namespace.viewType == 'table'}"> <img src="img/table.png"> {{'Component.Namespace.Master.Items.ItemList' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'text')"> <a ng-class="{node_active:namespace.viewType == 'text'}"> <img src="img/text.png"> {{'Component.Namespace.Master.Items.ItemListByText' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'history')"> <a ng-class="{node_active:namespace.viewType == 'history'}"> <img src="img/change.png"> {{'Component.Namespace.Master.Items.ItemHistory' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'instance')"> <a ng-class="{node_active:namespace.viewType == 'instance'}"> <img src="img/machine.png"> {{'Component.Namespace.Master.Items.ItemInstance' | translate }} <span class="badge badge-grey" ng-bind="namespace.instancesCount"></span> </a> </li> </ul> </div> <div class="col-md-6 col-sm-6 text-right"> <img src="img/copy.png" class="ns_btn clipboard cursor-pointer" data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CopyText' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"> <img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable" ng-click="syntaxCheck(namespace)"> &nbsp; <img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="toggleTextEditStatus(namespace)"> <img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Change' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission" ng-click="toggleTextEditStatus(namespace)"> &nbsp; <img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal" data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="modifyByText(namespace)"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)"> <span class="glyphicon glyphicon-filter"></span> {{'Component.Namespace.Master.Items.FilterItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}" ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/sync.png"> {{'Component.Namespace.Master.Items.SyncItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}" ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.RevokeItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}" ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.isPropertiesFormat"> <img src="img/diff.png"> {{'Component.Namespace.Master.Items.DiffItem' | translate }} </button> <button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace && namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission" ng-click="createItem(namespace)"> <img src="img/plus.png"> {{'Component.Namespace.Master.Items.AddItem' | translate }} </button> </div> </div> </header> <!--namespace body--> <section ng-show="!namespace.isConfigHidden"> <!--table view--> <div class="namespace-view-table" ng-show="namespace.viewType == 'table'"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease"> <span style="color: red"> {{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span> </div> <!--not link namespace--> <div ng-if="!namespace.isLinkedNamespace"> <div class="search-input" ng-show="namespace.displayControl.showSearchInput"> <input type="text" class="form-control" placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)"> </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.PublishState' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key" ng-class="{'warning': !config.item.value}"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> </div> <!--link namespace--> <div class="panel panel-default" ng-if="namespace.isLinkedNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }} </div> <div class="col-md-8 col-sm-8"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus, 'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'" ng-blur="namespace.searchStatus='OFF'"> </div> </div> </div> <table class="table table-bordered table-striped table-hover" ng-if="namespace.viewItems && namespace.viewItems.length"> <thead> <tr> <th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.viewItems || !namespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5> </div> </div> <!--link namespace's public namespace--> <div ng-if="namespace.isLinkedNamespace"> <div class="panel panel-default" ng-if="namespace.publicNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}" target="_blank"> <small> ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}}, {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}}) </small> </a> </div> <div class="col-md-4 col-sm-4 text-center"> <div class="btn-group btn-group-sm" role="group" ng-show="namespace.publicNamespace.isModified"> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE' || !namespace.publicNamespaceViewType}" ng-click="namespace.publicNamespaceViewType = 'RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.Published' | translate }} </button> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}" ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }} </button> </div> </div> <div class="col-md-4 col-sm-4"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF' || !namespace.publicNamespace.searchStatus, 'search-focus': namespace.publicNamespace.searchStatus == 'ON'}" ng-model="namespace.publicNamespace.searchKey" ng-change="searchItems(namespace.publicNamespace)" ng-blur="namespace.publicNamespace.searchStatus='OFF'" ng-focus="namespace.publicNamespace.searchStatus='ON'" /> </div> </div> </div> <!--published items--> <div ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'"> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespace.hasPublishedItem"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && !config.isModified && !config.isDeleted"> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> </td> <td width="35%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="15%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="10%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems && namespace.publicNamespace.viewItems.length && !namespace.publicNamespace.hasPublishedItem"> <h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5> </div> </div> <!--not published items--> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && (config.isModified || config.isDeleted)"> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.oldValue)"> <span ng-bind="config.oldValue | limitTo: 250"></span> <span ng-bind="config.oldValue.length > 250 ? '...': ''"></span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="10%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="5%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5> </div> </div> <div class="panel panel-default" ng-if="!namespace.publicNamespace"> <div class="panel-heading"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} </div> <div class="panel-body text-center"> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}" target="_blank">{{namespace.parentAppId}}</a> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }} </div> </div> </div> </div> <!--text view--> <div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }} </div> </div> </div> <!--只读模式下的文本内容,不替换换行符--> <div ui-ace="aceConfig" readonly="true" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text"> </div> <!--编辑状态下的文本内容,会过滤掉换行符--> <div ui-ace="aceConfig" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing" ng-model="namespace.editText"> </div> <div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}" target="_blank"> <small> ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}}, {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}}) </small> </a> </div> </div> </div> <!--关联的 Parent Namespace 内容,只读模式,不替换换行符--> <div ui-ace="aceConfig" readonly="true" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace" ng-model="namespace.publicNamespaceText"> </div> <!--history view--> <div class="J_historyview history-view" ng-show="namespace.viewType == 'history'"> <div class="media" ng-show="namespace.commits && namespace.commits.length" ng-repeat="commits in namespace.commits"> <div class="media-body"> <div class="row"> <div class="col-md-6 col-sm-6"> <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3> </div> <div class="col-md-6 col-sm-6 text-right"> <h5 class="media-heading" ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> </div> </div> <!--properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="20%" title="{{item.newItem.key}}"> <span ng-bind="item.newItem.key | limitTo: 250"></span> <span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> <!--not properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="!namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> </div> <hr> </div> <div class="text-center"> <button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit" ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }} <span class="glyphicon glyphicon-menu-down"></span></button> </div> <div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length"> {{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }} </div> </div> <!--instance view--> <div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'"> <div class="panel-heading"> <div class="row"> <div class="col-md-5 col-sm-5"> <small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small> </div> <div class="col-md-7 col-sm-7 text-right"> <div class="btn-group btn-group-sm" role="group"> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}" ng-click="switchInstanceViewType(namespace, 'latest_release')"> {{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }} <span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}" ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }} <span class="badge" ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'all'}" ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }} <span class="badge" ng-bind="namespace.instancesCount"></span> </button> </div> <button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}" ng-click="refreshInstancesInfo(namespace)"> <img ng-src="{{ '/img/refresh.png' | prefixPath }}" /> </button> </div> </div> </div> <!--latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'"> <div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}"> {{namespace.latestRelease.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.latestReleaseInstances.content"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--not latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'"> <div class="panel-default" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0" ng-repeat="release in namespace.notLatestReleases"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}"> {{release.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> </div> <div class="text-center" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--all instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'all'"> <div class="panel-default" ng-if="namespace.instancesCount > 0"> <table class="table table-bordered table-striped" ng-if="namespace.allInstances"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.allInstances"> <td width="25%" ng-bind="instance.appId"></td> <td width="25%" ng-bind="instance.clusterName"></td> <td width="25%" ng-bind="instance.dataCenter"></td> <td width="25%" ng-bind="instance.ip"></td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.instancesCount == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> </div> </section> </div> </section>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!--master panel body when not initialized--> <section class="master-panel-body" ng-if="!namespace.initialized"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}" ng-click="refreshNamespace()"> <img src="img/more.png"> {{'Component.Namespace.Master.LoadNamespace' | translate }} </button> </div> </div> </header> </section> <!--master panel body--> <section class="master-panel-body" ng-if="namespace.initialized && (namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> <span class="label label-primary no-radius namespace-label" ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)"> <img src="img/release.png"> {{'Component.Namespace.Master.Items.Publish' | translate }} </button> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}" ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.Rollback' | translate }} </button> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}"> <img src="img/release-history.png"> {{'Component.Namespace.Master.Items.PublishHistory' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}" href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}" ng-show="hasAssignUserPermission"> <img src="img/assign.png"> {{'Component.Namespace.Master.Items.Grant' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}" ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission" ng-click="preCreateBranch(namespace)"> <img src="img/test.png"> {{'Component.Namespace.Master.Items.Grayscale' | translate }} </a> <a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}" ng-click="showNoModifyPermissionDialog()" ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> {{'Component.Namespace.Master.Items.RequestPermission' | translate }} </a> <div class="btn-group" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <img src="img/operate.png"> <span class="caret"></span> </button> <ul class="dropdown-menu" style="right: 0; left: -160px;"> <li ng-click="deleteNamespace(namespace)"> <a style="color: red"> <img src="img/delete.png"> {{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a> </li> </ul> </div> </div> </div> </header> <div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden"> <span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span> </div> <!--second header--> <header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden"> <div class="row"> <div class="col-md-6 col-sm-6 pull-left"> <!--master branch nav tabs--> <ul class="nav nav-tabs"> <li role="presentation" ng-click="switchView(namespace, 'table')" ng-show="namespace.isPropertiesFormat"> <a ng-class="{node_active:namespace.viewType == 'table'}"> <img src="img/table.png"> {{'Component.Namespace.Master.Items.ItemList' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'text')"> <a ng-class="{node_active:namespace.viewType == 'text'}"> <img src="img/text.png"> {{'Component.Namespace.Master.Items.ItemListByText' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'history')"> <a ng-class="{node_active:namespace.viewType == 'history'}"> <img src="img/change.png"> {{'Component.Namespace.Master.Items.ItemHistory' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'instance')"> <a ng-class="{node_active:namespace.viewType == 'instance'}"> <img src="img/machine.png"> {{'Component.Namespace.Master.Items.ItemInstance' | translate }} <span class="badge badge-grey" ng-bind="namespace.instancesCount"></span> </a> </li> </ul> </div> <div class="col-md-6 col-sm-6 text-right"> <img src="img/copy.png" class="ns_btn clipboard cursor-pointer" data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CopyText' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"> <img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable" ng-click="syntaxCheck(namespace)"> &nbsp; <img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="toggleTextEditStatus(namespace)"> <img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Change' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission" ng-click="toggleTextEditStatus(namespace)"> &nbsp; <img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal" data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="modifyByText(namespace)"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey' | translate }}" ng-show="namespace.viewType == 'history' && namespace.displayControl.currentOperateBranch == 'master' && !namespace.isLinkedNamespace" ng-click="toggleHistorySearchInput(namespace)"> <span class="glyphicon glyphicon-filter"></span> {{'Component.Namespace.Master.Items.Body.HistoryView.FilterHistory' | translate }} </button> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)"> <span class="glyphicon glyphicon-filter"></span> {{'Component.Namespace.Master.Items.FilterItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}" ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/sync.png"> {{'Component.Namespace.Master.Items.SyncItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}" ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.RevokeItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}" ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.isPropertiesFormat"> <img src="img/diff.png"> {{'Component.Namespace.Master.Items.DiffItem' | translate }} </button> <button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace && namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission" ng-click="createItem(namespace)"> <img src="img/plus.png"> {{'Component.Namespace.Master.Items.AddItem' | translate }} </button> </div> </div> </header> <!--namespace body--> <section ng-show="!namespace.isConfigHidden"> <!--table view--> <div class="namespace-view-table" ng-show="namespace.viewType == 'table'"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease"> <span style="color: red"> {{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span> </div> <!--not link namespace--> <div ng-if="!namespace.isLinkedNamespace"> <div class="search-input" ng-show="namespace.displayControl.showSearchInput"> <input type="text" class="form-control" placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)"> </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.PublishState' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key" ng-class="{'warning': !config.item.value}"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> </div> <!--link namespace--> <div class="panel panel-default" ng-if="namespace.isLinkedNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }} </div> <div class="col-md-8 col-sm-8"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus, 'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'" ng-blur="namespace.searchStatus='OFF'"> </div> </div> </div> <table class="table table-bordered table-striped table-hover" ng-if="namespace.viewItems && namespace.viewItems.length"> <thead> <tr> <th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.viewItems || !namespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5> </div> </div> <!--link namespace's public namespace--> <div ng-if="namespace.isLinkedNamespace"> <div class="panel panel-default" ng-if="namespace.publicNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}" target="_blank"> <small> ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}}, {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}}) </small> </a> </div> <div class="col-md-4 col-sm-4 text-center"> <div class="btn-group btn-group-sm" role="group" ng-show="namespace.publicNamespace.isModified"> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE' || !namespace.publicNamespaceViewType}" ng-click="namespace.publicNamespaceViewType = 'RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.Published' | translate }} </button> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}" ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }} </button> </div> </div> <div class="col-md-4 col-sm-4"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF' || !namespace.publicNamespace.searchStatus, 'search-focus': namespace.publicNamespace.searchStatus == 'ON'}" ng-model="namespace.publicNamespace.searchKey" ng-change="searchItems(namespace.publicNamespace)" ng-blur="namespace.publicNamespace.searchStatus='OFF'" ng-focus="namespace.publicNamespace.searchStatus='ON'" /> </div> </div> </div> <!--published items--> <div ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'"> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespace.hasPublishedItem"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && !config.isModified && !config.isDeleted"> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> </td> <td width="35%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="15%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="10%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems && namespace.publicNamespace.viewItems.length && !namespace.publicNamespace.hasPublishedItem"> <h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5> </div> </div> <!--not published items--> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && (config.isModified || config.isDeleted)"> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.oldValue)"> <span ng-bind="config.oldValue | limitTo: 250"></span> <span ng-bind="config.oldValue.length > 250 ? '...': ''"></span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="10%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="5%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5> </div> </div> <div class="panel panel-default" ng-if="!namespace.publicNamespace"> <div class="panel-heading"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} </div> <div class="panel-body text-center"> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}" target="_blank">{{namespace.parentAppId}}</a> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }} </div> </div> </div> </div> <!--text view--> <div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }} </div> </div> </div> <!--只读模式下的文本内容,不替换换行符--> <div ui-ace="aceConfig" readonly="true" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text"> </div> <!--编辑状态下的文本内容,会过滤掉换行符--> <div ui-ace="aceConfig" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing" ng-model="namespace.editText"> </div> <div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}" target="_blank"> <small> ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}}, {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}}) </small> </a> </div> </div> </div> <!--关联的 Parent Namespace 内容,只读模式,不替换换行符--> <div ui-ace="aceConfig" readonly="true" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace" ng-model="namespace.publicNamespaceText"> </div> <!--history view--> <div class="J_historyview history-view" ng-show="namespace.viewType == 'history'"> <!-- 过滤更改历史 --> <div class="search-input" ng-show="namespace.displayControl.showHistorySearchInput"> <input type="text" class="form-control" placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}" ng-model="namespace.HistorySearchKey" ng-change="searchHistory(namespace)"> </div> <div class="media" ng-show="namespace.commits && namespace.commits.length" ng-repeat="commits in namespace.commits"> <div class="media-body"> <div class="row"> <div class="col-md-6 col-sm-6"> <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3> </div> <div class="col-md-6 col-sm-6 text-right"> <h5 class="media-heading" ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> </div> </div> <!--properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="20%" title="{{item.newItem.key}}"> <span ng-bind="item.newItem.key | limitTo: 250"></span> <span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> <!--not properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="!namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> </div> <hr> </div> <div class="text-center"> <button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit" ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }} <span class="glyphicon glyphicon-menu-down"></span></button> </div> <div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length"> {{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }} </div> </div> <!--instance view--> <div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'"> <div class="panel-heading"> <div class="row"> <div class="col-md-5 col-sm-5"> <small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small> </div> <div class="col-md-7 col-sm-7 text-right"> <div class="btn-group btn-group-sm" role="group"> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}" ng-click="switchInstanceViewType(namespace, 'latest_release')"> {{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }} <span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}" ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }} <span class="badge" ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'all'}" ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }} <span class="badge" ng-bind="namespace.instancesCount"></span> </button> </div> <button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}" ng-click="refreshInstancesInfo(namespace)"> <img ng-src="{{ '/img/refresh.png' | prefixPath }}" /> </button> </div> </div> </div> <!--latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'"> <div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}"> {{namespace.latestRelease.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.latestReleaseInstances.content"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--not latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'"> <div class="panel-default" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0" ng-repeat="release in namespace.notLatestReleases"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}"> {{release.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> </div> <div class="text-center" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--all instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'all'"> <div class="panel-default" ng-if="namespace.instancesCount > 0"> <table class="table table-bordered table-striped" ng-if="namespace.allInstances"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.allInstances"> <td width="25%" ng-bind="instance.appId"></td> <td width="25%" ng-bind="instance.clusterName"></td> <td width="25%" ng-bind="instance.dataCenter"></td> <td width="25%" ng-bind="instance.ip"></td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.instancesCount == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> </div> </section> </div> </section>
1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YmlConfigFile.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; /** * @author Jason Song(song_s@ctrip.com) */ public class YmlConfigFile extends YamlConfigFile { public YmlConfigFile(String namespace, ConfigRepository configRepository) { super(namespace, configRepository); } @Override public ConfigFileFormat getConfigFileFormat() { return ConfigFileFormat.YML; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; /** * @author Jason Song(song_s@ctrip.com) */ public class YmlConfigFile extends YamlConfigFile { public YmlConfigFile(String namespace, ConfigRepository configRepository) { super(namespace, configRepository); } @Override public ConfigFileFormat getConfigFileFormat() { return ConfigFileFormat.YML; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ diff_item_module.controller("DiffItemController", ['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'ConfigService', function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, ConfigService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { appId: params.appid, env: params.env, clusterName: params.clusterName, namespaceName: params.namespaceName }; var sourceItems = []; $scope.diff = diff; $scope.syncBtnDisabled = false; $scope.showCommentDiff = false; $scope.collectSelectedClusters = collectSelectedClusters; $scope.syncItemNextStep = syncItemNextStep; $scope.backToAppHomePage = backToAppHomePage; $scope.switchSelect = switchSelect; $scope.showText = showText; $scope.itemsKeyedByKey = {}; $scope.syncData = { syncToNamespaces: [], syncItems: [] }; function diff() { $scope.syncData = parseSyncSourceData(); if ($scope.syncData.syncToNamespaces.length < 2) { toastr.warning($translate.instant('Config.Diff.PleaseChooseTwoCluster')); return; } $scope.syncData.syncToNamespaces.forEach(function (namespace) { ConfigService.find_items(namespace.appId, namespace.env, namespace.clusterName, namespace.namespaceName).then(function (result) { result.forEach(function (item) { var itemsKeyedByClusterName = $scope.itemsKeyedByKey[item.key] || {}; itemsKeyedByClusterName[namespace.env + ':' + namespace.clusterName + ':' + namespace.namespaceName] = item; $scope.itemsKeyedByKey[item.key] = itemsKeyedByClusterName; }); }); }); $scope.syncItemNextStep(1); } var selectedClusters = []; function collectSelectedClusters(data) { selectedClusters = data; } function parseSyncSourceData() { var syncData = { syncToNamespaces: [], syncItems: [] }; var namespaceName = $scope.pageContext.namespaceName; selectedClusters.forEach(function (cluster) { if (cluster.checked) { cluster.clusterName = cluster.name; cluster.namespaceName = namespaceName; syncData.syncToNamespaces.push(cluster); } }); return syncData; } ////// flow control /////// $scope.syncItemStep = 1; function syncItemNextStep(offset) { $scope.syncItemStep += offset; } function backToAppHomePage() { $window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.pageContext.appId; } function switchSelect(o) { o.checked = !o.checked; } function showText(text) { $scope.text = text; AppUtil.showModal('#showTextModal'); } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ diff_item_module.controller("DiffItemController", ['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'ConfigService', function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, ConfigService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { appId: params.appid, env: params.env, clusterName: params.clusterName, namespaceName: params.namespaceName }; var sourceItems = []; $scope.diff = diff; $scope.syncBtnDisabled = false; $scope.showCommentDiff = false; $scope.collectSelectedClusters = collectSelectedClusters; $scope.syncItemNextStep = syncItemNextStep; $scope.backToAppHomePage = backToAppHomePage; $scope.switchSelect = switchSelect; $scope.showText = showText; $scope.itemsKeyedByKey = {}; $scope.syncData = { syncToNamespaces: [], syncItems: [] }; function diff() { $scope.syncData = parseSyncSourceData(); if ($scope.syncData.syncToNamespaces.length < 2) { toastr.warning($translate.instant('Config.Diff.PleaseChooseTwoCluster')); return; } $scope.syncData.syncToNamespaces.forEach(function (namespace) { ConfigService.find_items(namespace.appId, namespace.env, namespace.clusterName, namespace.namespaceName).then(function (result) { result.forEach(function (item) { var itemsKeyedByClusterName = $scope.itemsKeyedByKey[item.key] || {}; itemsKeyedByClusterName[namespace.env + ':' + namespace.clusterName + ':' + namespace.namespaceName] = item; $scope.itemsKeyedByKey[item.key] = itemsKeyedByClusterName; }); }); }); $scope.syncItemNextStep(1); } var selectedClusters = []; function collectSelectedClusters(data) { selectedClusters = data; } function parseSyncSourceData() { var syncData = { syncToNamespaces: [], syncItems: [] }; var namespaceName = $scope.pageContext.namespaceName; selectedClusters.forEach(function (cluster) { if (cluster.checked) { cluster.clusterName = cluster.name; cluster.namespaceName = namespaceName; syncData.syncToNamespaces.push(cluster); } }); return syncData; } ////// flow control /////// $scope.syncItemStep = 1; function syncItemNextStep(offset) { $scope.syncItemStep += offset; } function backToAppHomePage() { $window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.pageContext.appId; } function switchSelect(o) { o.checked = !o.checked; } function showText(text) { $scope.text = text; AppUtil.showModal('#showTextModal'); } }]);
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/system/ApolloClientSystemPropertyInitializer.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.config.data.system; import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter; import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer; import org.apache.commons.logging.Log; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.util.StringUtils; /** * @author vdisk <vdisk@foxmail.com> */ public class ApolloClientSystemPropertyInitializer { private final Log log; public ApolloClientSystemPropertyInitializer(Log log) { this.log = log; } public void initializeSystemProperty(Binder binder, BindHandler bindHandler) { for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) { this.fillSystemPropertyFromBinder(propertyName, propertyName, binder, bindHandler); } } private void fillSystemPropertyFromBinder(String propertyName, String bindName, Binder binder, BindHandler bindHandler) { if (System.getProperty(propertyName) != null) { return; } String propertyValue = binder.bind(bindName, Bindable.of(String.class), bindHandler) .orElse(null); if (!StringUtils.hasText(propertyValue)) { return; } log.debug(Slf4jLogMessageFormatter .format("apollo client set system property key=[{}] value=[{}]", propertyName, propertyValue)); System.setProperty(propertyName, propertyValue); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.config.data.system; import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter; import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer; import org.apache.commons.logging.Log; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.util.StringUtils; /** * @author vdisk <vdisk@foxmail.com> */ public class ApolloClientSystemPropertyInitializer { private final Log log; public ApolloClientSystemPropertyInitializer(Log log) { this.log = log; } public void initializeSystemProperty(Binder binder, BindHandler bindHandler) { for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) { this.fillSystemPropertyFromBinder(propertyName, propertyName, binder, bindHandler); } } private void fillSystemPropertyFromBinder(String propertyName, String bindName, Binder binder, BindHandler bindHandler) { if (System.getProperty(propertyName) != null) { return; } String propertyValue = binder.bind(bindName, Bindable.of(String.class), bindHandler) .orElse(null); if (!StringUtils.hasText(propertyValue)) { return; } log.debug(Slf4jLogMessageFormatter .format("apollo client set system property key=[{}] value=[{}]", propertyName, propertyValue)); System.setProperty(propertyName, propertyValue); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.v1.controller; import com.ctrip.framework.apollo.common.dto.NamespaceDTO; import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO; import com.ctrip.framework.apollo.common.entity.AppNamespace; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.InputValidator; import com.ctrip.framework.apollo.common.utils.RequestPrecondition; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO; import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO; import com.ctrip.framework.apollo.portal.listener.AppNamespaceCreationEvent; import com.ctrip.framework.apollo.portal.service.AppNamespaceService; import com.ctrip.framework.apollo.portal.service.NamespaceLockService; import com.ctrip.framework.apollo.portal.service.NamespaceService; import com.ctrip.framework.apollo.portal.spi.UserService; import org.springframework.context.ApplicationEventPublisher; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Objects; @RestController("openapiNamespaceController") public class NamespaceController { private final NamespaceLockService namespaceLockService; private final NamespaceService namespaceService; private final AppNamespaceService appNamespaceService; private final ApplicationEventPublisher publisher; private final UserService userService; public NamespaceController( final NamespaceLockService namespaceLockService, final NamespaceService namespaceService, final AppNamespaceService appNamespaceService, final ApplicationEventPublisher publisher, final UserService userService) { this.namespaceLockService = namespaceLockService; this.namespaceService = namespaceService; this.appNamespaceService = appNamespaceService; this.publisher = publisher; this.userService = userService; } @PreAuthorize(value = "@consumerPermissionValidator.hasCreateNamespacePermission(#request, #appId)") @PostMapping(value = "/openapi/v1/apps/{appId}/appnamespaces") public OpenAppNamespaceDTO createNamespace(@PathVariable String appId, @RequestBody OpenAppNamespaceDTO appNamespaceDTO, HttpServletRequest request) { if (!Objects.equals(appId, appNamespaceDTO.getAppId())) { throw new BadRequestException(String.format("AppId not equal. AppId in path = %s, AppId in payload = %s", appId, appNamespaceDTO.getAppId())); } RequestPrecondition.checkArgumentsNotEmpty(appNamespaceDTO.getAppId(), appNamespaceDTO.getName(), appNamespaceDTO.getFormat(), appNamespaceDTO.getDataChangeCreatedBy()); if (!InputValidator.isValidAppNamespace(appNamespaceDTO.getName())) { throw new BadRequestException(String.format("Invalid Namespace format: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE + " & " + InputValidator.INVALID_NAMESPACE_NAMESPACE_MESSAGE)); } if (!ConfigFileFormat.isValidFormat(appNamespaceDTO.getFormat())) { throw new BadRequestException(String.format("Invalid namespace format. format = %s", appNamespaceDTO.getFormat())); } String operator = appNamespaceDTO.getDataChangeCreatedBy(); if (userService.findByUserId(operator) == null) { throw new BadRequestException(String.format("Illegal user. user = %s", operator)); } AppNamespace appNamespace = OpenApiBeanUtils.transformToAppNamespace(appNamespaceDTO); AppNamespace createdAppNamespace = appNamespaceService.createAppNamespaceInLocal(appNamespace, appNamespaceDTO.isAppendNamespacePrefix()); publisher.publishEvent(new AppNamespaceCreationEvent(createdAppNamespace)); return OpenApiBeanUtils.transformToOpenAppNamespaceDTO(createdAppNamespace); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces") public List<OpenNamespaceDTO> findNamespaces(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName) { return OpenApiBeanUtils .batchTransformFromNamespaceBOs(namespaceService.findNamespaceBOs(appId, Env .valueOf(env), clusterName)); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName:.+}") public OpenNamespaceDTO loadNamespace(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { NamespaceBO namespaceBO = namespaceService.loadNamespaceBO(appId, Env.valueOf (env), clusterName, namespaceName); if (namespaceBO == null) { return null; } return OpenApiBeanUtils.transformFromNamespaceBO(namespaceBO); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public OpenNamespaceLockDTO getNamespaceLock(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { NamespaceDTO namespace = namespaceService.loadNamespaceBaseInfo(appId, Env .valueOf(env), clusterName, namespaceName); NamespaceLockDTO lockDTO = namespaceLockService.getNamespaceLock(appId, Env .valueOf(env), clusterName, namespaceName); return OpenApiBeanUtils.transformFromNamespaceLockDTO(namespace.getNamespaceName(), lockDTO); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.v1.controller; import com.ctrip.framework.apollo.common.dto.NamespaceDTO; import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO; import com.ctrip.framework.apollo.common.entity.AppNamespace; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.InputValidator; import com.ctrip.framework.apollo.common.utils.RequestPrecondition; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO; import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO; import com.ctrip.framework.apollo.portal.listener.AppNamespaceCreationEvent; import com.ctrip.framework.apollo.portal.service.AppNamespaceService; import com.ctrip.framework.apollo.portal.service.NamespaceLockService; import com.ctrip.framework.apollo.portal.service.NamespaceService; import com.ctrip.framework.apollo.portal.spi.UserService; import org.springframework.context.ApplicationEventPublisher; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Objects; @RestController("openapiNamespaceController") public class NamespaceController { private final NamespaceLockService namespaceLockService; private final NamespaceService namespaceService; private final AppNamespaceService appNamespaceService; private final ApplicationEventPublisher publisher; private final UserService userService; public NamespaceController( final NamespaceLockService namespaceLockService, final NamespaceService namespaceService, final AppNamespaceService appNamespaceService, final ApplicationEventPublisher publisher, final UserService userService) { this.namespaceLockService = namespaceLockService; this.namespaceService = namespaceService; this.appNamespaceService = appNamespaceService; this.publisher = publisher; this.userService = userService; } @PreAuthorize(value = "@consumerPermissionValidator.hasCreateNamespacePermission(#request, #appId)") @PostMapping(value = "/openapi/v1/apps/{appId}/appnamespaces") public OpenAppNamespaceDTO createNamespace(@PathVariable String appId, @RequestBody OpenAppNamespaceDTO appNamespaceDTO, HttpServletRequest request) { if (!Objects.equals(appId, appNamespaceDTO.getAppId())) { throw new BadRequestException(String.format("AppId not equal. AppId in path = %s, AppId in payload = %s", appId, appNamespaceDTO.getAppId())); } RequestPrecondition.checkArgumentsNotEmpty(appNamespaceDTO.getAppId(), appNamespaceDTO.getName(), appNamespaceDTO.getFormat(), appNamespaceDTO.getDataChangeCreatedBy()); if (!InputValidator.isValidAppNamespace(appNamespaceDTO.getName())) { throw new BadRequestException(String.format("Invalid Namespace format: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE + " & " + InputValidator.INVALID_NAMESPACE_NAMESPACE_MESSAGE)); } if (!ConfigFileFormat.isValidFormat(appNamespaceDTO.getFormat())) { throw new BadRequestException(String.format("Invalid namespace format. format = %s", appNamespaceDTO.getFormat())); } String operator = appNamespaceDTO.getDataChangeCreatedBy(); if (userService.findByUserId(operator) == null) { throw new BadRequestException(String.format("Illegal user. user = %s", operator)); } AppNamespace appNamespace = OpenApiBeanUtils.transformToAppNamespace(appNamespaceDTO); AppNamespace createdAppNamespace = appNamespaceService.createAppNamespaceInLocal(appNamespace, appNamespaceDTO.isAppendNamespacePrefix()); publisher.publishEvent(new AppNamespaceCreationEvent(createdAppNamespace)); return OpenApiBeanUtils.transformToOpenAppNamespaceDTO(createdAppNamespace); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces") public List<OpenNamespaceDTO> findNamespaces(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName) { return OpenApiBeanUtils .batchTransformFromNamespaceBOs(namespaceService.findNamespaceBOs(appId, Env .valueOf(env), clusterName)); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName:.+}") public OpenNamespaceDTO loadNamespace(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { NamespaceBO namespaceBO = namespaceService.loadNamespaceBO(appId, Env.valueOf (env), clusterName, namespaceName); if (namespaceBO == null) { return null; } return OpenApiBeanUtils.transformFromNamespaceBO(namespaceBO); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public OpenNamespaceLockDTO getNamespaceLock(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { NamespaceDTO namespace = namespaceService.loadNamespaceBaseInfo(appId, Env .valueOf(env), clusterName, namespaceName); NamespaceLockDTO lockDTO = namespaceLockService.getNamespaceLock(appId, Env .valueOf(env), clusterName, namespaceName); return OpenApiBeanUtils.transformFromNamespaceLockDTO(namespace.getNamespaceName(), lockDTO); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/util/OrderedProperties.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.util; import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; /** * An OrderedProperties instance will keep appearance order in config file. * * <strong> * Warnings: 1. It should be noticed that stream APIs or JDk1.8 APIs( listed in * https://github.com/ctripcorp/apollo/pull/2861) are not implemented here. 2. {@link Properties} * implementation are different between JDK1.8 and later JDKs. At least, {@link Properties} have an * individual implementation in JDK10. Hence, there should be an individual putAll method here. * </strong> * * @author songdragon@zts.io */ public class OrderedProperties extends Properties { private static final long serialVersionUID = -1741073539526213291L; private final Set<String> propertyNames; public OrderedProperties() { propertyNames = Collections.synchronizedSet(new LinkedHashSet<String>()); } @Override public synchronized Object put(Object key, Object value) { addPropertyName(key); return super.put(key, value); } private void addPropertyName(Object key) { if (key instanceof String) { propertyNames.add((String) key); } } @Override public Set<String> stringPropertyNames() { return propertyNames; } @Override public Enumeration<?> propertyNames() { return Collections.enumeration(propertyNames); } @Override public synchronized Enumeration<Object> keys() { return new Enumeration<Object>() { private final Iterator<String> i = propertyNames.iterator(); @Override public boolean hasMoreElements() { return i.hasNext(); } @Override public Object nextElement() { return i.next(); } }; } @Override public Set<Object> keySet() { return new LinkedHashSet<Object>(propertyNames); } @Override public Set<Entry<Object, Object>> entrySet() { Set<Entry<Object, Object>> original = super.entrySet(); LinkedHashMap<Object, Entry<Object, Object>> entryMap = new LinkedHashMap<>(); for (String propertyName : propertyNames) { entryMap.put(propertyName, null); } for (Entry<Object, Object> entry : original) { entryMap.put(entry.getKey(), entry); } return new LinkedHashSet<>(entryMap.values()); } @Override public synchronized void putAll(Map<?, ?> t) { super.putAll(t); for (Object name : t.keySet()) { addPropertyName(name); } } @Override public synchronized void clear() { super.clear(); this.propertyNames.clear(); } @Override public synchronized Object remove(Object key) { if (key instanceof String) { this.propertyNames.remove(key); } return super.remove(key); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.util; import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; /** * An OrderedProperties instance will keep appearance order in config file. * * <strong> * Warnings: 1. It should be noticed that stream APIs or JDk1.8 APIs( listed in * https://github.com/ctripcorp/apollo/pull/2861) are not implemented here. 2. {@link Properties} * implementation are different between JDK1.8 and later JDKs. At least, {@link Properties} have an * individual implementation in JDK10. Hence, there should be an individual putAll method here. * </strong> * * @author songdragon@zts.io */ public class OrderedProperties extends Properties { private static final long serialVersionUID = -1741073539526213291L; private final Set<String> propertyNames; public OrderedProperties() { propertyNames = Collections.synchronizedSet(new LinkedHashSet<String>()); } @Override public synchronized Object put(Object key, Object value) { addPropertyName(key); return super.put(key, value); } private void addPropertyName(Object key) { if (key instanceof String) { propertyNames.add((String) key); } } @Override public Set<String> stringPropertyNames() { return propertyNames; } @Override public Enumeration<?> propertyNames() { return Collections.enumeration(propertyNames); } @Override public synchronized Enumeration<Object> keys() { return new Enumeration<Object>() { private final Iterator<String> i = propertyNames.iterator(); @Override public boolean hasMoreElements() { return i.hasNext(); } @Override public Object nextElement() { return i.next(); } }; } @Override public Set<Object> keySet() { return new LinkedHashSet<Object>(propertyNames); } @Override public Set<Entry<Object, Object>> entrySet() { Set<Entry<Object, Object>> original = super.entrySet(); LinkedHashMap<Object, Entry<Object, Object>> entryMap = new LinkedHashMap<>(); for (String propertyName : propertyNames) { entryMap.put(propertyName, null); } for (Entry<Object, Object> entry : original) { entryMap.put(entry.getKey(), entry); } return new LinkedHashSet<>(entryMap.values()); } @Override public synchronized void putAll(Map<?, ?> t) { super.putAll(t); for (Object name : t.keySet()) { addPropertyName(name); } } @Override public synchronized void clear() { super.clear(); this.propertyNames.clear(); } @Override public synchronized Object remove(Object key) { if (key instanceof String) { this.propertyNames.remove(key); } return super.remove(key); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySourceTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.biz.AbstractUnitTest; import com.ctrip.framework.apollo.biz.MockBeanFactory; import com.ctrip.framework.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.core.ConfigConsts; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.springframework.test.util.ReflectionTestUtils; import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ public class BizDBPropertySourceTest extends AbstractUnitTest { @Mock private ServerConfigRepository serverConfigRepository; private BizDBPropertySource propertySource; private String clusterConfigKey = "clusterKey"; private String clusterConfigValue = "clusterValue"; private String dcConfigKey = "dcKey"; private String dcConfigValue = "dcValue"; private String defaultKey = "defaultKey"; private String defaultValue = "defaultValue"; @Before public void initTestData() { propertySource = spy(new BizDBPropertySource()); ReflectionTestUtils.setField(propertySource, "serverConfigRepository", serverConfigRepository); List<ServerConfig> configs = Lists.newLinkedList(); //cluster config String cluster = "cluster"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue, cluster)); String dc = "dc"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + "dc", dc)); configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //dc config configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue, dc)); configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //default config configs.add(MockBeanFactory.mockServerConfig(defaultKey, defaultValue, ConfigConsts.CLUSTER_NAME_DEFAULT)); System.setProperty(ConfigConsts.APOLLO_CLUSTER_KEY, cluster); when(propertySource.getCurrentDataCenter()).thenReturn(dc); when(serverConfigRepository.findAll()).thenReturn(configs); } @After public void clear() { System.clearProperty(ConfigConsts.APOLLO_CLUSTER_KEY); } @Test public void testGetClusterConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(clusterConfigKey), clusterConfigValue); } @Test public void testGetDcConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(dcConfigKey), dcConfigValue); } @Test public void testGetDefaultConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(defaultKey), defaultValue); } @Test public void testGetNull() { propertySource.refresh(); assertNull(propertySource.getProperty("noKey")); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.biz.AbstractUnitTest; import com.ctrip.framework.apollo.biz.MockBeanFactory; import com.ctrip.framework.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.core.ConfigConsts; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.springframework.test.util.ReflectionTestUtils; import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ public class BizDBPropertySourceTest extends AbstractUnitTest { @Mock private ServerConfigRepository serverConfigRepository; private BizDBPropertySource propertySource; private String clusterConfigKey = "clusterKey"; private String clusterConfigValue = "clusterValue"; private String dcConfigKey = "dcKey"; private String dcConfigValue = "dcValue"; private String defaultKey = "defaultKey"; private String defaultValue = "defaultValue"; @Before public void initTestData() { propertySource = spy(new BizDBPropertySource()); ReflectionTestUtils.setField(propertySource, "serverConfigRepository", serverConfigRepository); List<ServerConfig> configs = Lists.newLinkedList(); //cluster config String cluster = "cluster"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue, cluster)); String dc = "dc"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + "dc", dc)); configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //dc config configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue, dc)); configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //default config configs.add(MockBeanFactory.mockServerConfig(defaultKey, defaultValue, ConfigConsts.CLUSTER_NAME_DEFAULT)); System.setProperty(ConfigConsts.APOLLO_CLUSTER_KEY, cluster); when(propertySource.getCurrentDataCenter()).thenReturn(dc); when(serverConfigRepository.findAll()).thenReturn(configs); } @After public void clear() { System.clearProperty(ConfigConsts.APOLLO_CLUSTER_KEY); } @Test public void testGetClusterConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(clusterConfigKey), clusterConfigValue); } @Test public void testGetDcConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(dcConfigKey), dcConfigValue); } @Test public void testGetDefaultConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(defaultKey), defaultValue); } @Test public void testGetNull() { propertySource.refresh(); assertNull(propertySource.getProperty("noKey")); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/java/com/ctrip/framework/apollo/core/signature/HmacSha1UtilsTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core.signature; import static org.junit.Assert.assertEquals; import org.junit.Test; /** * @author nisiyong */ public class HmacSha1UtilsTest { @Test public void testSignString() { String stringToSign = "1576478257344\n/configs/100004458/default/application?ip=10.0.0.1"; String accessKeySecret = "df23df3f59884980844ff3dada30fa97"; String actualSignature = HmacSha1Utils.signString(stringToSign, accessKeySecret); String expectedSignature = "EoKyziXvKqzHgwx+ijDJwgVTDgE="; assertEquals(expectedSignature, actualSignature); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core.signature; import static org.junit.Assert.assertEquals; import org.junit.Test; /** * @author nisiyong */ public class HmacSha1UtilsTest { @Test public void testSignString() { String stringToSign = "1576478257344\n/configs/100004458/default/application?ip=10.0.0.1"; String accessKeySecret = "df23df3f59884980844ff3dada30fa97"; String actualSignature = HmacSha1Utils.signString(stringToSign, accessKeySecret); String expectedSignature = "EoKyziXvKqzHgwx+ijDJwgVTDgE="; assertEquals(expectedSignature, actualSignature); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import static org.junit.Assert.*; import com.ctrip.framework.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.enums.ConfigSourceType; import com.ctrip.framework.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.internals.AbstractConfig; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.google.common.collect.Sets; import com.google.common.util.concurrent.SettableFuture; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Test; import org.mockito.Matchers; import static org.mockito.Mockito.*; /** * @author wxq */ public class InterestedConfigChangeEventTest { @Test public void TestInterestedChangedKeys() throws ExecutionException, InterruptedException, TimeoutException { final String namespace = "app"; final String keyPrefix = "key-abc."; final String key = keyPrefix + UUID.randomUUID(); final String anotherKey = UUID.randomUUID().toString(); final SettableFuture<ConfigChangeEvent> onChangeFuture = SettableFuture.create(); ConfigChangeListener configChangeListener = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { assertEquals(namespace, changeEvent.getNamespace()); assertEquals(2, changeEvent.changedKeys().size()); assertTrue(changeEvent.changedKeys().containsAll(Sets.newHashSet(key, anotherKey))); assertEquals(1, changeEvent.interestedChangedKeys().size()); assertTrue(changeEvent.interestedChangedKeys().contains(key)); onChangeFuture.set(changeEvent); } }); UnsupportedOperationConfig config = new UnsupportedOperationConfig(); config.addChangeListener(configChangeListener, Collections.singleton("key-nothing"), Collections.singleton(keyPrefix)); Map<String, ConfigChange> changes = new HashMap<>(); changes.put(key, new ConfigChange(namespace, key, "123", "456", PropertyChangeType.MODIFIED)); changes.put(anotherKey, new ConfigChange(namespace, anotherKey, null, "someValue", PropertyChangeType.ADDED)); config.fireConfigChange(namespace, changes); onChangeFuture.get(500, TimeUnit.MILLISECONDS); verify(configChangeListener, atLeastOnce()).onChange(Matchers.<ConfigChangeEvent>any()); } /** * @author wxq */ private static class UnsupportedOperationConfig extends AbstractConfig { @Override public String getProperty(String key, String defaultValue) { throw new UnsupportedOperationException(); } @Override public Set<String> getPropertyNames() { throw new UnsupportedOperationException(); } @Override public ConfigSourceType getSourceType() { throw new UnsupportedOperationException(); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import static org.junit.Assert.*; import com.ctrip.framework.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.enums.ConfigSourceType; import com.ctrip.framework.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.internals.AbstractConfig; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.google.common.collect.Sets; import com.google.common.util.concurrent.SettableFuture; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Test; import org.mockito.Matchers; import static org.mockito.Mockito.*; /** * @author wxq */ public class InterestedConfigChangeEventTest { @Test public void TestInterestedChangedKeys() throws ExecutionException, InterruptedException, TimeoutException { final String namespace = "app"; final String keyPrefix = "key-abc."; final String key = keyPrefix + UUID.randomUUID(); final String anotherKey = UUID.randomUUID().toString(); final SettableFuture<ConfigChangeEvent> onChangeFuture = SettableFuture.create(); ConfigChangeListener configChangeListener = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { assertEquals(namespace, changeEvent.getNamespace()); assertEquals(2, changeEvent.changedKeys().size()); assertTrue(changeEvent.changedKeys().containsAll(Sets.newHashSet(key, anotherKey))); assertEquals(1, changeEvent.interestedChangedKeys().size()); assertTrue(changeEvent.interestedChangedKeys().contains(key)); onChangeFuture.set(changeEvent); } }); UnsupportedOperationConfig config = new UnsupportedOperationConfig(); config.addChangeListener(configChangeListener, Collections.singleton("key-nothing"), Collections.singleton(keyPrefix)); Map<String, ConfigChange> changes = new HashMap<>(); changes.put(key, new ConfigChange(namespace, key, "123", "456", PropertyChangeType.MODIFIED)); changes.put(anotherKey, new ConfigChange(namespace, anotherKey, null, "someValue", PropertyChangeType.ADDED)); config.fireConfigChange(namespace, changes); onChangeFuture.get(500, TimeUnit.MILLISECONDS); verify(configChangeListener, atLeastOnce()).onChange(Matchers.<ConfigChangeEvent>any()); } /** * @author wxq */ private static class UnsupportedOperationConfig extends AbstractConfig { @Override public String getProperty(String key, String defaultValue) { throw new UnsupportedOperationException(); } @Override public Set<String> getPropertyNames() { throw new UnsupportedOperationException(); } @Override public ConfigSourceType getSourceType() { throw new UnsupportedOperationException(); } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/NamespaceBOUtils.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.util; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.core.utils.PropertiesUtil; import com.ctrip.framework.apollo.portal.controller.ConfigsExportController; import com.ctrip.framework.apollo.portal.entity.bo.ItemBO; import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO; import java.io.IOException; import java.util.List; import java.util.Properties; /** * @author wxq */ public class NamespaceBOUtils { /** * namespace must not be {@link ConfigFileFormat#Properties}. * the content of namespace in item's value which item's key is {@link ConfigConsts#CONFIG_FILE_CONTENT_KEY}. * @param namespaceBO namespace * @return content of non-properties's namespace */ static String convertNonProperties2configFileContent(NamespaceBO namespaceBO) { List<ItemBO> itemBOS = namespaceBO.getItems(); for (ItemBO itemBO : itemBOS) { String key = itemBO.getItem().getKey(); // special namespace format(not properties) if (ConfigConsts.CONFIG_FILE_CONTENT_KEY.equals(key)) { return itemBO.getItem().getValue(); } } // If there is no items? // return empty string "" return ""; } /** * copy from old {@link ConfigsExportController}. * convert {@link NamespaceBO} to a file content. * @return content of config file * @throws IllegalStateException if convert properties to string fail */ public static String convert2configFileContent(NamespaceBO namespaceBO) { // early return if it is not a properties format namespace if (!ConfigFileFormat.Properties.equals(ConfigFileFormat.fromString(namespaceBO.getFormat()))) { // it is not a properties namespace return convertNonProperties2configFileContent(namespaceBO); } // it must be a properties format namespace List<ItemBO> itemBOS = namespaceBO.getItems(); // save the kev value pair Properties properties = new Properties(); for (ItemBO itemBO : itemBOS) { String key = itemBO.getItem().getKey(); String value = itemBO.getItem().getValue(); // ignore comment, so the comment will lack properties.put(key, value); } // use a special method convert properties to string final String configFileContent; try { configFileContent = PropertiesUtil.toString(properties); } catch (IOException e) { throw new IllegalStateException("convert properties to string fail.", e); } return configFileContent; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.util; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.core.utils.PropertiesUtil; import com.ctrip.framework.apollo.portal.controller.ConfigsExportController; import com.ctrip.framework.apollo.portal.entity.bo.ItemBO; import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO; import java.io.IOException; import java.util.List; import java.util.Properties; /** * @author wxq */ public class NamespaceBOUtils { /** * namespace must not be {@link ConfigFileFormat#Properties}. * the content of namespace in item's value which item's key is {@link ConfigConsts#CONFIG_FILE_CONTENT_KEY}. * @param namespaceBO namespace * @return content of non-properties's namespace */ static String convertNonProperties2configFileContent(NamespaceBO namespaceBO) { List<ItemBO> itemBOS = namespaceBO.getItems(); for (ItemBO itemBO : itemBOS) { String key = itemBO.getItem().getKey(); // special namespace format(not properties) if (ConfigConsts.CONFIG_FILE_CONTENT_KEY.equals(key)) { return itemBO.getItem().getValue(); } } // If there is no items? // return empty string "" return ""; } /** * copy from old {@link ConfigsExportController}. * convert {@link NamespaceBO} to a file content. * @return content of config file * @throws IllegalStateException if convert properties to string fail */ public static String convert2configFileContent(NamespaceBO namespaceBO) { // early return if it is not a properties format namespace if (!ConfigFileFormat.Properties.equals(ConfigFileFormat.fromString(namespaceBO.getFormat()))) { // it is not a properties namespace return convertNonProperties2configFileContent(namespaceBO); } // it must be a properties format namespace List<ItemBO> itemBOS = namespaceBO.getItems(); // save the kev value pair Properties properties = new Properties(); for (ItemBO itemBO : itemBOS) { String key = itemBO.getItem().getKey(); String value = itemBO.getItem().getValue(); // ignore comment, so the comment will lack properties.put(key, value); } // use a special method convert properties to string final String configFileContent; try { configFileContent = PropertiesUtil.toString(properties); } catch (IOException e) { throw new IllegalStateException("convert properties to string fail.", e); } return configFileContent; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/services/ReleaseHistoryService.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('ReleaseHistoryService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_release_history_by_namespace: { method: 'GET', url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/releases/histories', isArray: true } }); function findReleaseHistoryByNamespace(appId, env, clusterName, namespaceName, page, size) { var d = $q.defer(); resource.find_release_history_by_namespace({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } return { findReleaseHistoryByNamespace: findReleaseHistoryByNamespace } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('ReleaseHistoryService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_release_history_by_namespace: { method: 'GET', url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/releases/histories', isArray: true } }); function findReleaseHistoryByNamespace(appId, env, clusterName, namespaceName, page, size) { var d = $q.defer(); resource.find_release_history_by_namespace({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } return { findReleaseHistoryByNamespace: findReleaseHistoryByNamespace } }]);
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/util/ConsumerAuthUtil.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.util; import com.ctrip.framework.apollo.openapi.service.ConsumerService; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; /** * @author Jason Song(song_s@ctrip.com) */ @Service public class ConsumerAuthUtil { static final String CONSUMER_ID = "ApolloConsumerId"; private final ConsumerService consumerService; public ConsumerAuthUtil(final ConsumerService consumerService) { this.consumerService = consumerService; } public Long getConsumerId(String token) { return consumerService.getConsumerIdByToken(token); } public void storeConsumerId(HttpServletRequest request, Long consumerId) { request.setAttribute(CONSUMER_ID, consumerId); } public long retrieveConsumerId(HttpServletRequest request) { Object value = request.getAttribute(CONSUMER_ID); try { return Long.parseLong(value.toString()); } catch (Throwable ex) { throw new IllegalStateException("No consumer id!", ex); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.util; import com.ctrip.framework.apollo.openapi.service.ConsumerService; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; /** * @author Jason Song(song_s@ctrip.com) */ @Service public class ConsumerAuthUtil { static final String CONSUMER_ID = "ApolloConsumerId"; private final ConsumerService consumerService; public ConsumerAuthUtil(final ConsumerService consumerService) { this.consumerService = consumerService; } public Long getConsumerId(String token) { return consumerService.getConsumerIdByToken(token); } public void storeConsumerId(HttpServletRequest request, Long consumerId) { request.setAttribute(CONSUMER_ID, consumerId); } public long retrieveConsumerId(HttpServletRequest request) { Object value = request.getAttribute(CONSUMER_ID); try { return Long.parseLong(value.toString()); } catch (Throwable ex) { throw new IllegalStateException("No consumer id!", ex); } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClient.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.client; import com.ctrip.framework.apollo.openapi.client.constant.ApolloOpenApiConstants; import com.ctrip.framework.apollo.openapi.client.service.AppOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.ClusterOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.ItemOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.NamespaceOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.ReleaseOpenApiService; import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO; import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO; import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO; import com.ctrip.framework.apollo.openapi.dto.OpenEnvClusterDTO; import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO; import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicHeader; import java.util.List; /** * This class contains collections of methods to access Apollo Open Api. * <br /> * For more information, please refer <a href="https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform">Apollo Wiki</a>. * */ public class ApolloOpenApiClient { private final String portalUrl; private final String token; private final AppOpenApiService appService; private final ItemOpenApiService itemService; private final ReleaseOpenApiService releaseService; private final NamespaceOpenApiService namespaceService; private final ClusterOpenApiService clusterService; private static final Gson GSON = new GsonBuilder().setDateFormat(ApolloOpenApiConstants.JSON_DATE_FORMAT).create(); private ApolloOpenApiClient(String portalUrl, String token, RequestConfig requestConfig) { this.portalUrl = portalUrl; this.token = token; CloseableHttpClient client = HttpClients.custom().setDefaultRequestConfig(requestConfig) .setDefaultHeaders(Lists.newArrayList(new BasicHeader("Authorization", token))).build(); String baseUrl = this.portalUrl + ApolloOpenApiConstants.OPEN_API_V1_PREFIX; appService = new AppOpenApiService(client, baseUrl, GSON); clusterService = new ClusterOpenApiService(client, baseUrl, GSON); namespaceService = new NamespaceOpenApiService(client, baseUrl, GSON); itemService = new ItemOpenApiService(client, baseUrl, GSON); releaseService = new ReleaseOpenApiService(client, baseUrl, GSON); } /** * Get the environment and cluster information */ public List<OpenEnvClusterDTO> getEnvClusterInfo(String appId) { return appService.getEnvClusterInfo(appId); } /** * Get all App information */ public List<OpenAppDTO> getAllApps() { return appService.getAppsInfo(null); } /** * Get applications which can be operated by current open api client. * * @return app's information */ public List<OpenAppDTO> getAuthorizedApps() { return this.appService.getAuthorizedApps(); } /** * Get App information by app ids */ public List<OpenAppDTO> getAppsByIds(List<String> appIds) { return appService.getAppsInfo(appIds); } /** * Get the namespaces */ public List<OpenNamespaceDTO> getNamespaces(String appId, String env, String clusterName) { return namespaceService.getNamespaces(appId, env, clusterName); } /** * Get the cluster * * @since 1.5.0 */ public OpenClusterDTO getCluster(String appId, String env, String clusterName) { return clusterService.getCluster(appId, env, clusterName); } /** * Create the cluster * * @since 1.5.0 */ public OpenClusterDTO createCluster(String env, OpenClusterDTO openClusterDTO) { return clusterService.createCluster(env, openClusterDTO); } /** * Get the namespace */ public OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName) { return namespaceService.getNamespace(appId, env, clusterName, namespaceName); } /** * Create the app namespace */ public OpenAppNamespaceDTO createAppNamespace(OpenAppNamespaceDTO appNamespaceDTO) { return namespaceService.createAppNamespace(appNamespaceDTO); } /** * Get the namespace lock */ public OpenNamespaceLockDTO getNamespaceLock(String appId, String env, String clusterName, String namespaceName) { return namespaceService.getNamespaceLock(appId, env, clusterName, namespaceName); } /** * Get config * * @return the item or null if not exists * * @since 1.2.0 */ public OpenItemDTO getItem(String appId, String env, String clusterName, String namespaceName, String key) { return itemService.getItem(appId, env, clusterName, namespaceName, key); } /** * Add config * @return the created config */ public OpenItemDTO createItem(String appId, String env, String clusterName, String namespaceName, OpenItemDTO itemDTO) { return itemService.createItem(appId, env, clusterName, namespaceName, itemDTO); } /** * Update config */ public void updateItem(String appId, String env, String clusterName, String namespaceName, OpenItemDTO itemDTO) { itemService.updateItem(appId, env, clusterName, namespaceName, itemDTO); } /** * Create config if not exists or update config if already exists */ public void createOrUpdateItem(String appId, String env, String clusterName, String namespaceName, OpenItemDTO itemDTO) { itemService.createOrUpdateItem(appId, env, clusterName, namespaceName, itemDTO); } /** * Remove config * * @param operator the user who removes the item */ public void removeItem(String appId, String env, String clusterName, String namespaceName, String key, String operator) { itemService.removeItem(appId, env, clusterName, namespaceName, key, operator); } /** * publish namespace * @return the released configurations */ public OpenReleaseDTO publishNamespace(String appId, String env, String clusterName, String namespaceName, NamespaceReleaseDTO releaseDTO) { return releaseService.publishNamespace(appId, env, clusterName, namespaceName, releaseDTO); } /** * @return the latest active release information or <code>null</code> if not found */ public OpenReleaseDTO getLatestActiveRelease(String appId, String env, String clusterName, String namespaceName) { return releaseService.getLatestActiveRelease(appId, env, clusterName, namespaceName); } /** * Rollback the release * * @param operator the user who rollbacks the release * @since 1.5.0 */ public void rollbackRelease(String env, long releaseId, String operator) { releaseService.rollbackRelease(env, releaseId, operator); } public String getPortalUrl() { return portalUrl; } public String getToken() { return token; } public static ApolloOpenApiClientBuilder newBuilder() { return new ApolloOpenApiClientBuilder(); } public static class ApolloOpenApiClientBuilder { private String portalUrl; private String token; private int connectTimeout = -1; private int readTimeout = -1; /** * @param portalUrl The apollo portal url, e.g http://localhost:8070 */ public ApolloOpenApiClientBuilder withPortalUrl(String portalUrl) { this.portalUrl = portalUrl; return this; } /** * @param token The authorization token, e.g. e16e5cd903fd0c97a116c873b448544b9d086de8 */ public ApolloOpenApiClientBuilder withToken(String token) { this.token = token; return this; } /** * @param connectTimeout an int that specifies the connect timeout value in milliseconds */ public ApolloOpenApiClientBuilder withConnectTimeout(int connectTimeout) { this.connectTimeout = connectTimeout; return this; } /** * @param readTimeout an int that specifies the timeout value to be used in milliseconds */ public ApolloOpenApiClientBuilder withReadTimeout(int readTimeout) { this.readTimeout = readTimeout; return this; } public ApolloOpenApiClient build() { Preconditions.checkArgument(!Strings.isNullOrEmpty(portalUrl), "Portal url should not be null or empty!"); Preconditions.checkArgument(portalUrl.startsWith("http://") || portalUrl.startsWith("https://"), "Portal url should start with http:// or https://" ); Preconditions.checkArgument(!Strings.isNullOrEmpty(token), "Token should not be null or empty!"); if (connectTimeout < 0) { connectTimeout = ApolloOpenApiConstants.DEFAULT_CONNECT_TIMEOUT; } if (readTimeout < 0) { readTimeout = ApolloOpenApiConstants.DEFAULT_READ_TIMEOUT; } RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(connectTimeout) .setSocketTimeout(readTimeout).build(); return new ApolloOpenApiClient(portalUrl, token, requestConfig); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.client; import com.ctrip.framework.apollo.openapi.client.constant.ApolloOpenApiConstants; import com.ctrip.framework.apollo.openapi.client.service.AppOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.ClusterOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.ItemOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.NamespaceOpenApiService; import com.ctrip.framework.apollo.openapi.client.service.ReleaseOpenApiService; import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO; import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO; import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO; import com.ctrip.framework.apollo.openapi.dto.OpenEnvClusterDTO; import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO; import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO; import com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicHeader; import java.util.List; /** * This class contains collections of methods to access Apollo Open Api. * <br /> * For more information, please refer <a href="https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform">Apollo Wiki</a>. * */ public class ApolloOpenApiClient { private final String portalUrl; private final String token; private final AppOpenApiService appService; private final ItemOpenApiService itemService; private final ReleaseOpenApiService releaseService; private final NamespaceOpenApiService namespaceService; private final ClusterOpenApiService clusterService; private static final Gson GSON = new GsonBuilder().setDateFormat(ApolloOpenApiConstants.JSON_DATE_FORMAT).create(); private ApolloOpenApiClient(String portalUrl, String token, RequestConfig requestConfig) { this.portalUrl = portalUrl; this.token = token; CloseableHttpClient client = HttpClients.custom().setDefaultRequestConfig(requestConfig) .setDefaultHeaders(Lists.newArrayList(new BasicHeader("Authorization", token))).build(); String baseUrl = this.portalUrl + ApolloOpenApiConstants.OPEN_API_V1_PREFIX; appService = new AppOpenApiService(client, baseUrl, GSON); clusterService = new ClusterOpenApiService(client, baseUrl, GSON); namespaceService = new NamespaceOpenApiService(client, baseUrl, GSON); itemService = new ItemOpenApiService(client, baseUrl, GSON); releaseService = new ReleaseOpenApiService(client, baseUrl, GSON); } /** * Get the environment and cluster information */ public List<OpenEnvClusterDTO> getEnvClusterInfo(String appId) { return appService.getEnvClusterInfo(appId); } /** * Get all App information */ public List<OpenAppDTO> getAllApps() { return appService.getAppsInfo(null); } /** * Get applications which can be operated by current open api client. * * @return app's information */ public List<OpenAppDTO> getAuthorizedApps() { return this.appService.getAuthorizedApps(); } /** * Get App information by app ids */ public List<OpenAppDTO> getAppsByIds(List<String> appIds) { return appService.getAppsInfo(appIds); } /** * Get the namespaces */ public List<OpenNamespaceDTO> getNamespaces(String appId, String env, String clusterName) { return namespaceService.getNamespaces(appId, env, clusterName); } /** * Get the cluster * * @since 1.5.0 */ public OpenClusterDTO getCluster(String appId, String env, String clusterName) { return clusterService.getCluster(appId, env, clusterName); } /** * Create the cluster * * @since 1.5.0 */ public OpenClusterDTO createCluster(String env, OpenClusterDTO openClusterDTO) { return clusterService.createCluster(env, openClusterDTO); } /** * Get the namespace */ public OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName) { return namespaceService.getNamespace(appId, env, clusterName, namespaceName); } /** * Create the app namespace */ public OpenAppNamespaceDTO createAppNamespace(OpenAppNamespaceDTO appNamespaceDTO) { return namespaceService.createAppNamespace(appNamespaceDTO); } /** * Get the namespace lock */ public OpenNamespaceLockDTO getNamespaceLock(String appId, String env, String clusterName, String namespaceName) { return namespaceService.getNamespaceLock(appId, env, clusterName, namespaceName); } /** * Get config * * @return the item or null if not exists * * @since 1.2.0 */ public OpenItemDTO getItem(String appId, String env, String clusterName, String namespaceName, String key) { return itemService.getItem(appId, env, clusterName, namespaceName, key); } /** * Add config * @return the created config */ public OpenItemDTO createItem(String appId, String env, String clusterName, String namespaceName, OpenItemDTO itemDTO) { return itemService.createItem(appId, env, clusterName, namespaceName, itemDTO); } /** * Update config */ public void updateItem(String appId, String env, String clusterName, String namespaceName, OpenItemDTO itemDTO) { itemService.updateItem(appId, env, clusterName, namespaceName, itemDTO); } /** * Create config if not exists or update config if already exists */ public void createOrUpdateItem(String appId, String env, String clusterName, String namespaceName, OpenItemDTO itemDTO) { itemService.createOrUpdateItem(appId, env, clusterName, namespaceName, itemDTO); } /** * Remove config * * @param operator the user who removes the item */ public void removeItem(String appId, String env, String clusterName, String namespaceName, String key, String operator) { itemService.removeItem(appId, env, clusterName, namespaceName, key, operator); } /** * publish namespace * @return the released configurations */ public OpenReleaseDTO publishNamespace(String appId, String env, String clusterName, String namespaceName, NamespaceReleaseDTO releaseDTO) { return releaseService.publishNamespace(appId, env, clusterName, namespaceName, releaseDTO); } /** * @return the latest active release information or <code>null</code> if not found */ public OpenReleaseDTO getLatestActiveRelease(String appId, String env, String clusterName, String namespaceName) { return releaseService.getLatestActiveRelease(appId, env, clusterName, namespaceName); } /** * Rollback the release * * @param operator the user who rollbacks the release * @since 1.5.0 */ public void rollbackRelease(String env, long releaseId, String operator) { releaseService.rollbackRelease(env, releaseId, operator); } public String getPortalUrl() { return portalUrl; } public String getToken() { return token; } public static ApolloOpenApiClientBuilder newBuilder() { return new ApolloOpenApiClientBuilder(); } public static class ApolloOpenApiClientBuilder { private String portalUrl; private String token; private int connectTimeout = -1; private int readTimeout = -1; /** * @param portalUrl The apollo portal url, e.g http://localhost:8070 */ public ApolloOpenApiClientBuilder withPortalUrl(String portalUrl) { this.portalUrl = portalUrl; return this; } /** * @param token The authorization token, e.g. e16e5cd903fd0c97a116c873b448544b9d086de8 */ public ApolloOpenApiClientBuilder withToken(String token) { this.token = token; return this; } /** * @param connectTimeout an int that specifies the connect timeout value in milliseconds */ public ApolloOpenApiClientBuilder withConnectTimeout(int connectTimeout) { this.connectTimeout = connectTimeout; return this; } /** * @param readTimeout an int that specifies the timeout value to be used in milliseconds */ public ApolloOpenApiClientBuilder withReadTimeout(int readTimeout) { this.readTimeout = readTimeout; return this; } public ApolloOpenApiClient build() { Preconditions.checkArgument(!Strings.isNullOrEmpty(portalUrl), "Portal url should not be null or empty!"); Preconditions.checkArgument(portalUrl.startsWith("http://") || portalUrl.startsWith("https://"), "Portal url should start with http:// or https://" ); Preconditions.checkArgument(!Strings.isNullOrEmpty(token), "Token should not be null or empty!"); if (connectTimeout < 0) { connectTimeout = ApolloOpenApiConstants.DEFAULT_CONNECT_TIMEOUT; } if (readTimeout < 0) { readTimeout = ApolloOpenApiConstants.DEFAULT_READ_TIMEOUT; } RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(connectTimeout) .setSocketTimeout(readTimeout).build(); return new ApolloOpenApiClient(portalUrl, token, requestConfig); } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigFileController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.controller; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.grayReleaseRule.GrayReleaseRulesHolder; import com.ctrip.framework.apollo.biz.message.ReleaseMessageListener; import com.ctrip.framework.apollo.biz.message.Topics; import com.ctrip.framework.apollo.configservice.util.NamespaceUtil; import com.ctrip.framework.apollo.configservice.util.WatchKeysUtil; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.dto.ApolloConfig; import com.ctrip.framework.apollo.core.utils.PropertiesUtil; import com.ctrip.framework.apollo.tracer.Tracer; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.Weigher; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; /** * @author Jason Song(song_s@ctrip.com) */ @RestController @RequestMapping("/configfiles") public class ConfigFileController implements ReleaseMessageListener { private static final Logger logger = LoggerFactory.getLogger(ConfigFileController.class); private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR); private static final Splitter X_FORWARDED_FOR_SPLITTER = Splitter.on(",").omitEmptyStrings() .trimResults(); private static final long MAX_CACHE_SIZE = 50 * 1024 * 1024; // 50MB private static final long EXPIRE_AFTER_WRITE = 30; private final HttpHeaders propertiesResponseHeaders; private final HttpHeaders jsonResponseHeaders; private final ResponseEntity<String> NOT_FOUND_RESPONSE; private Cache<String, String> localCache; private final Multimap<String, String> watchedKeys2CacheKey = Multimaps.synchronizedSetMultimap(HashMultimap.create()); private final Multimap<String, String> cacheKey2WatchedKeys = Multimaps.synchronizedSetMultimap(HashMultimap.create()); private static final Gson GSON = new Gson(); private final ConfigController configController; private final NamespaceUtil namespaceUtil; private final WatchKeysUtil watchKeysUtil; private final GrayReleaseRulesHolder grayReleaseRulesHolder; public ConfigFileController( final ConfigController configController, final NamespaceUtil namespaceUtil, final WatchKeysUtil watchKeysUtil, final GrayReleaseRulesHolder grayReleaseRulesHolder) { localCache = CacheBuilder.newBuilder() .expireAfterWrite(EXPIRE_AFTER_WRITE, TimeUnit.MINUTES) .weigher((Weigher<String, String>) (key, value) -> value == null ? 0 : value.length()) .maximumWeight(MAX_CACHE_SIZE) .removalListener(notification -> { String cacheKey = notification.getKey(); logger.debug("removing cache key: {}", cacheKey); if (!cacheKey2WatchedKeys.containsKey(cacheKey)) { return; } //create a new list to avoid ConcurrentModificationException List<String> watchedKeys = new ArrayList<>(cacheKey2WatchedKeys.get(cacheKey)); for (String watchedKey : watchedKeys) { watchedKeys2CacheKey.remove(watchedKey, cacheKey); } cacheKey2WatchedKeys.removeAll(cacheKey); logger.debug("removed cache key: {}", cacheKey); }) .build(); propertiesResponseHeaders = new HttpHeaders(); propertiesResponseHeaders.add("Content-Type", "text/plain;charset=UTF-8"); jsonResponseHeaders = new HttpHeaders(); jsonResponseHeaders.add("Content-Type", "application/json;charset=UTF-8"); NOT_FOUND_RESPONSE = new ResponseEntity<>(HttpStatus.NOT_FOUND); this.configController = configController; this.namespaceUtil = namespaceUtil; this.watchKeysUtil = watchKeysUtil; this.grayReleaseRulesHolder = grayReleaseRulesHolder; } @GetMapping(value = "/{appId}/{clusterName}/{namespace:.+}") public ResponseEntity<String> queryConfigAsProperties(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespace, @RequestParam(value = "dataCenter", required = false) String dataCenter, @RequestParam(value = "ip", required = false) String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { String result = queryConfig(ConfigFileOutputFormat.PROPERTIES, appId, clusterName, namespace, dataCenter, clientIp, request, response); if (result == null) { return NOT_FOUND_RESPONSE; } return new ResponseEntity<>(result, propertiesResponseHeaders, HttpStatus.OK); } @GetMapping(value = "/json/{appId}/{clusterName}/{namespace:.+}") public ResponseEntity<String> queryConfigAsJson(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespace, @RequestParam(value = "dataCenter", required = false) String dataCenter, @RequestParam(value = "ip", required = false) String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { String result = queryConfig(ConfigFileOutputFormat.JSON, appId, clusterName, namespace, dataCenter, clientIp, request, response); if (result == null) { return NOT_FOUND_RESPONSE; } return new ResponseEntity<>(result, jsonResponseHeaders, HttpStatus.OK); } String queryConfig(ConfigFileOutputFormat outputFormat, String appId, String clusterName, String namespace, String dataCenter, String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { //strip out .properties suffix namespace = namespaceUtil.filterNamespaceName(namespace); //fix the character case issue, such as FX.apollo <-> fx.apollo namespace = namespaceUtil.normalizeNamespace(appId, namespace); if (Strings.isNullOrEmpty(clientIp)) { clientIp = tryToGetClientIp(request); } //1. check whether this client has gray release rules boolean hasGrayReleaseRule = grayReleaseRulesHolder.hasGrayReleaseRule(appId, clientIp, namespace); String cacheKey = assembleCacheKey(outputFormat, appId, clusterName, namespace, dataCenter); //2. try to load gray release and return if (hasGrayReleaseRule) { Tracer.logEvent("ConfigFile.Cache.GrayRelease", cacheKey); return loadConfig(outputFormat, appId, clusterName, namespace, dataCenter, clientIp, request, response); } //3. if not gray release, check weather cache exists, if exists, return String result = localCache.getIfPresent(cacheKey); //4. if not exists, load from ConfigController if (Strings.isNullOrEmpty(result)) { Tracer.logEvent("ConfigFile.Cache.Miss", cacheKey); result = loadConfig(outputFormat, appId, clusterName, namespace, dataCenter, clientIp, request, response); if (result == null) { return null; } //5. Double check if this client needs to load gray release, if yes, load from db again //This step is mainly to avoid cache pollution if (grayReleaseRulesHolder.hasGrayReleaseRule(appId, clientIp, namespace)) { Tracer.logEvent("ConfigFile.Cache.GrayReleaseConflict", cacheKey); return loadConfig(outputFormat, appId, clusterName, namespace, dataCenter, clientIp, request, response); } localCache.put(cacheKey, result); logger.debug("adding cache for key: {}", cacheKey); Set<String> watchedKeys = watchKeysUtil.assembleAllWatchKeys(appId, clusterName, namespace, dataCenter); for (String watchedKey : watchedKeys) { watchedKeys2CacheKey.put(watchedKey, cacheKey); } cacheKey2WatchedKeys.putAll(cacheKey, watchedKeys); logger.debug("added cache for key: {}", cacheKey); } else { Tracer.logEvent("ConfigFile.Cache.Hit", cacheKey); } return result; } private String loadConfig(ConfigFileOutputFormat outputFormat, String appId, String clusterName, String namespace, String dataCenter, String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { ApolloConfig apolloConfig = configController.queryConfig(appId, clusterName, namespace, dataCenter, "-1", clientIp, null, request, response); if (apolloConfig == null || apolloConfig.getConfigurations() == null) { return null; } String result = null; switch (outputFormat) { case PROPERTIES: Properties properties = new Properties(); properties.putAll(apolloConfig.getConfigurations()); result = PropertiesUtil.toString(properties); break; case JSON: result = GSON.toJson(apolloConfig.getConfigurations()); break; } return result; } String assembleCacheKey(ConfigFileOutputFormat outputFormat, String appId, String clusterName, String namespace, String dataCenter) { List<String> keyParts = Lists.newArrayList(outputFormat.getValue(), appId, clusterName, namespace); if (!Strings.isNullOrEmpty(dataCenter)) { keyParts.add(dataCenter); } return STRING_JOINER.join(keyParts); } @Override public void handleMessage(ReleaseMessage message, String channel) { logger.info("message received - channel: {}, message: {}", channel, message); String content = message.getMessage(); if (!Topics.APOLLO_RELEASE_TOPIC.equals(channel) || Strings.isNullOrEmpty(content)) { return; } if (!watchedKeys2CacheKey.containsKey(content)) { return; } //create a new list to avoid ConcurrentModificationException List<String> cacheKeys = new ArrayList<>(watchedKeys2CacheKey.get(content)); for (String cacheKey : cacheKeys) { logger.debug("invalidate cache key: {}", cacheKey); localCache.invalidate(cacheKey); } } enum ConfigFileOutputFormat { PROPERTIES("properties"), JSON("json"); private String value; ConfigFileOutputFormat(String value) { this.value = value; } public String getValue() { return value; } } private String tryToGetClientIp(HttpServletRequest request) { String forwardedFor = request.getHeader("X-FORWARDED-FOR"); if (!Strings.isNullOrEmpty(forwardedFor)) { return X_FORWARDED_FOR_SPLITTER.splitToList(forwardedFor).get(0); } return request.getRemoteAddr(); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.controller; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.grayReleaseRule.GrayReleaseRulesHolder; import com.ctrip.framework.apollo.biz.message.ReleaseMessageListener; import com.ctrip.framework.apollo.biz.message.Topics; import com.ctrip.framework.apollo.configservice.util.NamespaceUtil; import com.ctrip.framework.apollo.configservice.util.WatchKeysUtil; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.dto.ApolloConfig; import com.ctrip.framework.apollo.core.utils.PropertiesUtil; import com.ctrip.framework.apollo.tracer.Tracer; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.Weigher; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; /** * @author Jason Song(song_s@ctrip.com) */ @RestController @RequestMapping("/configfiles") public class ConfigFileController implements ReleaseMessageListener { private static final Logger logger = LoggerFactory.getLogger(ConfigFileController.class); private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR); private static final Splitter X_FORWARDED_FOR_SPLITTER = Splitter.on(",").omitEmptyStrings() .trimResults(); private static final long MAX_CACHE_SIZE = 50 * 1024 * 1024; // 50MB private static final long EXPIRE_AFTER_WRITE = 30; private final HttpHeaders propertiesResponseHeaders; private final HttpHeaders jsonResponseHeaders; private final ResponseEntity<String> NOT_FOUND_RESPONSE; private Cache<String, String> localCache; private final Multimap<String, String> watchedKeys2CacheKey = Multimaps.synchronizedSetMultimap(HashMultimap.create()); private final Multimap<String, String> cacheKey2WatchedKeys = Multimaps.synchronizedSetMultimap(HashMultimap.create()); private static final Gson GSON = new Gson(); private final ConfigController configController; private final NamespaceUtil namespaceUtil; private final WatchKeysUtil watchKeysUtil; private final GrayReleaseRulesHolder grayReleaseRulesHolder; public ConfigFileController( final ConfigController configController, final NamespaceUtil namespaceUtil, final WatchKeysUtil watchKeysUtil, final GrayReleaseRulesHolder grayReleaseRulesHolder) { localCache = CacheBuilder.newBuilder() .expireAfterWrite(EXPIRE_AFTER_WRITE, TimeUnit.MINUTES) .weigher((Weigher<String, String>) (key, value) -> value == null ? 0 : value.length()) .maximumWeight(MAX_CACHE_SIZE) .removalListener(notification -> { String cacheKey = notification.getKey(); logger.debug("removing cache key: {}", cacheKey); if (!cacheKey2WatchedKeys.containsKey(cacheKey)) { return; } //create a new list to avoid ConcurrentModificationException List<String> watchedKeys = new ArrayList<>(cacheKey2WatchedKeys.get(cacheKey)); for (String watchedKey : watchedKeys) { watchedKeys2CacheKey.remove(watchedKey, cacheKey); } cacheKey2WatchedKeys.removeAll(cacheKey); logger.debug("removed cache key: {}", cacheKey); }) .build(); propertiesResponseHeaders = new HttpHeaders(); propertiesResponseHeaders.add("Content-Type", "text/plain;charset=UTF-8"); jsonResponseHeaders = new HttpHeaders(); jsonResponseHeaders.add("Content-Type", "application/json;charset=UTF-8"); NOT_FOUND_RESPONSE = new ResponseEntity<>(HttpStatus.NOT_FOUND); this.configController = configController; this.namespaceUtil = namespaceUtil; this.watchKeysUtil = watchKeysUtil; this.grayReleaseRulesHolder = grayReleaseRulesHolder; } @GetMapping(value = "/{appId}/{clusterName}/{namespace:.+}") public ResponseEntity<String> queryConfigAsProperties(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespace, @RequestParam(value = "dataCenter", required = false) String dataCenter, @RequestParam(value = "ip", required = false) String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { String result = queryConfig(ConfigFileOutputFormat.PROPERTIES, appId, clusterName, namespace, dataCenter, clientIp, request, response); if (result == null) { return NOT_FOUND_RESPONSE; } return new ResponseEntity<>(result, propertiesResponseHeaders, HttpStatus.OK); } @GetMapping(value = "/json/{appId}/{clusterName}/{namespace:.+}") public ResponseEntity<String> queryConfigAsJson(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespace, @RequestParam(value = "dataCenter", required = false) String dataCenter, @RequestParam(value = "ip", required = false) String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { String result = queryConfig(ConfigFileOutputFormat.JSON, appId, clusterName, namespace, dataCenter, clientIp, request, response); if (result == null) { return NOT_FOUND_RESPONSE; } return new ResponseEntity<>(result, jsonResponseHeaders, HttpStatus.OK); } String queryConfig(ConfigFileOutputFormat outputFormat, String appId, String clusterName, String namespace, String dataCenter, String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { //strip out .properties suffix namespace = namespaceUtil.filterNamespaceName(namespace); //fix the character case issue, such as FX.apollo <-> fx.apollo namespace = namespaceUtil.normalizeNamespace(appId, namespace); if (Strings.isNullOrEmpty(clientIp)) { clientIp = tryToGetClientIp(request); } //1. check whether this client has gray release rules boolean hasGrayReleaseRule = grayReleaseRulesHolder.hasGrayReleaseRule(appId, clientIp, namespace); String cacheKey = assembleCacheKey(outputFormat, appId, clusterName, namespace, dataCenter); //2. try to load gray release and return if (hasGrayReleaseRule) { Tracer.logEvent("ConfigFile.Cache.GrayRelease", cacheKey); return loadConfig(outputFormat, appId, clusterName, namespace, dataCenter, clientIp, request, response); } //3. if not gray release, check weather cache exists, if exists, return String result = localCache.getIfPresent(cacheKey); //4. if not exists, load from ConfigController if (Strings.isNullOrEmpty(result)) { Tracer.logEvent("ConfigFile.Cache.Miss", cacheKey); result = loadConfig(outputFormat, appId, clusterName, namespace, dataCenter, clientIp, request, response); if (result == null) { return null; } //5. Double check if this client needs to load gray release, if yes, load from db again //This step is mainly to avoid cache pollution if (grayReleaseRulesHolder.hasGrayReleaseRule(appId, clientIp, namespace)) { Tracer.logEvent("ConfigFile.Cache.GrayReleaseConflict", cacheKey); return loadConfig(outputFormat, appId, clusterName, namespace, dataCenter, clientIp, request, response); } localCache.put(cacheKey, result); logger.debug("adding cache for key: {}", cacheKey); Set<String> watchedKeys = watchKeysUtil.assembleAllWatchKeys(appId, clusterName, namespace, dataCenter); for (String watchedKey : watchedKeys) { watchedKeys2CacheKey.put(watchedKey, cacheKey); } cacheKey2WatchedKeys.putAll(cacheKey, watchedKeys); logger.debug("added cache for key: {}", cacheKey); } else { Tracer.logEvent("ConfigFile.Cache.Hit", cacheKey); } return result; } private String loadConfig(ConfigFileOutputFormat outputFormat, String appId, String clusterName, String namespace, String dataCenter, String clientIp, HttpServletRequest request, HttpServletResponse response) throws IOException { ApolloConfig apolloConfig = configController.queryConfig(appId, clusterName, namespace, dataCenter, "-1", clientIp, null, request, response); if (apolloConfig == null || apolloConfig.getConfigurations() == null) { return null; } String result = null; switch (outputFormat) { case PROPERTIES: Properties properties = new Properties(); properties.putAll(apolloConfig.getConfigurations()); result = PropertiesUtil.toString(properties); break; case JSON: result = GSON.toJson(apolloConfig.getConfigurations()); break; } return result; } String assembleCacheKey(ConfigFileOutputFormat outputFormat, String appId, String clusterName, String namespace, String dataCenter) { List<String> keyParts = Lists.newArrayList(outputFormat.getValue(), appId, clusterName, namespace); if (!Strings.isNullOrEmpty(dataCenter)) { keyParts.add(dataCenter); } return STRING_JOINER.join(keyParts); } @Override public void handleMessage(ReleaseMessage message, String channel) { logger.info("message received - channel: {}, message: {}", channel, message); String content = message.getMessage(); if (!Topics.APOLLO_RELEASE_TOPIC.equals(channel) || Strings.isNullOrEmpty(content)) { return; } if (!watchedKeys2CacheKey.containsKey(content)) { return; } //create a new list to avoid ConcurrentModificationException List<String> cacheKeys = new ArrayList<>(watchedKeys2CacheKey.get(content)); for (String cacheKey : cacheKeys) { logger.debug("invalidate cache key: {}", cacheKey); localCache.invalidate(cacheKey); } } enum ConfigFileOutputFormat { PROPERTIES("properties"), JSON("json"); private String value; ConfigFileOutputFormat(String value) { this.value = value; } public String getValue() { return value; } } private String tryToGetClientIp(HttpServletRequest request) { String forwardedFor = request.getHeader("X-FORWARDED-FOR"); if (!Strings.isNullOrEmpty(forwardedFor)) { return X_FORWARDED_FOR_SPLITTER.splitToList(forwardedFor).get(0); } return request.getRemoteAddr(); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapProperties.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.configuration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.env.Environment; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import java.util.HashMap; import java.util.Map; /** * @author xm.lin xm.lin@anxincloud.com * @Description * @date 18-8-9 下午4:36 */ @ConfigurationProperties(prefix = "spring.ldap") public class LdapProperties { private static final int DEFAULT_PORT = 389; /** * LDAP URLs of the server. */ private String[] urls; /** * Base suffix from which all operations should originate. */ private String base; /** * Login username of the server. */ private String username; /** * Login password of the server. */ private String password; /** * Whether read-only operations should use an anonymous environment. */ private boolean anonymousReadOnly; /** * User search filter */ private String searchFilter; /** * LDAP specification settings. */ private final Map<String, String> baseEnvironment = new HashMap<>(); public String[] getUrls() { return this.urls; } public void setUrls(String[] urls) { this.urls = urls; } public String getBase() { return this.base; } public void setBase(String base) { this.base = base; } public String getUsername() { return this.username; } public void setUsername(String username) { this.username = username; } public String getPassword() { return this.password; } public void setPassword(String password) { this.password = password; } public boolean getAnonymousReadOnly() { return this.anonymousReadOnly; } public void setAnonymousReadOnly(boolean anonymousReadOnly) { this.anonymousReadOnly = anonymousReadOnly; } public String getSearchFilter() { return searchFilter; } public void setSearchFilter(String searchFilter) { this.searchFilter = searchFilter; } public Map<String, String> getBaseEnvironment() { return this.baseEnvironment; } public String[] determineUrls(Environment environment) { if (ObjectUtils.isEmpty(this.urls)) { return new String[]{"ldap://localhost:" + determinePort(environment)}; } return this.urls; } private int determinePort(Environment environment) { Assert.notNull(environment, "Environment must not be null"); String localPort = environment.getProperty("local.ldap.port"); if (localPort != null) { return Integer.parseInt(localPort); } return DEFAULT_PORT; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.configuration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.env.Environment; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import java.util.HashMap; import java.util.Map; /** * @author xm.lin xm.lin@anxincloud.com * @Description * @date 18-8-9 下午4:36 */ @ConfigurationProperties(prefix = "spring.ldap") public class LdapProperties { private static final int DEFAULT_PORT = 389; /** * LDAP URLs of the server. */ private String[] urls; /** * Base suffix from which all operations should originate. */ private String base; /** * Login username of the server. */ private String username; /** * Login password of the server. */ private String password; /** * Whether read-only operations should use an anonymous environment. */ private boolean anonymousReadOnly; /** * User search filter */ private String searchFilter; /** * LDAP specification settings. */ private final Map<String, String> baseEnvironment = new HashMap<>(); public String[] getUrls() { return this.urls; } public void setUrls(String[] urls) { this.urls = urls; } public String getBase() { return this.base; } public void setBase(String base) { this.base = base; } public String getUsername() { return this.username; } public void setUsername(String username) { this.username = username; } public String getPassword() { return this.password; } public void setPassword(String password) { this.password = password; } public boolean getAnonymousReadOnly() { return this.anonymousReadOnly; } public void setAnonymousReadOnly(boolean anonymousReadOnly) { this.anonymousReadOnly = anonymousReadOnly; } public String getSearchFilter() { return searchFilter; } public void setSearchFilter(String searchFilter) { this.searchFilter = searchFilter; } public Map<String, String> getBaseEnvironment() { return this.baseEnvironment; } public String[] determineUrls(Environment environment) { if (ObjectUtils.isEmpty(this.urls)) { return new String[]{"ldap://localhost:" + determinePort(environment)}; } return this.urls; } private int determinePort(Environment environment) { Assert.notNull(environment, "Environment must not be null"); String localPort = environment.getProperty("local.ldap.port"); if (localPort != null) { return Integer.parseInt(localPort); } return DEFAULT_PORT; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/FavoriteRepository.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.repository; import com.ctrip.framework.apollo.portal.entity.po.Favorite; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import java.util.List; public interface FavoriteRepository extends PagingAndSortingRepository<Favorite, Long> { List<Favorite> findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId, Pageable page); List<Favorite> findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(String appId, Pageable page); Favorite findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId); Favorite findByUserIdAndAppId(String userId, String appId); @Modifying @Query("UPDATE Favorite SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1") int batchDeleteByAppId(String appId, String operator); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.repository; import com.ctrip.framework.apollo.portal.entity.po.Favorite; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import java.util.List; public interface FavoriteRepository extends PagingAndSortingRepository<Favorite, Long> { List<Favorite> findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId, Pageable page); List<Favorite> findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(String appId, Pageable page); Favorite findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(String userId); Favorite findByUserIdAndAppId(String userId, String appId); @Modifying @Query("UPDATE Favorite SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1") int batchDeleteByAppId(String appId, String operator); }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.service.ClusterService; import com.ctrip.framework.apollo.common.dto.ClusterDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.exception.NotFoundException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.core.ConfigConsts; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @RestController public class ClusterController { private final ClusterService clusterService; public ClusterController(final ClusterService clusterService) { this.clusterService = clusterService; } @PostMapping("/apps/{appId}/clusters") public ClusterDTO create(@PathVariable("appId") String appId, @RequestParam(value = "autoCreatePrivateNamespace", defaultValue = "true") boolean autoCreatePrivateNamespace, @Valid @RequestBody ClusterDTO dto) { Cluster entity = BeanUtils.transform(Cluster.class, dto); Cluster managedEntity = clusterService.findOne(appId, entity.getName()); if (managedEntity != null) { throw new BadRequestException("cluster already exist."); } if (autoCreatePrivateNamespace) { entity = clusterService.saveWithInstanceOfAppNamespaces(entity); } else { entity = clusterService.saveWithoutInstanceOfAppNamespaces(entity); } return BeanUtils.transform(ClusterDTO.class, entity); } @DeleteMapping("/apps/{appId}/clusters/{clusterName:.+}") public void delete(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName, @RequestParam String operator) { Cluster entity = clusterService.findOne(appId, clusterName); if (entity == null) { throw new NotFoundException("cluster not found for clusterName " + clusterName); } if(ConfigConsts.CLUSTER_NAME_DEFAULT.equals(entity.getName())){ throw new BadRequestException("can not delete default cluster!"); } clusterService.delete(entity.getId(), operator); } @GetMapping("/apps/{appId}/clusters") public List<ClusterDTO> find(@PathVariable("appId") String appId) { List<Cluster> clusters = clusterService.findParentClusters(appId); return BeanUtils.batchTransform(ClusterDTO.class, clusters); } @GetMapping("/apps/{appId}/clusters/{clusterName:.+}") public ClusterDTO get(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { Cluster cluster = clusterService.findOne(appId, clusterName); if (cluster == null) { throw new NotFoundException("cluster not found for name " + clusterName); } return BeanUtils.transform(ClusterDTO.class, cluster); } @GetMapping("/apps/{appId}/cluster/{clusterName}/unique") public boolean isAppIdUnique(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { return clusterService.isClusterNameUnique(appId, clusterName); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.service.ClusterService; import com.ctrip.framework.apollo.common.dto.ClusterDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.exception.NotFoundException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.core.ConfigConsts; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @RestController public class ClusterController { private final ClusterService clusterService; public ClusterController(final ClusterService clusterService) { this.clusterService = clusterService; } @PostMapping("/apps/{appId}/clusters") public ClusterDTO create(@PathVariable("appId") String appId, @RequestParam(value = "autoCreatePrivateNamespace", defaultValue = "true") boolean autoCreatePrivateNamespace, @Valid @RequestBody ClusterDTO dto) { Cluster entity = BeanUtils.transform(Cluster.class, dto); Cluster managedEntity = clusterService.findOne(appId, entity.getName()); if (managedEntity != null) { throw new BadRequestException("cluster already exist."); } if (autoCreatePrivateNamespace) { entity = clusterService.saveWithInstanceOfAppNamespaces(entity); } else { entity = clusterService.saveWithoutInstanceOfAppNamespaces(entity); } return BeanUtils.transform(ClusterDTO.class, entity); } @DeleteMapping("/apps/{appId}/clusters/{clusterName:.+}") public void delete(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName, @RequestParam String operator) { Cluster entity = clusterService.findOne(appId, clusterName); if (entity == null) { throw new NotFoundException("cluster not found for clusterName " + clusterName); } if(ConfigConsts.CLUSTER_NAME_DEFAULT.equals(entity.getName())){ throw new BadRequestException("can not delete default cluster!"); } clusterService.delete(entity.getId(), operator); } @GetMapping("/apps/{appId}/clusters") public List<ClusterDTO> find(@PathVariable("appId") String appId) { List<Cluster> clusters = clusterService.findParentClusters(appId); return BeanUtils.batchTransform(ClusterDTO.class, clusters); } @GetMapping("/apps/{appId}/clusters/{clusterName:.+}") public ClusterDTO get(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { Cluster cluster = clusterService.findOne(appId, clusterName); if (cluster == null) { throw new NotFoundException("cluster not found for name " + clusterName); } return BeanUtils.transform(ClusterDTO.class, cluster); } @GetMapping("/apps/{appId}/cluster/{clusterName}/unique") public boolean isAppIdUnique(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { return clusterService.isClusterNameUnique(appId, clusterName); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/NullProvider.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals.provider; import java.io.InputStream; import com.ctrip.framework.foundation.spi.provider.ApplicationProvider; import com.ctrip.framework.foundation.spi.provider.NetworkProvider; import com.ctrip.framework.foundation.spi.provider.Provider; import com.ctrip.framework.foundation.spi.provider.ServerProvider; public class NullProvider implements ApplicationProvider, NetworkProvider, ServerProvider { @Override public Class<? extends Provider> getType() { return null; } @Override public String getProperty(String name, String defaultValue) { return defaultValue; } @Override public void initialize() { } @Override public String getAppId() { return null; } @Override public String getAccessKeySecret() { return null; } @Override public boolean isAppIdSet() { return false; } @Override public String getEnvType() { return null; } @Override public boolean isEnvTypeSet() { return false; } @Override public String getDataCenter() { return null; } @Override public boolean isDataCenterSet() { return false; } @Override public void initialize(InputStream in) { } @Override public String getHostAddress() { return null; } @Override public String getHostName() { return null; } @Override public String toString() { return "(NullProvider)"; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals.provider; import java.io.InputStream; import com.ctrip.framework.foundation.spi.provider.ApplicationProvider; import com.ctrip.framework.foundation.spi.provider.NetworkProvider; import com.ctrip.framework.foundation.spi.provider.Provider; import com.ctrip.framework.foundation.spi.provider.ServerProvider; public class NullProvider implements ApplicationProvider, NetworkProvider, ServerProvider { @Override public Class<? extends Provider> getType() { return null; } @Override public String getProperty(String name, String defaultValue) { return defaultValue; } @Override public void initialize() { } @Override public String getAppId() { return null; } @Override public String getAccessKeySecret() { return null; } @Override public boolean isAppIdSet() { return false; } @Override public String getEnvType() { return null; } @Override public boolean isEnvTypeSet() { return false; } @Override public String getDataCenter() { return null; } @Override public boolean isDataCenterSet() { return false; } @Override public void initialize(InputStream in) { } @Override public String getHostAddress() { return null; } @Override public String getHostName() { return null; } @Override public String toString() { return "(NullProvider)"; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/DefaultHttpClient.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.util.http; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.exceptions.ApolloConfigException; import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException; import com.ctrip.framework.apollo.util.ConfigUtil; import com.google.common.base.Function; import com.google.common.io.CharStreams; import com.google.gson.Gson; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.lang.reflect.Type; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Map; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultHttpClient implements HttpClient { private ConfigUtil m_configUtil; private static final Gson GSON = new Gson(); /** * Constructor. */ public DefaultHttpClient() { m_configUtil = ApolloInjector.getInstance(ConfigUtil.class); } /** * Do get operation for the http request. * * @param httpRequest the request * @param responseType the response type * @return the response * @throws ApolloConfigException if any error happened or response code is neither 200 nor 304 */ @Override public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Class<T> responseType) { Function<String, T> convertResponse = new Function<String, T>() { @Override public T apply(String input) { return GSON.fromJson(input, responseType); } }; return doGetWithSerializeFunction(httpRequest, convertResponse); } /** * Do get operation for the http request. * * @param httpRequest the request * @param responseType the response type * @return the response * @throws ApolloConfigException if any error happened or response code is neither 200 nor 304 */ @Override public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Type responseType) { Function<String, T> convertResponse = new Function<String, T>() { @Override public T apply(String input) { return GSON.fromJson(input, responseType); } }; return doGetWithSerializeFunction(httpRequest, convertResponse); } private <T> HttpResponse<T> doGetWithSerializeFunction(HttpRequest httpRequest, Function<String, T> serializeFunction) { InputStreamReader isr = null; InputStreamReader esr = null; int statusCode; try { HttpURLConnection conn = (HttpURLConnection) new URL(httpRequest.getUrl()).openConnection(); conn.setRequestMethod("GET"); Map<String, String> headers = httpRequest.getHeaders(); if (headers != null && headers.size() > 0) { for (Map.Entry<String, String> entry : headers.entrySet()) { conn.setRequestProperty(entry.getKey(), entry.getValue()); } } int connectTimeout = httpRequest.getConnectTimeout(); if (connectTimeout < 0) { connectTimeout = m_configUtil.getConnectTimeout(); } int readTimeout = httpRequest.getReadTimeout(); if (readTimeout < 0) { readTimeout = m_configUtil.getReadTimeout(); } conn.setConnectTimeout(connectTimeout); conn.setReadTimeout(readTimeout); conn.connect(); statusCode = conn.getResponseCode(); String response; try { isr = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8); response = CharStreams.toString(isr); } catch (IOException ex) { /** * according to https://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html, * we should clean up the connection by reading the response body so that the connection * could be reused. */ InputStream errorStream = conn.getErrorStream(); if (errorStream != null) { esr = new InputStreamReader(errorStream, StandardCharsets.UTF_8); try { CharStreams.toString(esr); } catch (IOException ioe) { //ignore } } // 200 and 304 should not trigger IOException, thus we must throw the original exception out if (statusCode == 200 || statusCode == 304) { throw ex; } // for status codes like 404, IOException is expected when calling conn.getInputStream() throw new ApolloConfigStatusCodeException(statusCode, ex); } if (statusCode == 200) { return new HttpResponse<>(statusCode, serializeFunction.apply(response)); } if (statusCode == 304) { return new HttpResponse<>(statusCode, null); } } catch (ApolloConfigStatusCodeException ex) { throw ex; } catch (Throwable ex) { throw new ApolloConfigException("Could not complete get operation", ex); } finally { if (isr != null) { try { isr.close(); } catch (IOException ex) { // ignore } } if (esr != null) { try { esr.close(); } catch (IOException ex) { // ignore } } } throw new ApolloConfigStatusCodeException(statusCode, String.format("Get operation failed for %s", httpRequest.getUrl())); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.util.http; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.exceptions.ApolloConfigException; import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException; import com.ctrip.framework.apollo.util.ConfigUtil; import com.google.common.base.Function; import com.google.common.io.CharStreams; import com.google.gson.Gson; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.lang.reflect.Type; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Map; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultHttpClient implements HttpClient { private ConfigUtil m_configUtil; private static final Gson GSON = new Gson(); /** * Constructor. */ public DefaultHttpClient() { m_configUtil = ApolloInjector.getInstance(ConfigUtil.class); } /** * Do get operation for the http request. * * @param httpRequest the request * @param responseType the response type * @return the response * @throws ApolloConfigException if any error happened or response code is neither 200 nor 304 */ @Override public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Class<T> responseType) { Function<String, T> convertResponse = new Function<String, T>() { @Override public T apply(String input) { return GSON.fromJson(input, responseType); } }; return doGetWithSerializeFunction(httpRequest, convertResponse); } /** * Do get operation for the http request. * * @param httpRequest the request * @param responseType the response type * @return the response * @throws ApolloConfigException if any error happened or response code is neither 200 nor 304 */ @Override public <T> HttpResponse<T> doGet(HttpRequest httpRequest, final Type responseType) { Function<String, T> convertResponse = new Function<String, T>() { @Override public T apply(String input) { return GSON.fromJson(input, responseType); } }; return doGetWithSerializeFunction(httpRequest, convertResponse); } private <T> HttpResponse<T> doGetWithSerializeFunction(HttpRequest httpRequest, Function<String, T> serializeFunction) { InputStreamReader isr = null; InputStreamReader esr = null; int statusCode; try { HttpURLConnection conn = (HttpURLConnection) new URL(httpRequest.getUrl()).openConnection(); conn.setRequestMethod("GET"); Map<String, String> headers = httpRequest.getHeaders(); if (headers != null && headers.size() > 0) { for (Map.Entry<String, String> entry : headers.entrySet()) { conn.setRequestProperty(entry.getKey(), entry.getValue()); } } int connectTimeout = httpRequest.getConnectTimeout(); if (connectTimeout < 0) { connectTimeout = m_configUtil.getConnectTimeout(); } int readTimeout = httpRequest.getReadTimeout(); if (readTimeout < 0) { readTimeout = m_configUtil.getReadTimeout(); } conn.setConnectTimeout(connectTimeout); conn.setReadTimeout(readTimeout); conn.connect(); statusCode = conn.getResponseCode(); String response; try { isr = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8); response = CharStreams.toString(isr); } catch (IOException ex) { /** * according to https://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html, * we should clean up the connection by reading the response body so that the connection * could be reused. */ InputStream errorStream = conn.getErrorStream(); if (errorStream != null) { esr = new InputStreamReader(errorStream, StandardCharsets.UTF_8); try { CharStreams.toString(esr); } catch (IOException ioe) { //ignore } } // 200 and 304 should not trigger IOException, thus we must throw the original exception out if (statusCode == 200 || statusCode == 304) { throw ex; } // for status codes like 404, IOException is expected when calling conn.getInputStream() throw new ApolloConfigStatusCodeException(statusCode, ex); } if (statusCode == 200) { return new HttpResponse<>(statusCode, serializeFunction.apply(response)); } if (statusCode == 304) { return new HttpResponse<>(statusCode, null); } } catch (ApolloConfigStatusCodeException ex) { throw ex; } catch (Throwable ex) { throw new ApolloConfigException("Could not complete get operation", ex); } finally { if (isr != null) { try { isr.close(); } catch (IOException ex) { // ignore } } if (esr != null) { try { esr.close(); } catch (IOException ex) { // ignore } } } throw new ApolloConfigStatusCodeException(statusCode, String.format("Get operation failed for %s", httpRequest.getUrl())); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/java/com/ctrip/framework/apollo/core/utils/ByteUtilTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core.utils; import com.ctrip.framework.apollo.core.utils.ByteUtil; import org.junit.Assert; import org.junit.Test; public class ByteUtilTest { @Test public void testInt3() { Assert.assertEquals((byte)0, ByteUtil.int3(0)); Assert.assertEquals((byte)0, ByteUtil.int3(1)); } @Test public void testInt2() { Assert.assertEquals((byte)0, ByteUtil.int2(0)); Assert.assertEquals((byte)0, ByteUtil.int2(1)); } @Test public void testInt1() { Assert.assertEquals((byte)0, ByteUtil.int1(0)); Assert.assertEquals((byte)0, ByteUtil.int1(1)); } @Test public void testInt0() { Assert.assertEquals((byte)0, ByteUtil.int0(0)); Assert.assertEquals((byte)1, ByteUtil.int0(1)); } @Test public void testToHexString() { Assert.assertEquals("", ByteUtil.toHexString(new byte[] {})); Assert.assertEquals("98", ByteUtil.toHexString(new byte[] {(byte)-104})); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core.utils; import com.ctrip.framework.apollo.core.utils.ByteUtil; import org.junit.Assert; import org.junit.Test; public class ByteUtilTest { @Test public void testInt3() { Assert.assertEquals((byte)0, ByteUtil.int3(0)); Assert.assertEquals((byte)0, ByteUtil.int3(1)); } @Test public void testInt2() { Assert.assertEquals((byte)0, ByteUtil.int2(0)); Assert.assertEquals((byte)0, ByteUtil.int2(1)); } @Test public void testInt1() { Assert.assertEquals((byte)0, ByteUtil.int1(0)); Assert.assertEquals((byte)0, ByteUtil.int1(1)); } @Test public void testInt0() { Assert.assertEquals((byte)0, ByteUtil.int0(0)); Assert.assertEquals((byte)1, ByteUtil.int0(1)); } @Test public void testToHexString() { Assert.assertEquals("", ByteUtil.toHexString(new byte[] {})); Assert.assertEquals("98", ByteUtil.toHexString(new byte[] {(byte)-104})); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/util/NamespaceUtilTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.util; import com.ctrip.framework.apollo.common.entity.AppNamespace; import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** * @author Jason Song(song_s@ctrip.com) */ @RunWith(MockitoJUnitRunner.class) public class NamespaceUtilTest { private NamespaceUtil namespaceUtil; @Mock private AppNamespaceServiceWithCache appNamespaceServiceWithCache; @Before public void setUp() throws Exception { namespaceUtil = new NamespaceUtil(appNamespaceServiceWithCache); } @Test public void testFilterNamespaceName() throws Exception { String someName = "a.properties"; assertEquals("a", namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameUnchanged() throws Exception { String someName = "a.xml"; assertEquals(someName, namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameWithMultiplePropertiesSuffix() throws Exception { String someName = "a.properties.properties"; assertEquals("a.properties", namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameWithRandomCase() throws Exception { String someName = "AbC.ProPErties"; assertEquals("AbC", namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameWithRandomCaseUnchanged() throws Exception { String someName = "AbCD.xMl"; assertEquals(someName, namespaceUtil.filterNamespaceName(someName)); } @Test public void testNormalizeNamespaceWithPrivateNamespace() throws Exception { String someAppId = "someAppId"; String someNamespaceName = "someNamespaceName"; String someNormalizedNamespaceName = "someNormalizedNamespaceName"; AppNamespace someAppNamespace = mock(AppNamespace.class); when(someAppNamespace.getName()).thenReturn(someNormalizedNamespaceName); when(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, someNamespaceName)).thenReturn (someAppNamespace); assertEquals(someNormalizedNamespaceName, namespaceUtil.normalizeNamespace(someAppId, someNamespaceName)); verify(appNamespaceServiceWithCache, times(1)).findByAppIdAndNamespace(someAppId, someNamespaceName); verify(appNamespaceServiceWithCache, never()).findPublicNamespaceByName(someNamespaceName); } @Test public void testNormalizeNamespaceWithPublicNamespace() throws Exception { String someAppId = "someAppId"; String someNamespaceName = "someNamespaceName"; String someNormalizedNamespaceName = "someNormalizedNamespaceName"; AppNamespace someAppNamespace = mock(AppNamespace.class); when(someAppNamespace.getName()).thenReturn(someNormalizedNamespaceName); when(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, someNamespaceName)).thenReturn(null); when(appNamespaceServiceWithCache.findPublicNamespaceByName(someNamespaceName)).thenReturn(someAppNamespace); assertEquals(someNormalizedNamespaceName, namespaceUtil.normalizeNamespace(someAppId, someNamespaceName)); verify(appNamespaceServiceWithCache, times(1)).findByAppIdAndNamespace(someAppId, someNamespaceName); verify(appNamespaceServiceWithCache, times(1)).findPublicNamespaceByName(someNamespaceName); } @Test public void testNormalizeNamespaceFailed() throws Exception { String someAppId = "someAppId"; String someNamespaceName = "someNamespaceName"; when(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, someNamespaceName)).thenReturn(null); when(appNamespaceServiceWithCache.findPublicNamespaceByName(someNamespaceName)).thenReturn(null); assertEquals(someNamespaceName, namespaceUtil.normalizeNamespace(someAppId, someNamespaceName)); verify(appNamespaceServiceWithCache, times(1)).findByAppIdAndNamespace(someAppId, someNamespaceName); verify(appNamespaceServiceWithCache, times(1)).findPublicNamespaceByName(someNamespaceName); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.util; import com.ctrip.framework.apollo.common.entity.AppNamespace; import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** * @author Jason Song(song_s@ctrip.com) */ @RunWith(MockitoJUnitRunner.class) public class NamespaceUtilTest { private NamespaceUtil namespaceUtil; @Mock private AppNamespaceServiceWithCache appNamespaceServiceWithCache; @Before public void setUp() throws Exception { namespaceUtil = new NamespaceUtil(appNamespaceServiceWithCache); } @Test public void testFilterNamespaceName() throws Exception { String someName = "a.properties"; assertEquals("a", namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameUnchanged() throws Exception { String someName = "a.xml"; assertEquals(someName, namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameWithMultiplePropertiesSuffix() throws Exception { String someName = "a.properties.properties"; assertEquals("a.properties", namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameWithRandomCase() throws Exception { String someName = "AbC.ProPErties"; assertEquals("AbC", namespaceUtil.filterNamespaceName(someName)); } @Test public void testFilterNamespaceNameWithRandomCaseUnchanged() throws Exception { String someName = "AbCD.xMl"; assertEquals(someName, namespaceUtil.filterNamespaceName(someName)); } @Test public void testNormalizeNamespaceWithPrivateNamespace() throws Exception { String someAppId = "someAppId"; String someNamespaceName = "someNamespaceName"; String someNormalizedNamespaceName = "someNormalizedNamespaceName"; AppNamespace someAppNamespace = mock(AppNamespace.class); when(someAppNamespace.getName()).thenReturn(someNormalizedNamespaceName); when(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, someNamespaceName)).thenReturn (someAppNamespace); assertEquals(someNormalizedNamespaceName, namespaceUtil.normalizeNamespace(someAppId, someNamespaceName)); verify(appNamespaceServiceWithCache, times(1)).findByAppIdAndNamespace(someAppId, someNamespaceName); verify(appNamespaceServiceWithCache, never()).findPublicNamespaceByName(someNamespaceName); } @Test public void testNormalizeNamespaceWithPublicNamespace() throws Exception { String someAppId = "someAppId"; String someNamespaceName = "someNamespaceName"; String someNormalizedNamespaceName = "someNormalizedNamespaceName"; AppNamespace someAppNamespace = mock(AppNamespace.class); when(someAppNamespace.getName()).thenReturn(someNormalizedNamespaceName); when(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, someNamespaceName)).thenReturn(null); when(appNamespaceServiceWithCache.findPublicNamespaceByName(someNamespaceName)).thenReturn(someAppNamespace); assertEquals(someNormalizedNamespaceName, namespaceUtil.normalizeNamespace(someAppId, someNamespaceName)); verify(appNamespaceServiceWithCache, times(1)).findByAppIdAndNamespace(someAppId, someNamespaceName); verify(appNamespaceServiceWithCache, times(1)).findPublicNamespaceByName(someNamespaceName); } @Test public void testNormalizeNamespaceFailed() throws Exception { String someAppId = "someAppId"; String someNamespaceName = "someNamespaceName"; when(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, someNamespaceName)).thenReturn(null); when(appNamespaceServiceWithCache.findPublicNamespaceByName(someNamespaceName)).thenReturn(null); assertEquals(someNamespaceName, namespaceUtil.normalizeNamespace(someAppId, someNamespaceName)); verify(appNamespaceServiceWithCache, times(1)).findByAppIdAndNamespace(someAppId, someNamespaceName); verify(appNamespaceServiceWithCache, times(1)).findPublicNamespaceByName(someNamespaceName); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/wrapper/DeferredResultWrapper.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.wrapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.lang.NonNull; import org.springframework.web.context.request.async.DeferredResult; import java.util.List; import java.util.Map; /** * @author Jason Song(song_s@ctrip.com) */ public class DeferredResultWrapper implements Comparable<DeferredResultWrapper> { private static final ResponseEntity<List<ApolloConfigNotification>> NOT_MODIFIED_RESPONSE_LIST = new ResponseEntity<>(HttpStatus.NOT_MODIFIED); private Map<String, String> normalizedNamespaceNameToOriginalNamespaceName; private DeferredResult<ResponseEntity<List<ApolloConfigNotification>>> result; public DeferredResultWrapper(long timeoutInMilli) { result = new DeferredResult<>(timeoutInMilli, NOT_MODIFIED_RESPONSE_LIST); } public void recordNamespaceNameNormalizedResult(String originalNamespaceName, String normalizedNamespaceName) { if (normalizedNamespaceNameToOriginalNamespaceName == null) { normalizedNamespaceNameToOriginalNamespaceName = Maps.newHashMap(); } normalizedNamespaceNameToOriginalNamespaceName.put(normalizedNamespaceName, originalNamespaceName); } public void onTimeout(Runnable timeoutCallback) { result.onTimeout(timeoutCallback); } public void onCompletion(Runnable completionCallback) { result.onCompletion(completionCallback); } public void setResult(ApolloConfigNotification notification) { setResult(Lists.newArrayList(notification)); } /** * The namespace name is used as a key in client side, so we have to return the original one instead of the correct one */ public void setResult(List<ApolloConfigNotification> notifications) { if (normalizedNamespaceNameToOriginalNamespaceName != null) { notifications.stream().filter(notification -> normalizedNamespaceNameToOriginalNamespaceName.containsKey (notification.getNamespaceName())).forEach(notification -> notification.setNamespaceName( normalizedNamespaceNameToOriginalNamespaceName.get(notification.getNamespaceName()))); } result.setResult(new ResponseEntity<>(notifications, HttpStatus.OK)); } public DeferredResult<ResponseEntity<List<ApolloConfigNotification>>> getResult() { return result; } @Override public int compareTo(@NonNull DeferredResultWrapper deferredResultWrapper) { return Integer.compare(this.hashCode(), deferredResultWrapper.hashCode()); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.wrapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.lang.NonNull; import org.springframework.web.context.request.async.DeferredResult; import java.util.List; import java.util.Map; /** * @author Jason Song(song_s@ctrip.com) */ public class DeferredResultWrapper implements Comparable<DeferredResultWrapper> { private static final ResponseEntity<List<ApolloConfigNotification>> NOT_MODIFIED_RESPONSE_LIST = new ResponseEntity<>(HttpStatus.NOT_MODIFIED); private Map<String, String> normalizedNamespaceNameToOriginalNamespaceName; private DeferredResult<ResponseEntity<List<ApolloConfigNotification>>> result; public DeferredResultWrapper(long timeoutInMilli) { result = new DeferredResult<>(timeoutInMilli, NOT_MODIFIED_RESPONSE_LIST); } public void recordNamespaceNameNormalizedResult(String originalNamespaceName, String normalizedNamespaceName) { if (normalizedNamespaceNameToOriginalNamespaceName == null) { normalizedNamespaceNameToOriginalNamespaceName = Maps.newHashMap(); } normalizedNamespaceNameToOriginalNamespaceName.put(normalizedNamespaceName, originalNamespaceName); } public void onTimeout(Runnable timeoutCallback) { result.onTimeout(timeoutCallback); } public void onCompletion(Runnable completionCallback) { result.onCompletion(completionCallback); } public void setResult(ApolloConfigNotification notification) { setResult(Lists.newArrayList(notification)); } /** * The namespace name is used as a key in client side, so we have to return the original one instead of the correct one */ public void setResult(List<ApolloConfigNotification> notifications) { if (normalizedNamespaceNameToOriginalNamespaceName != null) { notifications.stream().filter(notification -> normalizedNamespaceNameToOriginalNamespaceName.containsKey (notification.getNamespaceName())).forEach(notification -> notification.setNamespaceName( normalizedNamespaceNameToOriginalNamespaceName.get(notification.getNamespaceName()))); } result.setResult(new ResponseEntity<>(notifications, HttpStatus.OK)); } public DeferredResult<ResponseEntity<List<ApolloConfigNotification>>> getResult() { return result; } @Override public int compareTo(@NonNull DeferredResultWrapper deferredResultWrapper) { return Integer.compare(this.hashCode(), deferredResultWrapper.hashCode()); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import java.util.Map; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigFile; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.spi.ConfigFactory; import com.ctrip.framework.apollo.spi.ConfigFactoryManager; import com.google.common.collect.Maps; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultConfigManager implements ConfigManager { private ConfigFactoryManager m_factoryManager; private Map<String, Config> m_configs = Maps.newConcurrentMap(); private Map<String, ConfigFile> m_configFiles = Maps.newConcurrentMap(); public DefaultConfigManager() { m_factoryManager = ApolloInjector.getInstance(ConfigFactoryManager.class); } @Override public Config getConfig(String namespace) { Config config = m_configs.get(namespace); if (config == null) { synchronized (this) { config = m_configs.get(namespace); if (config == null) { ConfigFactory factory = m_factoryManager.getFactory(namespace); config = factory.create(namespace); m_configs.put(namespace, config); } } } return config; } @Override public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) { String namespaceFileName = String.format("%s.%s", namespace, configFileFormat.getValue()); ConfigFile configFile = m_configFiles.get(namespaceFileName); if (configFile == null) { synchronized (this) { configFile = m_configFiles.get(namespaceFileName); if (configFile == null) { ConfigFactory factory = m_factoryManager.getFactory(namespaceFileName); configFile = factory.createConfigFile(namespaceFileName, configFileFormat); m_configFiles.put(namespaceFileName, configFile); } } } return configFile; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import java.util.Map; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigFile; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.spi.ConfigFactory; import com.ctrip.framework.apollo.spi.ConfigFactoryManager; import com.google.common.collect.Maps; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultConfigManager implements ConfigManager { private ConfigFactoryManager m_factoryManager; private Map<String, Config> m_configs = Maps.newConcurrentMap(); private Map<String, ConfigFile> m_configFiles = Maps.newConcurrentMap(); public DefaultConfigManager() { m_factoryManager = ApolloInjector.getInstance(ConfigFactoryManager.class); } @Override public Config getConfig(String namespace) { Config config = m_configs.get(namespace); if (config == null) { synchronized (this) { config = m_configs.get(namespace); if (config == null) { ConfigFactory factory = m_factoryManager.getFactory(namespace); config = factory.create(namespace); m_configs.put(namespace, config); } } } return config; } @Override public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) { String namespaceFileName = String.format("%s.%s", namespace, configFileFormat.getValue()); ConfigFile configFile = m_configFiles.get(namespaceFileName); if (configFile == null) { synchronized (this) { configFile = m_configFiles.get(namespaceFileName); if (configFile == null) { ConfigFactory factory = m_factoryManager.getFactory(namespaceFileName); configFile = factory.createConfigFile(namespaceFileName, configFileFormat); m_configFiles.put(namespaceFileName, configFile); } } } return configFile; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/java/com/ctrip/framework/apollo/SkipAuthorizationConfiguration.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import com.ctrip.framework.apollo.openapi.auth.ConsumerPermissionValidator; import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil; import com.ctrip.framework.apollo.portal.component.PermissionValidator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** * Created by kezhenxu at 2019/1/8 20:19. * * Configuration class that will disable authorization. * * @author kezhenxu (kezhenxu94@163.com) */ @Profile("skipAuthorization") @Configuration public class SkipAuthorizationConfiguration { @Primary @Bean public ConsumerPermissionValidator consumerPermissionValidator() { final ConsumerPermissionValidator mock = mock(ConsumerPermissionValidator.class); when(mock.hasCreateNamespacePermission(any(), any())).thenReturn(true); return mock; } @Primary @Bean public ConsumerAuthUtil consumerAuthUtil() { final ConsumerAuthUtil mock = mock(ConsumerAuthUtil.class); when(mock.getConsumerId(any())).thenReturn(1L); return mock; } @Primary @Bean("permissionValidator") public PermissionValidator permissionValidator() { final PermissionValidator mock = mock(PermissionValidator.class); when(mock.isSuperAdmin()).thenReturn(true); return mock; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import com.ctrip.framework.apollo.openapi.auth.ConsumerPermissionValidator; import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil; import com.ctrip.framework.apollo.portal.component.PermissionValidator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** * Created by kezhenxu at 2019/1/8 20:19. * * Configuration class that will disable authorization. * * @author kezhenxu (kezhenxu94@163.com) */ @Profile("skipAuthorization") @Configuration public class SkipAuthorizationConfiguration { @Primary @Bean public ConsumerPermissionValidator consumerPermissionValidator() { final ConsumerPermissionValidator mock = mock(ConsumerPermissionValidator.class); when(mock.hasCreateNamespacePermission(any(), any())).thenReturn(true); return mock; } @Primary @Bean public ConsumerAuthUtil consumerAuthUtil() { final ConsumerAuthUtil mock = mock(ConsumerAuthUtil.class); when(mock.getConsumerId(any())).thenReturn(1L); return mock; } @Primary @Bean("permissionValidator") public PermissionValidator permissionValidator() { final PermissionValidator mock = mock(PermissionValidator.class); when(mock.isSuperAdmin()).thenReturn(true); return mock; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/WebMvcConfig.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.controller; import java.util.List; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.MimeMappings; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.PageRequest; import org.springframework.data.web.PageableHandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration public class WebMvcConfig implements WebMvcConfigurer, WebServerFactoryCustomizer<TomcatServletWebServerFactory> { @Override public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) { PageableHandlerMethodArgumentResolver pageResolver = new PageableHandlerMethodArgumentResolver(); pageResolver.setFallbackPageable(PageRequest.of(0, 10)); argumentResolvers.add(pageResolver); } @Override public void configureContentNegotiation(ContentNegotiationConfigurer configurer) { configurer.favorPathExtension(false); } @Override public void customize(TomcatServletWebServerFactory factory) { MimeMappings mappings = new MimeMappings(MimeMappings.DEFAULT); mappings.add("html", "text/html;charset=utf-8"); factory.setMimeMappings(mappings ); } @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { // 10 days addCacheControl(registry, "img", 864000); addCacheControl(registry, "vendor", 864000); addCacheControl(registry, "scripts", 864000); addCacheControl(registry, "styles", 864000); // 1 day addCacheControl(registry, "views", 86400); addCacheControl(registry, "i18n", 86400); } private void addCacheControl(ResourceHandlerRegistry registry, String folder, int cachePeriod) { registry.addResourceHandler(String.format("/%s/**", folder)) .addResourceLocations(String.format("classpath:/static/%s/", folder)) .setCachePeriod(cachePeriod); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.controller; import java.util.List; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.MimeMappings; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.PageRequest; import org.springframework.data.web.PageableHandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration public class WebMvcConfig implements WebMvcConfigurer, WebServerFactoryCustomizer<TomcatServletWebServerFactory> { @Override public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) { PageableHandlerMethodArgumentResolver pageResolver = new PageableHandlerMethodArgumentResolver(); pageResolver.setFallbackPageable(PageRequest.of(0, 10)); argumentResolvers.add(pageResolver); } @Override public void configureContentNegotiation(ContentNegotiationConfigurer configurer) { configurer.favorPathExtension(false); } @Override public void customize(TomcatServletWebServerFactory factory) { MimeMappings mappings = new MimeMappings(MimeMappings.DEFAULT); mappings.add("html", "text/html;charset=utf-8"); factory.setMimeMappings(mappings ); } @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { // 10 days addCacheControl(registry, "img", 864000); addCacheControl(registry, "vendor", 864000); addCacheControl(registry, "scripts", 864000); addCacheControl(registry, "styles", 864000); // 1 day addCacheControl(registry, "views", 86400); addCacheControl(registry, "i18n", 86400); } private void addCacheControl(ResourceHandlerRegistry registry, String folder, int cachePeriod) { registry.addResourceHandler(String.format("/%s/**", folder)) .addResourceLocations(String.format("classpath:/static/%s/", folder)) .setCachePeriod(cachePeriod); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/ConfigServiceTestConfiguration.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import com.ctrip.framework.apollo.biz.auth.WebSecurityConfig; import com.ctrip.framework.apollo.configservice.ConfigServiceApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; @Configuration @ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = { LocalConfigServiceApplication.class, ConfigServiceApplication.class, WebSecurityConfig.class})}) @EnableAutoConfiguration public class ConfigServiceTestConfiguration { }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import com.ctrip.framework.apollo.biz.auth.WebSecurityConfig; import com.ctrip.framework.apollo.configservice.ConfigServiceApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; @Configuration @ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = { LocalConfigServiceApplication.class, ConfigServiceApplication.class, WebSecurityConfig.class})}) @EnableAutoConfiguration public class ConfigServiceTestConfiguration { }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/util/KeyValueUtilsTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.util; import org.junit.Test; import java.util.HashMap; import java.util.Map; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class KeyValueUtilsTest { @Test public void testFilterWithKeyEndswith() { // map Map<String, String> map = new HashMap<>(); map.put("abc.met", "none"); map.put("abc_meta", "none"); map.put("2bc.meta", "none"); map.put("abc?met", "none"); Map<String, String> afterFilter = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(map, "_meta"); for(Map.Entry<String, String> entry : afterFilter.entrySet()) { String key = entry.getKey(); assertTrue(key.endsWith("_meta")); } } @Test public void testRemoveKeySuffix() { Map<String, String> map = new HashMap<>(); map.put("abc_meta", "none"); map.put("234_meta", "none"); map.put("888_meta", "none"); Map<String, String> afterFilter = KeyValueUtils.removeKeySuffix(map, "_meta".length()); for(Map.Entry<String, String> entry : afterFilter.entrySet()) { String key = entry.getKey(); assertFalse(key.endsWith("_meta")); assertFalse(key.contains("_meta")); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.util; import org.junit.Test; import java.util.HashMap; import java.util.Map; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class KeyValueUtilsTest { @Test public void testFilterWithKeyEndswith() { // map Map<String, String> map = new HashMap<>(); map.put("abc.met", "none"); map.put("abc_meta", "none"); map.put("2bc.meta", "none"); map.put("abc?met", "none"); Map<String, String> afterFilter = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(map, "_meta"); for(Map.Entry<String, String> entry : afterFilter.entrySet()) { String key = entry.getKey(); assertTrue(key.endsWith("_meta")); } } @Test public void testRemoveKeySuffix() { Map<String, String> map = new HashMap<>(); map.put("abc_meta", "none"); map.put("234_meta", "none"); map.put("888_meta", "none"); Map<String, String> afterFilter = KeyValueUtils.removeKeySuffix(map, "_meta".length()); for(Map.Entry<String, String> entry : afterFilter.entrySet()) { String key = entry.getKey(); assertFalse(key.endsWith("_meta")); assertFalse(key.contains("_meta")); } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/java/com/ctrip/framework/apollo/LocalPortalApplication.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @SpringBootApplication public class LocalPortalApplication { public static void main(String[] args) { new SpringApplicationBuilder(LocalPortalApplication.class).run(args); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @SpringBootApplication public class LocalPortalApplication { public static void main(String[] args) { new SpringApplicationBuilder(LocalPortalApplication.class).run(args); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/config/diff.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="diff_item"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="../img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="../styles/common-style.css"> <link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css"> <title>{{'Config.Diff.Title' | translate }}</title> <style> .comment-toggle { margin-left: 8px !important; } .diff-content { margin-top: 12px; } </style> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container" ng-controller="DiffItemController"> <section class="panel col-md-offset-1 col-md-10"> <header class="panel-heading"> <div class="row"> <div class="col-md-7"> <h4 class="modal-title">{{'Config.Diff.Title' | translate }} <small ng-show="syncItemStep == 1">{{'Config.Diff.FirstStep' | translate }}</small> <small ng-show="syncItemStep == 2">{{'Config.Diff.SecondStep' | translate }}</small> </h4> </div> <div class="col-md-5 text-right"> <button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3" ng-click="syncItemNextStep(-1)">{{'Config.Diff.PreviousStep' | translate }} </button> <button type="button" class="btn btn-primary" ng-show="syncItemStep < 2" ng-click="diff()">{{'Config.Diff.NextStep' | translate }} </button> <button type="button" class="btn btn-info" data-dismiss="modal" ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }} </button> </div> </div> </header> <div class="panel-body"> <div class="row" ng-show="syncItemStep == 1"> <div class="alert-info alert no-radius"> <strong>{{'Config.Diff.TipsTitle' | translate }}:</strong> <ul> <li>{{'Config.Diff.Tips' | translate }}</li> </ul> </div> <div class="form-horizontal"> <div class="form-group"> <label class="col-sm-2 control-label">{{'Config.Diff.DiffCluster' | translate }}</label> <div class="col-sm-6"> <apolloclusterselector apollo-app-id="pageContext.appId" apollo-default-all-checked="false" apollo-select="collectSelectedClusters" apollo-default-checked-env="pageContext.env" apollo-default-checked-cluster="pageContext.clusterName"></apolloclusterselector> </div> </div> </div> <hr> </div> <!--step 2--> <div class="row" ng-show="syncItemStep == 2"> <div class="row" style="margin-top: 10px;"> <div class="form-horizontal"> <div class="col-sm-12"> <label class="control-label"> <input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff" ng-click="showCommentDiff=!showCommentDiff"> {{'Config.Diff.HasDiffComment' | translate }} </label> </div> <div class="col-sm-12 diff-content"> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <td>Key</td> <td ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Value'"> </td> <td ng-show="showCommentDiff" ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Comment'"> </td> </tr> </thead> <tbody> <tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey"> <td width="15%" ng-bind="key"></td> <td ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value"> </td> <td ng-show="showCommentDiff" ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).comment"> </td> </tr> </tbody> </table> </div> </div> </div> </div> </div> </section> <showtextmodal text="text" /> </div> <div ng-include="'../views/common/footer.html'"></div> <!-- jquery.js --> <script src="../vendor/jquery.min.js" type="text/javascript"></script> <script src="../vendor/select2/select2.min.js" type="text/javascript"></script> <!--angular--> <script src="../vendor/angular/angular.min.js"></script> <script src="../vendor/angular/angular-resource.min.js"></script> <script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="../vendor/angular/loading-bar.min.js"></script> <script src="../vendor/angular/angular-cookies.min.js"></script> <script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!-- bootstrap.js --> <script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="../vendor/clipboard.min.js" type="text/javascript"></script> <!--biz--> <script type="application/javascript" src="../scripts/app.js"></script> <script type="application/javascript" src="../scripts/services/AppService.js"></script> <script type="application/javascript" src="../scripts/services/EnvService.js"></script> <script type="application/javascript" src="../scripts/services/ConfigService.js"></script> <script type="application/javascript" src="../scripts/services/UserService.js"></script> <script type="application/javascript" src="../scripts/services/CommonService.js"></script> <script type="application/javascript" src="../scripts/services/PermissionService.js"></script> <script type="application/javascript" src="../scripts/AppUtils.js"></script> <script type="application/javascript" src="../scripts/controller/config/DiffConfigController.js"></script> <script type="application/javascript" src="../scripts/PageCommon.js"></script> <script type="application/javascript" src="../scripts/directive/directive.js"></script> <script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script> </body> </html>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="diff_item"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="../img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="../styles/common-style.css"> <link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css"> <title>{{'Config.Diff.Title' | translate }}</title> <style> .comment-toggle { margin-left: 8px !important; } .diff-content { margin-top: 12px; } </style> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container" ng-controller="DiffItemController"> <section class="panel col-md-offset-1 col-md-10"> <header class="panel-heading"> <div class="row"> <div class="col-md-7"> <h4 class="modal-title">{{'Config.Diff.Title' | translate }} <small ng-show="syncItemStep == 1">{{'Config.Diff.FirstStep' | translate }}</small> <small ng-show="syncItemStep == 2">{{'Config.Diff.SecondStep' | translate }}</small> </h4> </div> <div class="col-md-5 text-right"> <button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3" ng-click="syncItemNextStep(-1)">{{'Config.Diff.PreviousStep' | translate }} </button> <button type="button" class="btn btn-primary" ng-show="syncItemStep < 2" ng-click="diff()">{{'Config.Diff.NextStep' | translate }} </button> <button type="button" class="btn btn-info" data-dismiss="modal" ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }} </button> </div> </div> </header> <div class="panel-body"> <div class="row" ng-show="syncItemStep == 1"> <div class="alert-info alert no-radius"> <strong>{{'Config.Diff.TipsTitle' | translate }}:</strong> <ul> <li>{{'Config.Diff.Tips' | translate }}</li> </ul> </div> <div class="form-horizontal"> <div class="form-group"> <label class="col-sm-2 control-label">{{'Config.Diff.DiffCluster' | translate }}</label> <div class="col-sm-6"> <apolloclusterselector apollo-app-id="pageContext.appId" apollo-default-all-checked="false" apollo-select="collectSelectedClusters" apollo-default-checked-env="pageContext.env" apollo-default-checked-cluster="pageContext.clusterName"></apolloclusterselector> </div> </div> </div> <hr> </div> <!--step 2--> <div class="row" ng-show="syncItemStep == 2"> <div class="row" style="margin-top: 10px;"> <div class="form-horizontal"> <div class="col-sm-12"> <label class="control-label"> <input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff" ng-click="showCommentDiff=!showCommentDiff"> {{'Config.Diff.HasDiffComment' | translate }} </label> </div> <div class="col-sm-12 diff-content"> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <td>Key</td> <td ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Value'"> </td> <td ng-show="showCommentDiff" ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Comment'"> </td> </tr> </thead> <tbody> <tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey"> <td width="15%" ng-bind="key"></td> <td ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value"> </td> <td ng-show="showCommentDiff" ng-repeat="cluster in syncData.syncToNamespaces" ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).comment"> </td> </tr> </tbody> </table> </div> </div> </div> </div> </div> </section> <showtextmodal text="text" /> </div> <div ng-include="'../views/common/footer.html'"></div> <!-- jquery.js --> <script src="../vendor/jquery.min.js" type="text/javascript"></script> <script src="../vendor/select2/select2.min.js" type="text/javascript"></script> <!--angular--> <script src="../vendor/angular/angular.min.js"></script> <script src="../vendor/angular/angular-resource.min.js"></script> <script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="../vendor/angular/loading-bar.min.js"></script> <script src="../vendor/angular/angular-cookies.min.js"></script> <script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!-- bootstrap.js --> <script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="../vendor/clipboard.min.js" type="text/javascript"></script> <!--biz--> <script type="application/javascript" src="../scripts/app.js"></script> <script type="application/javascript" src="../scripts/services/AppService.js"></script> <script type="application/javascript" src="../scripts/services/EnvService.js"></script> <script type="application/javascript" src="../scripts/services/ConfigService.js"></script> <script type="application/javascript" src="../scripts/services/UserService.js"></script> <script type="application/javascript" src="../scripts/services/CommonService.js"></script> <script type="application/javascript" src="../scripts/services/PermissionService.js"></script> <script type="application/javascript" src="../scripts/AppUtils.js"></script> <script type="application/javascript" src="../scripts/controller/config/DiffConfigController.js"></script> <script type="application/javascript" src="../scripts/PageCommon.js"></script> <script type="application/javascript" src="../scripts/directive/directive.js"></script> <script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script> </body> </html>
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.AbstractIntegrationTest; import com.ctrip.framework.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.repository.AppRepository; import com.ctrip.framework.apollo.common.entity.App; import com.ctrip.framework.apollo.common.exception.ServiceException; import com.ctrip.framework.apollo.core.ConfigConsts; import java.util.Date; import java.util.List; import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; public class AdminServiceTest extends AbstractIntegrationTest { @Autowired private AdminService adminService; @Autowired private AuditService auditService; @Autowired private AppRepository appRepository; @Autowired private ClusterService clusterService; @Autowired private NamespaceService namespaceService; @Autowired private AppNamespaceService appNamespaceService; @Test public void testCreateNewApp() { String appId = "someAppId"; App app = new App(); app.setAppId(appId); app.setName("someAppName"); String owner = "someOwnerName"; app.setOwnerName(owner); app.setOwnerEmail("someOwnerName@ctrip.com"); app.setDataChangeCreatedBy(owner); app.setDataChangeLastModifiedBy(owner); app.setDataChangeCreatedTime(new Date()); app = adminService.createNewApp(app); Assert.assertEquals(appId, app.getAppId()); List<Cluster> clusters = clusterService.findParentClusters(app.getAppId()); Assert.assertEquals(1, clusters.size()); Assert.assertEquals(ConfigConsts.CLUSTER_NAME_DEFAULT, clusters.get(0).getName()); List<Namespace> namespaces = namespaceService.findNamespaces(appId, clusters.get(0).getName()); Assert.assertEquals(1, namespaces.size()); Assert.assertEquals(ConfigConsts.NAMESPACE_APPLICATION, namespaces.get(0).getNamespaceName()); List<Audit> audits = auditService.findByOwner(owner); Assert.assertEquals(4, audits.size()); } @Test(expected = ServiceException.class) public void testCreateDuplicateApp() { String appId = "someAppId"; App app = new App(); app.setAppId(appId); app.setName("someAppName"); String owner = "someOwnerName"; app.setOwnerName(owner); app.setOwnerEmail("someOwnerName@ctrip.com"); app.setDataChangeCreatedBy(owner); app.setDataChangeLastModifiedBy(owner); app.setDataChangeCreatedTime(new Date()); appRepository.save(app); adminService.createNewApp(app); } @Test public void testDeleteApp() { String appId = "someAppId"; App app = new App(); app.setAppId(appId); app.setName("someAppName"); String owner = "someOwnerName"; app.setOwnerName(owner); app.setOwnerEmail("someOwnerName@ctrip.com"); app.setDataChangeCreatedBy(owner); app.setDataChangeLastModifiedBy(owner); app.setDataChangeCreatedTime(new Date()); app = adminService.createNewApp(app); Assert.assertEquals(appId, app.getAppId()); Assert.assertEquals(1, appNamespaceService.findByAppId(appId).size()); Assert.assertEquals(1, clusterService.findClusters(appId).size()); Assert.assertEquals(1, namespaceService.findNamespaces(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size()); adminService.deleteApp(app, owner); Assert.assertEquals(0, appNamespaceService.findByAppId(appId).size()); Assert.assertEquals(0, clusterService.findClusters(appId).size()); Assert .assertEquals(0, namespaceService.findByAppIdAndNamespaceName(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size()); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.AbstractIntegrationTest; import com.ctrip.framework.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.repository.AppRepository; import com.ctrip.framework.apollo.common.entity.App; import com.ctrip.framework.apollo.common.exception.ServiceException; import com.ctrip.framework.apollo.core.ConfigConsts; import java.util.Date; import java.util.List; import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; public class AdminServiceTest extends AbstractIntegrationTest { @Autowired private AdminService adminService; @Autowired private AuditService auditService; @Autowired private AppRepository appRepository; @Autowired private ClusterService clusterService; @Autowired private NamespaceService namespaceService; @Autowired private AppNamespaceService appNamespaceService; @Test public void testCreateNewApp() { String appId = "someAppId"; App app = new App(); app.setAppId(appId); app.setName("someAppName"); String owner = "someOwnerName"; app.setOwnerName(owner); app.setOwnerEmail("someOwnerName@ctrip.com"); app.setDataChangeCreatedBy(owner); app.setDataChangeLastModifiedBy(owner); app.setDataChangeCreatedTime(new Date()); app = adminService.createNewApp(app); Assert.assertEquals(appId, app.getAppId()); List<Cluster> clusters = clusterService.findParentClusters(app.getAppId()); Assert.assertEquals(1, clusters.size()); Assert.assertEquals(ConfigConsts.CLUSTER_NAME_DEFAULT, clusters.get(0).getName()); List<Namespace> namespaces = namespaceService.findNamespaces(appId, clusters.get(0).getName()); Assert.assertEquals(1, namespaces.size()); Assert.assertEquals(ConfigConsts.NAMESPACE_APPLICATION, namespaces.get(0).getNamespaceName()); List<Audit> audits = auditService.findByOwner(owner); Assert.assertEquals(4, audits.size()); } @Test(expected = ServiceException.class) public void testCreateDuplicateApp() { String appId = "someAppId"; App app = new App(); app.setAppId(appId); app.setName("someAppName"); String owner = "someOwnerName"; app.setOwnerName(owner); app.setOwnerEmail("someOwnerName@ctrip.com"); app.setDataChangeCreatedBy(owner); app.setDataChangeLastModifiedBy(owner); app.setDataChangeCreatedTime(new Date()); appRepository.save(app); adminService.createNewApp(app); } @Test public void testDeleteApp() { String appId = "someAppId"; App app = new App(); app.setAppId(appId); app.setName("someAppName"); String owner = "someOwnerName"; app.setOwnerName(owner); app.setOwnerEmail("someOwnerName@ctrip.com"); app.setDataChangeCreatedBy(owner); app.setDataChangeLastModifiedBy(owner); app.setDataChangeCreatedTime(new Date()); app = adminService.createNewApp(app); Assert.assertEquals(appId, app.getAppId()); Assert.assertEquals(1, appNamespaceService.findByAppId(appId).size()); Assert.assertEquals(1, clusterService.findClusters(appId).size()); Assert.assertEquals(1, namespaceService.findNamespaces(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size()); adminService.deleteApp(app, owner); Assert.assertEquals(0, appNamespaceService.findByAppId(appId).size()); Assert.assertEquals(0, clusterService.findClusters(appId).size()); Assert .assertEquals(0, namespaceService.findByAppIdAndNamespaceName(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size()); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/java/com/ctrip/framework/foundation/internals/ServiceBootstrapTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals; import com.ctrip.framework.apollo.core.spi.Ordered; import org.junit.Test; import java.util.ServiceConfigurationError; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** * @author Jason Song(song_s@ctrip.com) */ public class ServiceBootstrapTest { @Test public void loadFirstSuccessfully() throws Exception { Interface1 service = ServiceBootstrap.loadFirst(Interface1.class); assertTrue(service instanceof Interface1Impl); } @Test(expected = IllegalStateException.class) public void loadFirstWithNoServiceFileDefined() throws Exception { ServiceBootstrap.loadFirst(Interface2.class); } @Test(expected = IllegalStateException.class) public void loadFirstWithServiceFileButNoServiceImpl() throws Exception { ServiceBootstrap.loadFirst(Interface3.class); } @Test(expected = ServiceConfigurationError.class) public void loadFirstWithWrongServiceImpl() throws Exception { ServiceBootstrap.loadFirst(Interface4.class); } @Test(expected = ServiceConfigurationError.class) public void loadFirstWithServiceImplNotExists() throws Exception { ServiceBootstrap.loadFirst(Interface5.class); } @Test public void loadAllWithServiceFileButNoServiceImpl() { assertFalse(ServiceBootstrap.loadAll(Interface7.class).hasNext()); } @Test public void loadPrimarySuccessfully() { Interface6 service = ServiceBootstrap.loadPrimary(Interface6.class); assertTrue(service instanceof Interface6Impl1); } @Test(expected = IllegalStateException.class) public void loadPrimaryWithServiceFileButNoServiceImpl() { ServiceBootstrap.loadPrimary(Interface7.class); } @Test public void loadAllOrderedWithServiceFileButNoServiceImpl() { assertTrue(ServiceBootstrap.loadAllOrdered(Interface7.class).isEmpty()); } interface Interface1 { } public static class Interface1Impl implements Interface1 { } interface Interface2 { } interface Interface3 { } interface Interface4 { } interface Interface5 { } interface Interface6 extends Ordered { } public static class Interface6Impl1 implements Interface6 { @Override public int getOrder() { return 1; } } public static class Interface6Impl2 implements Interface6 { @Override public int getOrder() { return 2; } } interface Interface7 extends Ordered { } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals; import com.ctrip.framework.apollo.core.spi.Ordered; import org.junit.Test; import java.util.ServiceConfigurationError; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** * @author Jason Song(song_s@ctrip.com) */ public class ServiceBootstrapTest { @Test public void loadFirstSuccessfully() throws Exception { Interface1 service = ServiceBootstrap.loadFirst(Interface1.class); assertTrue(service instanceof Interface1Impl); } @Test(expected = IllegalStateException.class) public void loadFirstWithNoServiceFileDefined() throws Exception { ServiceBootstrap.loadFirst(Interface2.class); } @Test(expected = IllegalStateException.class) public void loadFirstWithServiceFileButNoServiceImpl() throws Exception { ServiceBootstrap.loadFirst(Interface3.class); } @Test(expected = ServiceConfigurationError.class) public void loadFirstWithWrongServiceImpl() throws Exception { ServiceBootstrap.loadFirst(Interface4.class); } @Test(expected = ServiceConfigurationError.class) public void loadFirstWithServiceImplNotExists() throws Exception { ServiceBootstrap.loadFirst(Interface5.class); } @Test public void loadAllWithServiceFileButNoServiceImpl() { assertFalse(ServiceBootstrap.loadAll(Interface7.class).hasNext()); } @Test public void loadPrimarySuccessfully() { Interface6 service = ServiceBootstrap.loadPrimary(Interface6.class); assertTrue(service instanceof Interface6Impl1); } @Test(expected = IllegalStateException.class) public void loadPrimaryWithServiceFileButNoServiceImpl() { ServiceBootstrap.loadPrimary(Interface7.class); } @Test public void loadAllOrderedWithServiceFileButNoServiceImpl() { assertTrue(ServiceBootstrap.loadAllOrdered(Interface7.class).isEmpty()); } interface Interface1 { } public static class Interface1Impl implements Interface1 { } interface Interface2 { } interface Interface3 { } interface Interface4 { } interface Interface5 { } interface Interface6 extends Ordered { } public static class Interface6Impl1 implements Interface6 { @Override public int getOrder() { return 1; } } public static class Interface6Impl2 implements Interface6 { @Override public int getOrder() { return 2; } } interface Interface7 extends Ordered { } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AppDTO.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.dto; import com.ctrip.framework.apollo.common.utils.InputValidator; import javax.validation.constraints.Pattern; public class AppDTO extends BaseDTO{ private long id; private String name; @Pattern( regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR, message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE ) private String appId; private String orgId; private String orgName; private String ownerName; private String ownerDisplayName; private String ownerEmail; public long getId() { return id; } public void setId(long id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getAppId() { return appId; } public void setAppId(String appId) { this.appId = appId; } public String getOrgId() { return orgId; } public void setOrgId(String orgId) { this.orgId = orgId; } public String getOrgName() { return orgName; } public void setOrgName(String orgName) { this.orgName = orgName; } public String getOwnerName() { return ownerName; } public void setOwnerName(String ownerName) { this.ownerName = ownerName; } public String getOwnerDisplayName() { return ownerDisplayName; } public void setOwnerDisplayName(String ownerDisplayName) { this.ownerDisplayName = ownerDisplayName; } public String getOwnerEmail() { return ownerEmail; } public void setOwnerEmail(String ownerEmail) { this.ownerEmail = ownerEmail; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.dto; import com.ctrip.framework.apollo.common.utils.InputValidator; import javax.validation.constraints.Pattern; public class AppDTO extends BaseDTO{ private long id; private String name; @Pattern( regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR, message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE ) private String appId; private String orgId; private String orgName; private String ownerName; private String ownerDisplayName; private String ownerEmail; public long getId() { return id; } public void setId(long id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getAppId() { return appId; } public void setAppId(String appId) { this.appId = appId; } public String getOrgId() { return orgId; } public void setOrgId(String orgId) { this.orgId = orgId; } public String getOrgName() { return orgName; } public void setOrgName(String orgName) { this.orgName = orgName; } public String getOwnerName() { return ownerName; } public void setOwnerName(String ownerName) { this.ownerName = ownerName; } public String getOwnerDisplayName() { return ownerDisplayName; } public void setOwnerDisplayName(String ownerDisplayName) { this.ownerDisplayName = ownerDisplayName; } public String getOwnerEmail() { return ownerEmail; } public void setOwnerEmail(String ownerEmail) { this.ownerEmail = ownerEmail; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/community/thank-you.md
# 致谢 <hr /> <img src="en/images/community/jetbrains.svg" alt="jetbrains" style="height: 80px; margin-right: 20px"> <img src="en/images/community/intellij-idea.svg" alt="intellij-idea" style="width: 75px" > Apollo 团队使用 [IntelliJ IDEA](https://www.jetbrains.com/idea/) 开发开源项目，非常感谢 [JetBrains](https://www.jetbrains.com/) 赞助许可证。 <hr /> <img src="en/images/community/docsify.svg" alt="docsify" style="height: 80px"> Apollo 团队使用 [docsify](https://docsify.js.org/) 生成文档站点。
# 致谢 <hr /> <img src="en/images/community/jetbrains.svg" alt="jetbrains" style="height: 80px; margin-right: 20px"> <img src="en/images/community/intellij-idea.svg" alt="intellij-idea" style="width: 75px" > Apollo 团队使用 [IntelliJ IDEA](https://www.jetbrains.com/idea/) 开发开源项目，非常感谢 [JetBrains](https://www.jetbrains.com/) 赞助许可证。 <hr /> <img src="en/images/community/docsify.svg" alt="docsify" style="height: 80px"> Apollo 团队使用 [docsify](https://docsify.js.org/) 生成文档站点。
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ application_module.controller("ConfigNamespaceController", ['$rootScope', '$scope', '$translate', 'toastr', 'AppUtil', 'EventManager', 'ConfigService', 'PermissionService', 'UserService', 'NamespaceBranchService', 'NamespaceService', controller]); function controller($rootScope, $scope, $translate, toastr, AppUtil, EventManager, ConfigService, PermissionService, UserService, NamespaceBranchService, NamespaceService) { $scope.rollback = rollback; $scope.preDeleteItem = preDeleteItem; $scope.deleteItem = deleteItem; $scope.editItem = editItem; $scope.createItem = createItem; $scope.preRevokeItem = preRevokeItem; $scope.revokeItem = revokeItem; $scope.closeTip = closeTip; $scope.showText = showText; $scope.createBranch = createBranch; $scope.preCreateBranch = preCreateBranch; $scope.preDeleteBranch = preDeleteBranch; $scope.deleteBranch = deleteBranch; $scope.showNoModifyPermissionDialog = showNoModifyPermissionDialog; $scope.lockCheck = lockCheck; $scope.emergencyPublish = emergencyPublish; init(); function init() { initRole(); initUser(); initPublishInfo(); } function initRole() { PermissionService.get_app_role_users($rootScope.pageContext.appId) .then(function (result) { var masterUsers = ''; result.masterUsers.forEach(function (user) { masterUsers += _.escape(user.userId) + ','; }); $scope.masterUsers = masterUsers.substring(0, masterUsers.length - 1); }, function (result) { }); } function initUser() { UserService.load_user().then(function (result) { $scope.currentUser = result.userId; }); } function initPublishInfo() { NamespaceService.getNamespacePublishInfo($rootScope.pageContext.appId) .then(function (result) { if (!result) { return; } $scope.hasNotPublishNamespace = false; var namespacePublishInfo = []; Object.keys(result).forEach(function (env) { if (env.indexOf("$") >= 0) { return; } var envPublishInfo = result[env]; Object.keys(envPublishInfo).forEach(function (cluster) { var clusterPublishInfo = envPublishInfo[cluster]; if (clusterPublishInfo) { $scope.hasNotPublishNamespace = true; if (Object.keys(envPublishInfo).length > 1) { namespacePublishInfo.push("[" + env + ", " + cluster + "]"); } else { namespacePublishInfo.push("[" + env + "]"); } } }) }); $scope.namespacePublishInfo = namespacePublishInfo; }); } EventManager.subscribe(EventManager.EventType.REFRESH_NAMESPACE, function (context) { if (context.namespace) { refreshSingleNamespace(context.namespace); } else { refreshAllNamespaces(); } }); function refreshAllNamespaces() { if ($rootScope.pageContext.env == '') { return; } ConfigService.load_all_namespaces($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName).then( function (result) { $scope.namespaces = result; $('.config-item-container').removeClass('hide'); initPublishInfo(); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function refreshSingleNamespace(namespace) { if ($rootScope.pageContext.env == '') { return; } ConfigService.load_namespace($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, namespace.baseInfo.namespaceName).then( function (result) { $scope.namespaces.forEach(function (namespace, index) { if (namespace.baseInfo.namespaceName == result.baseInfo.namespaceName) { result.showNamespaceBody = true; result.initialized = true; result.show = namespace.show; $scope.namespaces[index] = result; } }); initPublishInfo(); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function rollback() { EventManager.emit(EventManager.EventType.ROLLBACK_NAMESPACE); } $scope.tableViewOperType = '', $scope.item = {}; $scope.toOperationNamespace; var toDeleteItemId = 0; function preDeleteItem(namespace, item) { if (!lockCheck(namespace)) { return; } $scope.config = {}; $scope.config.key = _.escape(item.key); $scope.config.value = _.escape(item.value); $scope.toOperationNamespace = namespace; toDeleteItemId = item.id; $("#deleteConfirmDialog").modal("show"); } function deleteItem() { ConfigService.delete_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName, toDeleteItemId).then( function (result) { toastr.success($translate.instant('Config.Deleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.DeleteFailed')); }); } function preRevokeItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.toOperationNamespace = namespace; toRevokeItemId = namespace.baseInfo.id; $("#revokeItemConfirmDialog").modal("show"); } function revokeItem() { ConfigService.revoke_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName).then( function (result) { toastr.success($translate.instant('Revoke.RevokeSuccessfully')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Revoke.RevokeFailed')); } ); } //修改配置 function editItem(namespace, toEditItem) { if (!lockCheck(namespace)) { return; } $scope.item = _.clone(toEditItem); if (namespace.isBranch || namespace.isLinkedNamespace) { var existedItem = false; namespace.items.forEach(function (item) { if (!item.isDeleted && item.item.key == toEditItem.key) { existedItem = true; } }); if (!existedItem) { $scope.item.lineNum = 0; $scope.item.tableViewOperType = 'create'; } else { $scope.item.tableViewOperType = 'update'; } } else { $scope.item.tableViewOperType = 'update'; } $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } //新增配置 function createItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.item = { tableViewOperType: 'create' }; $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } var selectedClusters = []; $scope.collectSelectedClusters = function (data) { selectedClusters = data; }; function lockCheck(namespace) { if (namespace.lockOwner && $scope.currentUser != namespace.lockOwner) { $scope.lockOwner = namespace.lockOwner; $('#namespaceLockedDialog').modal('show'); return false; } return true; } function closeTip(clusterName) { var hideTip = JSON.parse(localStorage.getItem("hideTip")); if (!hideTip) { hideTip = {}; hideTip[$rootScope.pageContext.appId] = {}; } if (!hideTip[$rootScope.pageContext.appId]) { hideTip[$rootScope.pageContext.appId] = {}; } hideTip[$rootScope.pageContext.appId][clusterName] = true; $rootScope.hideTip = hideTip; localStorage.setItem("hideTip", JSON.stringify(hideTip)); } function showText(text) { $scope.text = text; $('#showTextModal').modal('show'); } function showNoModifyPermissionDialog() { $("#modifyNoPermissionDialog").modal('show'); } var toCreateBranchNamespace = {}; function preCreateBranch(namespace) { toCreateBranchNamespace = namespace; AppUtil.showModal("#createBranchTips"); } function createBranch() { NamespaceBranchService.createBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, toCreateBranchNamespace.baseInfo.namespaceName) .then(function (result) { toastr.success($translate.instant('Config.GrayscaleCreated')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: toCreateBranchNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.GrayscaleCreateFailed')); }) } function preDeleteBranch(branch) { //normal delete branch.branchStatus = 0; $scope.toDeleteBranch = branch; AppUtil.showModal('#deleteBranchDialog'); } function deleteBranch() { NamespaceBranchService.deleteBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, $scope.toDeleteBranch.baseInfo.namespaceName, $scope.toDeleteBranch.baseInfo.clusterName ) .then(function (result) { toastr.success($translate.instant('Config.BranchDeleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toDeleteBranch.parentNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.BranchDeleteFailed')); }) } EventManager.subscribe(EventManager.EventType.EMERGENCY_PUBLISH, function (context) { AppUtil.showModal("#emergencyPublishAlertDialog"); $scope.emergencyPublishContext = context; }); function emergencyPublish() { if ($scope.emergencyPublishContext.mergeAndPublish) { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } else { EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } } EventManager.subscribe(EventManager.EventType.DELETE_NAMESPACE_FAILED, function (context) { $scope.deleteNamespaceContext = context; if (context.reason == 'master_instance') { AppUtil.showModal('#deleteNamespaceDenyForMasterInstanceDialog'); } else if (context.reason == 'branch_instance') { AppUtil.showModal('#deleteNamespaceDenyForBranchInstanceDialog'); } else if (context.reason == 'public_namespace') { var otherAppAssociatedNamespaces = context.otherAppAssociatedNamespaces; var namespaceTips = []; otherAppAssociatedNamespaces.forEach(function (namespace) { var appId = namespace.appId; var clusterName = namespace.clusterName; var url = AppUtil.prefixPath() + '/config.html?#/appid=' + appId + '&env=' + $scope.pageContext.env + '&cluster=' + clusterName; namespaceTips.push("<a target='_blank' href=\'" + url + "\'>AppId = " + appId + ", Cluster = " + clusterName + ", Namespace = " + namespace.namespaceName + "</a>"); }); $scope.deleteNamespaceContext.detailReason = $translate.instant('Config.DeleteNamespaceFailedTips') + "<br>" + namespaceTips.join("<br>"); AppUtil.showModal('#deleteNamespaceDenyForPublicNamespaceDialog'); } }); EventManager.subscribe(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, function (context) { $scope.syntaxCheckContext = context; AppUtil.showModal('#syntaxCheckFailedDialog'); }); new Clipboard('.clipboard'); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ application_module.controller("ConfigNamespaceController", ['$rootScope', '$scope', '$translate', 'toastr', 'AppUtil', 'EventManager', 'ConfigService', 'PermissionService', 'UserService', 'NamespaceBranchService', 'NamespaceService', controller]); function controller($rootScope, $scope, $translate, toastr, AppUtil, EventManager, ConfigService, PermissionService, UserService, NamespaceBranchService, NamespaceService) { $scope.rollback = rollback; $scope.preDeleteItem = preDeleteItem; $scope.deleteItem = deleteItem; $scope.editItem = editItem; $scope.createItem = createItem; $scope.preRevokeItem = preRevokeItem; $scope.revokeItem = revokeItem; $scope.closeTip = closeTip; $scope.showText = showText; $scope.createBranch = createBranch; $scope.preCreateBranch = preCreateBranch; $scope.preDeleteBranch = preDeleteBranch; $scope.deleteBranch = deleteBranch; $scope.showNoModifyPermissionDialog = showNoModifyPermissionDialog; $scope.lockCheck = lockCheck; $scope.emergencyPublish = emergencyPublish; init(); function init() { initRole(); initUser(); initPublishInfo(); } function initRole() { PermissionService.get_app_role_users($rootScope.pageContext.appId) .then(function (result) { var masterUsers = ''; result.masterUsers.forEach(function (user) { masterUsers += _.escape(user.userId) + ','; }); $scope.masterUsers = masterUsers.substring(0, masterUsers.length - 1); }, function (result) { }); } function initUser() { UserService.load_user().then(function (result) { $scope.currentUser = result.userId; }); } function initPublishInfo() { NamespaceService.getNamespacePublishInfo($rootScope.pageContext.appId) .then(function (result) { if (!result) { return; } $scope.hasNotPublishNamespace = false; var namespacePublishInfo = []; Object.keys(result).forEach(function (env) { if (env.indexOf("$") >= 0) { return; } var envPublishInfo = result[env]; Object.keys(envPublishInfo).forEach(function (cluster) { var clusterPublishInfo = envPublishInfo[cluster]; if (clusterPublishInfo) { $scope.hasNotPublishNamespace = true; if (Object.keys(envPublishInfo).length > 1) { namespacePublishInfo.push("[" + env + ", " + cluster + "]"); } else { namespacePublishInfo.push("[" + env + "]"); } } }) }); $scope.namespacePublishInfo = namespacePublishInfo; }); } EventManager.subscribe(EventManager.EventType.REFRESH_NAMESPACE, function (context) { if (context.namespace) { refreshSingleNamespace(context.namespace); } else { refreshAllNamespaces(); } }); function refreshAllNamespaces() { if ($rootScope.pageContext.env == '') { return; } ConfigService.load_all_namespaces($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName).then( function (result) { $scope.namespaces = result; $('.config-item-container').removeClass('hide'); initPublishInfo(); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function refreshSingleNamespace(namespace) { if ($rootScope.pageContext.env == '') { return; } ConfigService.load_namespace($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, namespace.baseInfo.namespaceName).then( function (result) { $scope.namespaces.forEach(function (namespace, index) { if (namespace.baseInfo.namespaceName == result.baseInfo.namespaceName) { result.showNamespaceBody = true; result.initialized = true; result.show = namespace.show; $scope.namespaces[index] = result; } }); initPublishInfo(); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function rollback() { EventManager.emit(EventManager.EventType.ROLLBACK_NAMESPACE); } $scope.tableViewOperType = '', $scope.item = {}; $scope.toOperationNamespace; var toDeleteItemId = 0; function preDeleteItem(namespace, item) { if (!lockCheck(namespace)) { return; } $scope.config = {}; $scope.config.key = _.escape(item.key); $scope.config.value = _.escape(item.value); $scope.toOperationNamespace = namespace; toDeleteItemId = item.id; $("#deleteConfirmDialog").modal("show"); } function deleteItem() { ConfigService.delete_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName, toDeleteItemId).then( function (result) { toastr.success($translate.instant('Config.Deleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.DeleteFailed')); }); } function preRevokeItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.toOperationNamespace = namespace; toRevokeItemId = namespace.baseInfo.id; $("#revokeItemConfirmDialog").modal("show"); } function revokeItem() { ConfigService.revoke_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName).then( function (result) { toastr.success($translate.instant('Revoke.RevokeSuccessfully')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Revoke.RevokeFailed')); } ); } //修改配置 function editItem(namespace, toEditItem) { if (!lockCheck(namespace)) { return; } $scope.item = _.clone(toEditItem); if (namespace.isBranch || namespace.isLinkedNamespace) { var existedItem = false; namespace.items.forEach(function (item) { if (!item.isDeleted && item.item.key == toEditItem.key) { existedItem = true; } }); if (!existedItem) { $scope.item.lineNum = 0; $scope.item.tableViewOperType = 'create'; } else { $scope.item.tableViewOperType = 'update'; } } else { $scope.item.tableViewOperType = 'update'; } $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } //新增配置 function createItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.item = { tableViewOperType: 'create' }; $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } var selectedClusters = []; $scope.collectSelectedClusters = function (data) { selectedClusters = data; }; function lockCheck(namespace) { if (namespace.lockOwner && $scope.currentUser != namespace.lockOwner) { $scope.lockOwner = namespace.lockOwner; $('#namespaceLockedDialog').modal('show'); return false; } return true; } function closeTip(clusterName) { var hideTip = JSON.parse(localStorage.getItem("hideTip")); if (!hideTip) { hideTip = {}; hideTip[$rootScope.pageContext.appId] = {}; } if (!hideTip[$rootScope.pageContext.appId]) { hideTip[$rootScope.pageContext.appId] = {}; } hideTip[$rootScope.pageContext.appId][clusterName] = true; $rootScope.hideTip = hideTip; localStorage.setItem("hideTip", JSON.stringify(hideTip)); } function showText(text) { $scope.text = text; $('#showTextModal').modal('show'); } function showNoModifyPermissionDialog() { $("#modifyNoPermissionDialog").modal('show'); } var toCreateBranchNamespace = {}; function preCreateBranch(namespace) { toCreateBranchNamespace = namespace; AppUtil.showModal("#createBranchTips"); } function createBranch() { NamespaceBranchService.createBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, toCreateBranchNamespace.baseInfo.namespaceName) .then(function (result) { toastr.success($translate.instant('Config.GrayscaleCreated')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: toCreateBranchNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.GrayscaleCreateFailed')); }) } function preDeleteBranch(branch) { //normal delete branch.branchStatus = 0; $scope.toDeleteBranch = branch; AppUtil.showModal('#deleteBranchDialog'); } function deleteBranch() { NamespaceBranchService.deleteBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, $scope.toDeleteBranch.baseInfo.namespaceName, $scope.toDeleteBranch.baseInfo.clusterName ) .then(function (result) { toastr.success($translate.instant('Config.BranchDeleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toDeleteBranch.parentNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.BranchDeleteFailed')); }) } EventManager.subscribe(EventManager.EventType.EMERGENCY_PUBLISH, function (context) { AppUtil.showModal("#emergencyPublishAlertDialog"); $scope.emergencyPublishContext = context; }); function emergencyPublish() { if ($scope.emergencyPublishContext.mergeAndPublish) { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } else { EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } } EventManager.subscribe(EventManager.EventType.DELETE_NAMESPACE_FAILED, function (context) { $scope.deleteNamespaceContext = context; if (context.reason == 'master_instance') { AppUtil.showModal('#deleteNamespaceDenyForMasterInstanceDialog'); } else if (context.reason == 'branch_instance') { AppUtil.showModal('#deleteNamespaceDenyForBranchInstanceDialog'); } else if (context.reason == 'public_namespace') { var otherAppAssociatedNamespaces = context.otherAppAssociatedNamespaces; var namespaceTips = []; otherAppAssociatedNamespaces.forEach(function (namespace) { var appId = namespace.appId; var clusterName = namespace.clusterName; var url = AppUtil.prefixPath() + '/config.html?#/appid=' + appId + '&env=' + $scope.pageContext.env + '&cluster=' + clusterName; namespaceTips.push("<a target='_blank' href=\'" + url + "\'>AppId = " + appId + ", Cluster = " + clusterName + ", Namespace = " + namespace.namespaceName + "</a>"); }); $scope.deleteNamespaceContext.detailReason = $translate.instant('Config.DeleteNamespaceFailedTips') + "<br>" + namespaceTips.join("<br>"); AppUtil.showModal('#deleteNamespaceDenyForPublicNamespaceDialog'); } }); EventManager.subscribe(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, function (context) { $scope.syntaxCheckContext = context; AppUtil.showModal('#syntaxCheckFailedDialog'); }); new Clipboard('.clipboard'); }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/angular/ui-bootstrap-tpls-0.13.0.min.js
/* * angular-ui-bootstrap * http://angular-ui.github.io/bootstrap/ * Version: 0.13.0 - 2015-05-02 * License: MIT */ angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) { return { link: function (b, c, d) { function e() { c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f) } function f() { c.removeClass("collapsing"), c.css({height: "auto"}) } function g() { c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h) } function h() { c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse") } b.$watch(d.collapse, function (a) { a ? g() : e() }) } } }]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) { this.groups = [], this.closeOthers = function (d) { var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers; e && angular.forEach(this.groups, function (a) { a !== d && (a.isOpen = !1) }) }, this.addGroup = function (a) { var b = this; this.groups.push(a), a.$on("$destroy", function () { b.removeGroup(a) }) }, this.removeGroup = function (a) { var b = this.groups.indexOf(a); -1 !== b && this.groups.splice(b, 1) } }]).directive("accordion", function () { return { restrict: "EA", controller: "AccordionController", transclude: !0, replace: !1, templateUrl: "template/accordion/accordion.html" } }).directive("accordionGroup", function () { return { require: "^accordion", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/accordion/accordion-group.html", scope: {heading: "@", isOpen: "=?", isDisabled: "=?"}, controller: function () { this.setHeading = function (a) { this.heading = a } }, link: function (a, b, c, d) { d.addGroup(a), a.$watch("isOpen", function (b) { b && d.closeOthers(a) }), a.toggleOpen = function () { a.isDisabled || (a.isOpen = !a.isOpen) } } } }).directive("accordionHeading", function () { return { restrict: "EA", transclude: !0, template: "", replace: !0, require: "^accordionGroup", link: function (a, b, c, d, e) { d.setHeading(e(a, angular.noop)) } } }).directive("accordionTransclude", function () { return { require: "^accordionGroup", link: function (a, b, c, d) { a.$watch(function () { return d[c.accordionTransclude] }, function (a) { a && (b.html(""), b.append(a)) }) } } }), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) { a.closeable = "close" in b, this.close = a.close }]).directive("alert", function () { return { restrict: "EA", controller: "AlertController", templateUrl: "template/alert/alert.html", transclude: !0, replace: !0, scope: {type: "@", close: "&"} } }).directive("dismissOnTimeout", ["$timeout", function (a) { return { require: "alert", link: function (b, c, d, e) { a(function () { e.close() }, parseInt(d.dismissOnTimeout, 10)) } } }]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () { return function (a, b, c) { b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) { b.html(a || "") }) } }), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", { activeClass: "active", toggleEvent: "click" }).controller("ButtonsController", ["buttonConfig", function (a) { this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click" }]).directive("btnRadio", function () { return { require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f.$render = function () { b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio))) }, b.bind(e.toggleEvent, function () { var d = b.hasClass(e.activeClass); (!d || angular.isDefined(c.uncheckable)) && a.$apply(function () { f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render() }) }) } } }).directive("btnCheckbox", function () { return { require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { function e() { return g(c.btnCheckboxTrue, !0) } function f() { return g(c.btnCheckboxFalse, !1) } function g(b, c) { var d = a.$eval(b); return angular.isDefined(d) ? d : c } var h = d[0], i = d[1]; i.$render = function () { b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e())) }, b.bind(h.toggleEvent, function () { a.$apply(function () { i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render() }) }) } } }), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) { function d(a) { if (angular.isUndefined(k[a].index))return k[a]; { var b; k.length } for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b] } function e() { f(); var c = +a.interval; !isNaN(c) && c > 0 && (h = b(g, c)) } function f() { h && (b.cancel(h), h = null) } function g() { var b = +a.interval; i && !isNaN(b) && b > 0 ? a.next() : a.pause() } var h, i, j = this, k = j.slides = a.slides = [], l = -1; j.currentSlide = null; var m = !1; j.select = a.select = function (b, d) { function f() { m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, { direction: d, active: !1 }), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () { a.$currentTransition = null })), j.currentSlide = b, l = g, e()) } var g = j.indexOfSlide(b); void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f() }, a.$on("$destroy", function () { m = !0 }), j.getCurrentIndex = function () { return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l }, j.indexOfSlide = function (a) { return angular.isDefined(a.index) ? +a.index : k.indexOf(a) }, a.next = function () { var b = (j.getCurrentIndex() + 1) % k.length; return a.$currentTransition ? void 0 : j.select(d(b), "next") }, a.prev = function () { var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1; return a.$currentTransition ? void 0 : j.select(d(b), "prev") }, a.isActive = function (a) { return j.currentSlide === a }, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () { i || (i = !0, e()) }, a.pause = function () { a.noPause || (i = !1, f()) }, j.addSlide = function (b, c) { b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1 }, j.removeSlide = function (a) { angular.isDefined(a.index) && k.sort(function (a, b) { return +a.index > +b.index }); var b = k.indexOf(a); k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l-- } }]).directive("carousel", [function () { return { restrict: "EA", transclude: !0, replace: !0, controller: "CarouselController", require: "carousel", templateUrl: "template/carousel/carousel.html", scope: {interval: "=", noTransition: "=", noPause: "="} } }]).directive("slide", function () { return { require: "^carousel", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/carousel/slide.html", scope: {active: "=?", index: "=?"}, link: function (a, b, c, d) { d.addSlide(a, b), a.$on("$destroy", function () { d.removeSlide(a) }), a.$watch("active", function (b) { b && d.select(a) }) } } }).animation(".item", ["$animate", function (a) { return { beforeAddClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return b.addClass(f), a.addClass(b, g).then(function () { e || b.removeClass(g + " " + f), d() }), function () { e = !0 } } d() }, beforeRemoveClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return a.addClass(b, g).then(function () { e || b.removeClass(g), d() }), function () { e = !0 } } d() } } }]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) { function c(a) { var c = [], d = a.split(""); return angular.forEach(f, function (b, e) { var f = a.indexOf(e); if (f > -1) { a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$"; for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$"; a = a.join(""), c.push({index: f, apply: b.apply}) } }), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")} } function d(a, b, c) { return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0 } var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g; this.parsers = {}; var f = { yyyy: { regex: "\\d{4}", apply: function (a) { this.year = +a } }, yy: { regex: "\\d{2}", apply: function (a) { this.year = +a + 2e3 } }, y: { regex: "\\d{1,4}", apply: function (a) { this.year = +a } }, MMMM: { regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.MONTH.indexOf(b) } }, MMM: { regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b) } }, MM: { regex: "0[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, M: { regex: "[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, dd: { regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, d: { regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")}, EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")}, HH: { regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, H: { regex: "1?[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, mm: { regex: "[0-5][0-9]", apply: function (a) { this.minutes = +a } }, m: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.minutes = +a } }, sss: { regex: "[0-9][0-9][0-9]", apply: function (a) { this.milliseconds = +a } }, ss: { regex: "[0-5][0-9]", apply: function (a) { this.seconds = +a } }, s: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.seconds = +a } } }; this.parse = function (b, f, g) { if (!angular.isString(b) || !f)return b; f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f)); var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i); if (k && k.length) { var l, m; l = g ? { year: g.getFullYear(), month: g.getMonth(), date: g.getDate(), hours: g.getHours(), minutes: g.getMinutes(), seconds: g.getSeconds(), milliseconds: g.getMilliseconds() } : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0}; for (var n = 1, o = k.length; o > n; n++) { var p = j[n - 1]; p.apply && p.apply.call(l, k[n]) } return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m } } }]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) { function c(a, c) { return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c] } function d(a) { return "static" === (c(a, "position") || "static") } var e = function (b) { for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent; return e || c }; return { position: function (b) { var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]); f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft); var g = b[0].getBoundingClientRect(); return { width: g.width || b.prop("offsetWidth"), height: g.height || b.prop("offsetHeight"), top: c.top - d.top, left: c.left - d.left } }, offset: function (c) { var d = c[0].getBoundingClientRect(); return { width: d.width || c.prop("offsetWidth"), height: d.height || c.prop("offsetHeight"), top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop), left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft) } }, positionElements: function (a, b, c, d) { var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center"; e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight"); var l = { center: function () { return e.left + e.width / 2 - f / 2 }, left: function () { return e.left }, right: function () { return e.left + e.width } }, m = { center: function () { return e.top + e.height / 2 - g / 2 }, top: function () { return e.top }, bottom: function () { return e.top + e.height } }; switch (j) { case"right": h = {top: m[k](), left: l[j]()}; break; case"left": h = {top: m[k](), left: e.left - f}; break; case"bottom": h = {top: m[j](), left: l[k]()}; break; default: h = {top: e.top - g, left: l[k]()} } return h } } }]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", { formatDay: "dd", formatMonth: "MMMM", formatYear: "yyyy", formatDayHeader: "EEE", formatDayTitle: "MMMM yyyy", formatMonthTitle: "yyyy", datepickerMode: "day", minMode: "day", maxMode: "year", showWeeks: !0, startingDay: 0, yearRange: 20, minDate: null, maxDate: null, shortcutPropagation: !1 }).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) { var i = this, j = {$setViewValue: angular.noop}; this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) { i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c] }), angular.forEach(["minDate", "maxDate"], function (d) { b[d] ? a.$parent.$watch(c(b[d]), function (a) { i[d] = a ? new Date(a) : null, i.refreshView() }) : i[d] = h[d] ? new Date(h[d]) : null }), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) { a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView()) })) : this.activeDate = new Date, a.isActive = function (b) { return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1 }, this.init = function (a) { j = a, j.$render = function () { i.render() } }, this.render = function () { if (j.$viewValue) { var a = new Date(j.$viewValue), b = !isNaN(a); b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b) } this.refreshView() }, this.refreshView = function () { if (this.element) { this._refreshView(); var a = j.$viewValue ? new Date(j.$viewValue) : null; j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a)) } }, this.createDateObject = function (a, b) { var c = j.$viewValue ? new Date(j.$viewValue) : null; return { date: a, label: g(a, b), selected: c && 0 === this.compare(a, c), disabled: this.isDisabled(a), current: 0 === this.compare(a, new Date), customClass: this.customClass(a) } }, this.isDisabled = function (c) { return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({ date: c, mode: a.datepickerMode }) }, this.customClass = function (b) { return a.customClass({date: b, mode: a.datepickerMode}) }, this.split = function (a, b) { for (var c = []; a.length > 0;)c.push(a.splice(0, b)); return c }, a.select = function (b) { if (a.datepickerMode === i.minMode) { var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0); c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render() } else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1] }, a.move = function (a) { var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0); i.activeDate.setFullYear(b, c, 1), i.refreshView() }, a.toggleMode = function (b) { b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b]) }, a.keys = { 13: "enter", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 37: "left", 38: "up", 39: "right", 40: "down" }; var k = function () { e(function () { i.element[0].focus() }, 0, !1) }; a.$on("datepicker.focus", k), a.keydown = function (b) { var c = a.keys[b.which]; if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) { if (i.isDisabled(i.activeDate))return; a.select(i.activeDate), k() } else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k()) } }]).directive("datepicker", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/datepicker.html", scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"}, require: ["datepicker", "?^ngModel"], controller: "DatepickerController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f) } } }).directive("daypicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/day.html", require: "^datepicker", link: function (b, c, d, e) { function f(a, b) { return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29 } function g(a, b) { var c = new Array(b), d = new Date(a), e = 0; for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1); return c } function h(a) { var b = new Date(a); b.setDate(b.getDate() + 4 - (b.getDay() || 7)); var c = b.getTime(); return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1 } b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c; var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; e._refreshView = function () { var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f); j > 0 && k.setDate(-j + 1); for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), { secondary: l[m].getMonth() !== d, uid: b.uniqueId + "-" + m }); b.labels = new Array(7); for (var n = 0; 7 > n; n++)b.labels[n] = { abbr: a(l[n].date, e.formatDayHeader), full: a(l[n].date, "EEEE") }; if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) { b.weekNumbers = []; for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date)) } }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getDate(); if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1); e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b) } else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth())); e.activeDate.setDate(b) }, e.refreshView() } } }]).directive("monthpicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/month.html", require: "^datepicker", link: function (b, c, d, e) { e.step = {years: 1}, e.element = c, e._refreshView = function () { for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f}); b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3) }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getMonth(); if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1); e.activeDate.setFullYear(c) } else"home" === a ? b = 0 : "end" === a && (b = 11); e.activeDate.setMonth(b) }, e.refreshView() } } }]).directive("yearpicker", ["dateFilter", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/year.html", require: "^datepicker", link: function (a, b, c, d) { function e(a) { return parseInt((a - 1) / f, 10) * f + 1 } var f = d.yearRange; d.step = {years: f}, d.element = b, d._refreshView = function () { for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c}); a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5) }, d.compare = function (a, b) { return a.getFullYear() - b.getFullYear() }, d.handleKeyDown = function (a) { var b = d.activeDate.getFullYear(); "left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b) }, d.refreshView() } } }]).constant("datepickerPopupConfig", { datepickerPopup: "yyyy-MM-dd", html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"}, currentText: "Today", clearText: "Clear", closeText: "Done", closeOnDateSelection: !0, appendToBody: !1, showButtonBar: !0 }).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) { return { restrict: "EA", require: "ngModel", scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"}, link: function (h, i, j, k) { function l(a) { return a.replace(/([A-Z])/g, function (a) { return "-" + a.toLowerCase() }) } function m(a) { if (angular.isNumber(a) && (a = new Date(a)), a) { if (angular.isDate(a) && !isNaN(a))return a; if (angular.isString(a)) { var b = f.parse(a, o, h.date) || new Date(a); return isNaN(b) ? void 0 : b } return void 0 } return null } function n(a, b) { var c = a || b; if (angular.isNumber(c) && (c = new Date(c)), c) { if (angular.isDate(c) && !isNaN(c))return !0; if (angular.isString(c)) { var d = f.parse(c, o) || new Date(c); return !isNaN(d) } return !1 } return !0 } var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody; h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) { return h[a + "Text"] || g[a + "Text"] }; var r = !1; if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) { var b = a || g.datepickerPopup; if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.") })), !o)throw new Error("datepickerPopup must have a date format specified."); if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats."); var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>"); s.attr({"ng-model": "date", "ng-change": "dateSelection()"}); var t = angular.element(s.children()[0]); if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) { var u = h.$parent.$eval(j.datepickerOptions); u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) { t.attr(l(b), a) }) } h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) { if (j[a]) { var c = b(j[a]); if (h.$parent.$watch(c, function (b) { h.watchData[a] = b }), t.attr(l(a), "watchData." + a), "datepickerMode" === a) { var d = c.assign; h.$watch("watchData." + a, function (a, b) { a !== b && d(h.$parent, a) }) } } }), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) { return h.date = a, a }) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) { return h.date = a, k.$isEmpty(a) ? a : e(a, o) })), h.dateSelection = function (a) { angular.isDefined(a) && (h.date = a); var b = h.date ? e(h.date, o) : ""; i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus()) }, k.$viewChangeListeners.push(function () { h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue) }); var v = function (a) { h.isOpen && a.target !== i[0] && h.$apply(function () { h.isOpen = !1 }) }, w = function (a) { h.keydown(a) }; i.bind("keydown", w), h.keydown = function (a) { 27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0) }, h.$watch("isOpen", function (a) { a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v) }), h.select = function (a) { if ("today" === a) { var b = new Date; angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0)) } h.dateSelection(a) }, h.close = function () { h.isOpen = !1, i[0].focus() }; var x = a(s)(h); s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () { x.remove(), i.unbind("keydown", w), c.unbind("click", v) }) } } }]).directive("datepickerPopupWrap", function () { return { restrict: "EA", replace: !0, transclude: !0, templateUrl: "template/datepicker/popup.html", link: function (a, b) { b.bind("click", function (a) { a.preventDefault(), a.stopPropagation() }) } } }), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) { var c = null; this.open = function (b) { c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b }, this.close = function (b) { c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e)) }; var d = function (a) { if (c && (!a || "disabled" !== c.getAutoClose())) { var d = c.getToggleElement(); if (!(a && d && d[0].contains(a.target))) { var e = c.getElement(); a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply()) } } }, e = function (a) { 27 === a.which && (c.focusToggleElement(), d()) } }]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) { var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1; this.init = function (d) { j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) { k.isOpen = !!a })), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () { j.dropdownMenu.remove() })) }, this.toggle = function (a) { return k.isOpen = arguments.length ? !!a : !k.isOpen }, this.isOpen = function () { return k.isOpen }, k.getToggleElement = function () { return j.toggleElement }, k.getAutoClose = function () { return b.autoClose || "always" }, k.getElement = function () { return j.$element }, k.focusToggleElement = function () { j.toggleElement && j.toggleElement[0].focus() }, k.$watch("isOpen", function (b, c) { if (o && j.dropdownMenu) { var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0); j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"}) } f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b}) }), a.$on("$locationChangeSuccess", function () { k.isOpen = !1 }), a.$on("$destroy", function () { k.$destroy() }) }]).directive("dropdown", function () { return { controller: "DropdownController", link: function (a, b, c, d) { d.init(b) } } }).directive("dropdownMenu", function () { return { restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) { d && (d.dropdownMenu = b) } } }).directive("dropdownToggle", function () { return { require: "?^dropdown", link: function (a, b, c, d) { if (d) { d.toggleElement = b; var e = function (e) { e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () { d.toggle() }) }; b.bind("click", e), b.attr({ "aria-haspopup": !0, "aria-expanded": !1 }), a.$watch(d.isOpen, function (a) { b.attr("aria-expanded", !!a) }), a.$on("$destroy", function () { b.unbind("click", e) }) } } } }), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () { return { createNew: function () { var a = []; return { add: function (b, c) { a.push({key: b, value: c}) }, get: function (b) { for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c] }, keys: function () { for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key); return b }, top: function () { return a[a.length - 1] }, remove: function (b) { for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) { c = d; break } return a.splice(c, 1)[0] }, removeTop: function () { return a.splice(a.length - 1, 1)[0] }, length: function () { return a.length } } } } }).directive("modalBackdrop", ["$timeout", function (a) { function b(b) { b.animate = !1, a(function () { b.animate = !0 }) } return { restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) { return a.addClass(c.backdropClass), b } } }]).directive("modalWindow", ["$modalStack", "$q", function (a, b) { return { restrict: "EA", scope: {index: "@", animate: "="}, replace: !0, transclude: !0, templateUrl: function (a, b) { return b.templateUrl || "template/modal/window.html" }, link: function (c, d, e) { d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) { var c = a.getTop(); c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click")) }, c.$isRendered = !0; var f = b.defer(); e.$observe("modalRender", function (a) { "true" == a && f.resolve() }), f.promise.then(function () { c.animate = !0; var b = d[0].querySelectorAll("[autofocus]"); b.length ? b[0].focus() : d[0].focus(); var e = a.getTop(); e && a.modalRendered(e.key) }) } } }]).directive("modalAnimationClass", [function () { return { compile: function (a, b) { b.modalAnimation && a.addClass(b.modalAnimationClass) } } }]).directive("modalTransclude", function () { return { link: function (a, b, c, d, e) { e(a.$parent, function (a) { b.empty(), b.append(a) }) } } }).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) { function g() { for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c); return a } function h(a) { var b = c.find("body").eq(0), d = o.get(a).value; o.remove(a), j(d.modalDomEl, d.modalScope, function () { b.toggleClass(n, o.length() > 0), i() }) } function i() { if (l && -1 == g()) { var a = m; j(l, m, function () { a = null }), l = void 0, m = void 0 } } function j(c, d, f) { function g() { g.done || (g.done = !0, c.remove(), d.$destroy(), f && f()) } d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () { e.$evalAsync(g) }) : b(g) } function k(a, b, c) { return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented } var l, m, n = "modal-open", o = f.createNew(), p = {}; return e.$watch(g, function (a) { m && (m.index = a) }), c.bind("keydown", function (a) { var b; 27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () { p.dismiss(b.key, "escape key press") }))) }), p.open = function (a, b) { var f = c[0].activeElement; o.add(a, { deferred: b.deferred, renderDeferred: b.renderDeferred, modalScope: b.scope, backdrop: b.backdrop, keyboard: b.keyboard }); var h = c.find("body").eq(0), i = g(); if (i >= 0 && !l) { m = e.$new(!0), m.index = i; var j = angular.element('<div modal-backdrop="modal-backdrop"></div>'); j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l) } var k = angular.element('<div modal-window="modal-window"></div>'); k.attr({ "template-url": b.windowTemplateUrl, "window-class": b.windowClass, size: b.size, index: o.length() - 1, animate: "animate" }).html(b.content), b.animation && k.attr("modal-animation", "true"); var p = d(k)(b.scope); o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n) }, p.close = function (a, b) { var c = o.get(a); return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismiss = function (a, b) { var c = o.get(a); return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismissAll = function (a) { for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop() }, p.getTop = function () { return o.top() }, p.modalRendered = function (a) { var b = o.get(a); b && b.value.renderDeferred.resolve() }, p }]).provider("$modal", function () { var a = { options: {animation: !0, backdrop: !0, keyboard: !0}, $get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) { function h(a) { return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl) } function i(a) { var c = []; return angular.forEach(a, function (a) { (angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a))) }), c } var j = {}; return j.open = function (b) { var e = d.defer(), j = d.defer(), k = d.defer(), l = { result: e.promise, opened: j.promise, rendered: k.promise, close: function (a) { return g.close(l, a) }, dismiss: function (a) { return g.dismiss(l, a) } }; if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required."); var m = d.all([h(b)].concat(i(b.resolve))); return m.then(function (a) { var d = (b.scope || c).$new(); d.$close = l.close, d.$dismiss = l.dismiss; var h, i = {}, j = 1; b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) { i[c] = a[j++] }), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, { scope: d, deferred: e, renderDeferred: k, content: a[0], animation: b.animation, backdrop: b.backdrop, keyboard: b.keyboard, backdropClass: b.backdropClass, windowClass: b.windowClass, windowTemplateUrl: b.windowTemplateUrl, size: b.size }) }, function (a) { e.reject(a) }), m.then(function () { j.resolve(!0) }, function (a) { j.reject(a) }), l }, j }] }; return a }), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) { var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop; this.init = function (g, h) { e = g, this.config = h, e.$render = function () { d.render() }, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) { d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages() }) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () { a.totalPages = d.calculateTotalPages() }), a.$watch("totalPages", function (b) { f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render() }) }, this.calculateTotalPages = function () { var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage); return Math.max(b || 0, 1) }, this.render = function () { a.page = parseInt(e.$viewValue, 10) || 1 }, a.selectPage = function (b, c) { a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render()) }, a.getText = function (b) { return a[b + "Text"] || d.config[b + "Text"] }, a.noPrevious = function () { return 1 === a.page }, a.noNext = function () { return a.page === a.totalPages } }]).constant("paginationConfig", { itemsPerPage: 10, boundaryLinks: !1, directionLinks: !0, firstText: "First", previousText: "Previous", nextText: "Next", lastText: "Last", rotate: !0 }).directive("pagination", ["$parse", "paginationConfig", function (a, b) { return { restrict: "EA", scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"}, require: ["pagination", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pagination.html", replace: !0, link: function (c, d, e, f) { function g(a, b, c) { return {number: a, text: b, active: c} } function h(a, b) { var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k; f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b))); for (var h = d; e >= h; h++) { var i = g(h, h, h === a); c.push(i) } if (f && !l) { if (d > 1) { var j = g(d - 1, "...", !1); c.unshift(j) } if (b > e) { var m = g(e + 1, "...", !1); c.push(m) } } return c } var i = f[0], j = f[1]; if (j) { var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate; c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) { k = parseInt(a, 10), i.render() }); var m = i.render; i.render = function () { m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages)) } } } } }]).constant("pagerConfig", { itemsPerPage: 10, previousText: "« Previous", nextText: "Next »", align: !0 }).directive("pager", ["pagerConfig", function (a) { return { restrict: "EA", scope: {totalItems: "=", previousText: "@", nextText: "@"}, require: ["pager", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pager.html", replace: !0, link: function (b, c, d, e) { var f = e[0], g = e[1]; g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a)) } } }]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () { function a(a) { var b = /[A-Z]/g, c = "-"; return a.replace(b, function (a, b) { return (b ? c : "") + a.toLowerCase() }) } var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = { mouseenter: "mouseleave", click: "click", focus: "blur" }, d = {}; this.options = function (a) { angular.extend(d, a) }, this.setTriggers = function (a) { angular.extend(c, a) }, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) { return function (e, k, l, m) { function n(a) { var b = a || m.trigger || l, d = c[b] || b; return {show: b, hide: d} } m = angular.extend({}, b, d, m); var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>'; return { restrict: "EA", compile: function () { var a = f(r); return function (b, c, d) { function f() { E.isOpen ? l() : j() } function j() { (!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) { a() })) : o()()) } function l() { b.$apply(function () { p() }) } function o() { return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({ top: 0, left: 0, display: "block" }), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop } function p() { E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r() } function q() { x && r(), y = E.$new(), x = a(y, function (a) { B ? h.find("body").append(a) : c.after(a) }), y.$watch(function () { g(F, 0, !1) }), m.useContentExp && y.$watch("contentExp()", function (a) { !a && E.isOpen && p() }) } function r() { z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null) } function s() { t(), u(), v() } function t() { E.popupClass = d[k + "Class"] } function u() { var a = d[k + "Placement"]; E.placement = angular.isDefined(a) ? a : m.placement } function v() { var a = d[k + "PopupDelay"], b = parseInt(a, 10); E.popupDelay = isNaN(b) ? m.popupDelay : b } function w() { var a = d[k + "Trigger"]; G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l)) } var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () { if (x) { var a = i.positionElements(c, x, E.placement, B); a.top += "px", a.left += "px", x.css(a) } }; E.origScope = b, E.isOpen = !1, E.contentExp = function () { return b.$eval(d[e]) }, m.useContentExp || d.$observe(e, function (a) { E.content = a, !a && E.isOpen && p() }), d.$observe("disabled", function (a) { a && E.isOpen && p() }), d.$observe(k + "Title", function (a) { E.title = a }); var G = function () { c.unbind(C.show, j), c.unbind(C.hide, l) }; w(); var H = b.$eval(d[k + "Animation"]); E.animation = angular.isDefined(H) ? !!H : m.animation; var I = b.$eval(d[k + "AppendToBody"]); B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () { E.isOpen && p() }), b.$on("$destroy", function () { g.cancel(z), g.cancel(A), G(), r(), E = null }) } } } } }] }).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) { return { link: function (e, f, g) { var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () { i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () { i = null }), i = j, j = null) }; e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) { var g = ++l; b ? (d(b, !0).then(function (d) { if (g === l) { var e = k.$new(), i = d, n = c(i)(e, function (b) { m(), a.enter(b, f) }); h = e, j = n, h.$emit("$includeContentLoaded", b) } }, function () { g === l && (m(), e.$emit("$includeContentError", b)) }), e.$emit("$includeContentRequested", b)) : m() }), e.$on("$destroy", m) } } }]).directive("tooltipClasses", function () { return { restrict: "A", link: function (a, b, c) { a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass) } } }).directive("tooltipPopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-popup.html" } }).directive("tooltip", ["$tooltip", function (a) { return a("tooltip", "tooltip", "mouseenter") }]).directive("tooltipTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"}, templateUrl: "template/tooltip/tooltip-template-popup.html" } }).directive("tooltipTemplate", ["$tooltip", function (a) { return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlPopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-popup.html" } }).directive("tooltipHtml", ["$tooltip", function (a) { return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlUnsafePopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html" } }).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) { return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter") }]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: { title: "@", contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&" }, templateUrl: "template/popover/popover-template.html" } }).directive("popoverTemplate", ["$tooltip", function (a) { return a("popoverTemplate", "popover", "click", {useContentExp: !0}) }]).directive("popoverPopup", function () { return { restrict: "EA", replace: !0, scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/popover/popover.html" } }).directive("popover", ["$tooltip", function (a) { return a("popover", "popover", "click") }]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", { animate: !0, max: 100 }).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) { var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate; this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) { e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) { b.percent = +(100 * c / a.max).toFixed(2) }), b.$on("$destroy", function () { c = null, d.removeBar(b) }) }, this.removeBar = function (a) { this.bars.splice(this.bars.indexOf(a), 1) } }]).directive("progress", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", require: "progress", scope: {}, templateUrl: "template/progressbar/progress.html" } }).directive("bar", function () { return { restrict: "EA", replace: !0, transclude: !0, require: "^progress", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/bar.html", link: function (a, b, c, d) { d.addBar(a, b) } } }).directive("progressbar", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/progressbar.html", link: function (a, b, c, d) { d.addBar(a, angular.element(b.children()[0])) } } }), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", { max: 5, stateOn: null, stateOff: null }).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) { var d = {$setViewValue: angular.noop}; this.init = function (e) { d = e, d.$render = this.render, d.$formatters.push(function (a) { return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a }), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff; var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max); a.range = this.buildTemplateObjects(f) }, this.buildTemplateObjects = function (a) { for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, { stateOn: this.stateOn, stateOff: this.stateOff }, a[b]); return a }, a.rate = function (b) { !a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render()) }, a.enter = function (b) { a.readonly || (a.value = b), a.onHover({value: b}) }, a.reset = function () { a.value = d.$viewValue, a.onLeave() }, a.onKeydown = function (b) { /(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1))) }, this.render = function () { a.value = d.$viewValue } }]).directive("rating", function () { return { restrict: "EA", require: ["rating", "ngModel"], scope: {readonly: "=?", onHover: "&", onLeave: "&"}, controller: "RatingController", templateUrl: "template/rating/rating.html", replace: !0, link: function (a, b, c, d) { var e = d[0], f = d[1]; e.init(f) } } }), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) { var b = this, c = b.tabs = a.tabs = []; b.select = function (a) { angular.forEach(c, function (b) { b.active && b !== a && (b.active = !1, b.onDeselect()) }), a.active = !0, a.onSelect() }, b.addTab = function (a) { c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1 }, b.removeTab = function (a) { var e = c.indexOf(a); if (a.active && c.length > 1 && !d) { var f = e == c.length - 1 ? e - 1 : e + 1; b.select(c[f]) } c.splice(e, 1) }; var d; a.$on("$destroy", function () { d = !0 }) }]).directive("tabset", function () { return { restrict: "EA", transclude: !0, replace: !0, scope: {type: "@"}, controller: "TabsetController", templateUrl: "template/tabs/tabset.html", link: function (a, b, c) { a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1 } } }).directive("tab", ["$parse", "$log", function (a, b) { return { require: "^tabset", restrict: "EA", replace: !0, templateUrl: "template/tabs/tab.html", transclude: !0, scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"}, controller: function () { }, compile: function (c, d, e) { return function (c, d, f, g) { c.$watch("active", function (a) { a && g.select(c) }), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) { c.disabled = !!a }), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) { c.disabled = !!a })), c.select = function () { c.disabled || (c.active = !0) }, g.addTab(c), c.$on("$destroy", function () { g.removeTab(c) }), c.$transcludeFn = e } } } }]).directive("tabHeadingTransclude", [function () { return { restrict: "A", require: "^tab", link: function (a, b) { a.$watch("headingElement", function (a) { a && (b.html(""), b.append(a)) }) } } }]).directive("tabContentTransclude", function () { function a(a) { return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase()) } return { restrict: "A", require: "^tabset", link: function (b, c, d) { var e = b.$eval(d.tabContentTransclude); e.$transcludeFn(e.$parent, function (b) { angular.forEach(b, function (b) { a(b) ? e.headingElement = b : c.append(b) }) }) } } }), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", { hourStep: 1, minuteStep: 1, showMeridian: !0, meridians: null, readonlyInput: !1, mousewheel: !0, arrowkeys: !0 }).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) { function g() { var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b; return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0 } function h() { var b = parseInt(a.minutes, 10); return b >= 0 && 60 > b ? b : void 0 } function i(a) { return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString() } function j(a) { k(), o.$setViewValue(new Date(n)), l(a) } function k() { o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1 } function l(b) { var c = n.getHours(), d = n.getMinutes(); a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1] } function m(a) { var b = new Date(n.getTime() + 6e4 * a); n.setHours(b.getHours(), b.getMinutes()), j() } var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS; this.init = function (c, d) { o = c, o.$render = this.render, o.$formatters.unshift(function (a) { return a ? new Date(a) : null }); var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel; h && this.setupMousewheelEvents(e, g); var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys; i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g) }; var q = f.hourStep; b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) { q = parseInt(a, 10) }); var r = f.minuteStep; b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) { r = parseInt(a, 10) }), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) { if (a.showMeridian = !!b, o.$error.time) { var c = g(), d = h(); angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j()) } else l() }), this.setupMousewheelEvents = function (b, c) { var d = function (a) { a.originalEvent && (a = a.originalEvent); var b = a.wheelDelta ? a.wheelDelta : -a.deltaY; return a.detail || b > 0 }; b.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault() }), c.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault() }) }, this.setupArrowkeyEvents = function (b, c) { b.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply()) }), c.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply()) }) }, this.setupInputEvents = function (b, c) { if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop); var d = function (b, c) { o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c) }; a.updateHours = function () { var a = g(); angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0) }, b.bind("blur", function () { !a.invalidHours && a.hours < 10 && a.$apply(function () { a.hours = i(a.hours) }) }), a.updateMinutes = function () { var a = h(); angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0) }, c.bind("blur", function () { !a.invalidMinutes && a.minutes < 10 && a.$apply(function () { a.minutes = i(a.minutes) }) }) }, this.render = function () { var a = o.$viewValue; isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l()) }, a.incrementHours = function () { m(60 * q) }, a.decrementHours = function () { m(60 * -q) }, a.incrementMinutes = function () { m(r) }, a.decrementMinutes = function () { m(-r) }, a.toggleMeridian = function () { m(720 * (n.getHours() < 12 ? 1 : -1)) } }]).directive("timepicker", function () { return { restrict: "EA", require: ["timepicker", "?^ngModel"], controller: "TimepickerController", replace: !0, scope: {}, templateUrl: "template/timepicker/timepicker.html", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f, b.find("input")) } } }), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) { function f(a) { for (var b in a)if (void 0 !== h.style[b])return a[b] } e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead."); var g = function (d, e, f) { f = f || {}; var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () { c.$apply(function () { d.unbind(i, j), h.resolve(d) }) }; return i && d.bind(i, j), b(function () { angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d) }), h.promise.cancel = function () { i && d.unbind(i, j), h.reject("Transition cancelled") }, h.promise }, h = document.createElement("trans"), i = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd", transition: "transitionend" }, j = { WebkitTransition: "webkitAnimationEnd", MozTransition: "animationend", OTransition: "oAnimationEnd", transition: "animationend" }; return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g }]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) { var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/; return { parse: function (c) { var d = c.match(b); if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".'); return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])} } } }]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) { var h = [9, 13, 27, 38, 40]; return { require: "ngModel", link: function (i, j, k, l) { var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new(); i.$on("$destroy", function () { x.$destroy() }); var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random()); j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y}); var z = angular.element("<div typeahead-popup></div>"); z.attr({ id: y, matches: "matches", active: "activeIdx", select: "select(activeIdx)", query: "query", position: "position" }), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl); var A = function () { x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1) }, B = function (a) { return y + "-option-" + a }; x.$watch("activeIdx", function (a) { 0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a)) }); var C = function (a) { var b = {$viewValue: a}; q(i, !0), c.when(w.source(i, b)).then(function (c) { var d = a === l.$viewValue; if (d && m)if (c && c.length > 0) { x.activeIdx = u ? 0 : -1, x.matches.length = 0; for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({ id: B(e), label: w.viewMapper(x, b), model: c[e] }); x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0) } else A(); d && q(i, !1) }, function () { A(), q(i, !1) }) }; A(), x.query = void 0; var D, E = function (a) { D = d(function () { C(a) }, o) }, F = function () { D && d.cancel(D) }; l.$parsers.unshift(function (a) { return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a) }), l.$formatters.push(function (a) { var b, c, d = {}; return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a) }), x.select = function (a) { var b, c, e = {}; e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, { $item: c, $model: b, $label: w.viewMapper(i, e) }), A(), d(function () { j[0].focus() }, 0, !1) }, j.bind("keydown", function (a) { 0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () { x.select(x.activeIdx) }) : 27 === a.which && (a.stopPropagation(), A(), x.$digest())) }), j.bind("blur", function () { m = !1 }); var G = function (a) { j[0] !== a.target && (A(), x.$digest()) }; e.bind("click", G), i.$on("$destroy", function () { e.unbind("click", G), t && H.remove(), z.remove() }); var H = a(z)(x); t ? e.find("body").append(H) : j.after(H) } } }]).directive("typeaheadPopup", function () { return { restrict: "EA", scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"}, replace: !0, templateUrl: "template/typeahead/typeahead-popup.html", link: function (a, b, c) { a.templateUrl = c.templateUrl, a.isOpen = function () { return a.matches.length > 0 }, a.isActive = function (b) { return a.active == b }, a.selectActive = function (b) { a.active = b }, a.selectMatch = function (b) { a.select({activeIdx: b}) } } } }).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) { return { restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) { var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html"; a(g).then(function (a) { b(a.trim())(d, function (a) { e.replaceWith(a) }) }) } } }]).filter("typeaheadHighlight", function () { function a(a) { return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") } return function (b, c) { return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b } }), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>') }]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) { a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">&times;</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n') }]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) { a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n') }]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) { a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n') }]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>') }]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n') }]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) { a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n') }]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) { a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n') }]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>') }]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>') }]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n') }]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n') }]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n') }]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>') }]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n') }]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) { a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>') }]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n') }]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n') }]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) { a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>') }]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n') }]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
/* * angular-ui-bootstrap * http://angular-ui.github.io/bootstrap/ * Version: 0.13.0 - 2015-05-02 * License: MIT */ angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) { return { link: function (b, c, d) { function e() { c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f) } function f() { c.removeClass("collapsing"), c.css({height: "auto"}) } function g() { c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h) } function h() { c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse") } b.$watch(d.collapse, function (a) { a ? g() : e() }) } } }]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) { this.groups = [], this.closeOthers = function (d) { var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers; e && angular.forEach(this.groups, function (a) { a !== d && (a.isOpen = !1) }) }, this.addGroup = function (a) { var b = this; this.groups.push(a), a.$on("$destroy", function () { b.removeGroup(a) }) }, this.removeGroup = function (a) { var b = this.groups.indexOf(a); -1 !== b && this.groups.splice(b, 1) } }]).directive("accordion", function () { return { restrict: "EA", controller: "AccordionController", transclude: !0, replace: !1, templateUrl: "template/accordion/accordion.html" } }).directive("accordionGroup", function () { return { require: "^accordion", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/accordion/accordion-group.html", scope: {heading: "@", isOpen: "=?", isDisabled: "=?"}, controller: function () { this.setHeading = function (a) { this.heading = a } }, link: function (a, b, c, d) { d.addGroup(a), a.$watch("isOpen", function (b) { b && d.closeOthers(a) }), a.toggleOpen = function () { a.isDisabled || (a.isOpen = !a.isOpen) } } } }).directive("accordionHeading", function () { return { restrict: "EA", transclude: !0, template: "", replace: !0, require: "^accordionGroup", link: function (a, b, c, d, e) { d.setHeading(e(a, angular.noop)) } } }).directive("accordionTransclude", function () { return { require: "^accordionGroup", link: function (a, b, c, d) { a.$watch(function () { return d[c.accordionTransclude] }, function (a) { a && (b.html(""), b.append(a)) }) } } }), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) { a.closeable = "close" in b, this.close = a.close }]).directive("alert", function () { return { restrict: "EA", controller: "AlertController", templateUrl: "template/alert/alert.html", transclude: !0, replace: !0, scope: {type: "@", close: "&"} } }).directive("dismissOnTimeout", ["$timeout", function (a) { return { require: "alert", link: function (b, c, d, e) { a(function () { e.close() }, parseInt(d.dismissOnTimeout, 10)) } } }]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () { return function (a, b, c) { b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) { b.html(a || "") }) } }), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", { activeClass: "active", toggleEvent: "click" }).controller("ButtonsController", ["buttonConfig", function (a) { this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click" }]).directive("btnRadio", function () { return { require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f.$render = function () { b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio))) }, b.bind(e.toggleEvent, function () { var d = b.hasClass(e.activeClass); (!d || angular.isDefined(c.uncheckable)) && a.$apply(function () { f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render() }) }) } } }).directive("btnCheckbox", function () { return { require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { function e() { return g(c.btnCheckboxTrue, !0) } function f() { return g(c.btnCheckboxFalse, !1) } function g(b, c) { var d = a.$eval(b); return angular.isDefined(d) ? d : c } var h = d[0], i = d[1]; i.$render = function () { b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e())) }, b.bind(h.toggleEvent, function () { a.$apply(function () { i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render() }) }) } } }), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) { function d(a) { if (angular.isUndefined(k[a].index))return k[a]; { var b; k.length } for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b] } function e() { f(); var c = +a.interval; !isNaN(c) && c > 0 && (h = b(g, c)) } function f() { h && (b.cancel(h), h = null) } function g() { var b = +a.interval; i && !isNaN(b) && b > 0 ? a.next() : a.pause() } var h, i, j = this, k = j.slides = a.slides = [], l = -1; j.currentSlide = null; var m = !1; j.select = a.select = function (b, d) { function f() { m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, { direction: d, active: !1 }), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () { a.$currentTransition = null })), j.currentSlide = b, l = g, e()) } var g = j.indexOfSlide(b); void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f() }, a.$on("$destroy", function () { m = !0 }), j.getCurrentIndex = function () { return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l }, j.indexOfSlide = function (a) { return angular.isDefined(a.index) ? +a.index : k.indexOf(a) }, a.next = function () { var b = (j.getCurrentIndex() + 1) % k.length; return a.$currentTransition ? void 0 : j.select(d(b), "next") }, a.prev = function () { var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1; return a.$currentTransition ? void 0 : j.select(d(b), "prev") }, a.isActive = function (a) { return j.currentSlide === a }, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () { i || (i = !0, e()) }, a.pause = function () { a.noPause || (i = !1, f()) }, j.addSlide = function (b, c) { b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1 }, j.removeSlide = function (a) { angular.isDefined(a.index) && k.sort(function (a, b) { return +a.index > +b.index }); var b = k.indexOf(a); k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l-- } }]).directive("carousel", [function () { return { restrict: "EA", transclude: !0, replace: !0, controller: "CarouselController", require: "carousel", templateUrl: "template/carousel/carousel.html", scope: {interval: "=", noTransition: "=", noPause: "="} } }]).directive("slide", function () { return { require: "^carousel", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/carousel/slide.html", scope: {active: "=?", index: "=?"}, link: function (a, b, c, d) { d.addSlide(a, b), a.$on("$destroy", function () { d.removeSlide(a) }), a.$watch("active", function (b) { b && d.select(a) }) } } }).animation(".item", ["$animate", function (a) { return { beforeAddClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return b.addClass(f), a.addClass(b, g).then(function () { e || b.removeClass(g + " " + f), d() }), function () { e = !0 } } d() }, beforeRemoveClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return a.addClass(b, g).then(function () { e || b.removeClass(g), d() }), function () { e = !0 } } d() } } }]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) { function c(a) { var c = [], d = a.split(""); return angular.forEach(f, function (b, e) { var f = a.indexOf(e); if (f > -1) { a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$"; for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$"; a = a.join(""), c.push({index: f, apply: b.apply}) } }), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")} } function d(a, b, c) { return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0 } var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g; this.parsers = {}; var f = { yyyy: { regex: "\\d{4}", apply: function (a) { this.year = +a } }, yy: { regex: "\\d{2}", apply: function (a) { this.year = +a + 2e3 } }, y: { regex: "\\d{1,4}", apply: function (a) { this.year = +a } }, MMMM: { regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.MONTH.indexOf(b) } }, MMM: { regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b) } }, MM: { regex: "0[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, M: { regex: "[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, dd: { regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, d: { regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")}, EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")}, HH: { regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, H: { regex: "1?[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, mm: { regex: "[0-5][0-9]", apply: function (a) { this.minutes = +a } }, m: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.minutes = +a } }, sss: { regex: "[0-9][0-9][0-9]", apply: function (a) { this.milliseconds = +a } }, ss: { regex: "[0-5][0-9]", apply: function (a) { this.seconds = +a } }, s: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.seconds = +a } } }; this.parse = function (b, f, g) { if (!angular.isString(b) || !f)return b; f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f)); var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i); if (k && k.length) { var l, m; l = g ? { year: g.getFullYear(), month: g.getMonth(), date: g.getDate(), hours: g.getHours(), minutes: g.getMinutes(), seconds: g.getSeconds(), milliseconds: g.getMilliseconds() } : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0}; for (var n = 1, o = k.length; o > n; n++) { var p = j[n - 1]; p.apply && p.apply.call(l, k[n]) } return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m } } }]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) { function c(a, c) { return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c] } function d(a) { return "static" === (c(a, "position") || "static") } var e = function (b) { for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent; return e || c }; return { position: function (b) { var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]); f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft); var g = b[0].getBoundingClientRect(); return { width: g.width || b.prop("offsetWidth"), height: g.height || b.prop("offsetHeight"), top: c.top - d.top, left: c.left - d.left } }, offset: function (c) { var d = c[0].getBoundingClientRect(); return { width: d.width || c.prop("offsetWidth"), height: d.height || c.prop("offsetHeight"), top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop), left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft) } }, positionElements: function (a, b, c, d) { var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center"; e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight"); var l = { center: function () { return e.left + e.width / 2 - f / 2 }, left: function () { return e.left }, right: function () { return e.left + e.width } }, m = { center: function () { return e.top + e.height / 2 - g / 2 }, top: function () { return e.top }, bottom: function () { return e.top + e.height } }; switch (j) { case"right": h = {top: m[k](), left: l[j]()}; break; case"left": h = {top: m[k](), left: e.left - f}; break; case"bottom": h = {top: m[j](), left: l[k]()}; break; default: h = {top: e.top - g, left: l[k]()} } return h } } }]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", { formatDay: "dd", formatMonth: "MMMM", formatYear: "yyyy", formatDayHeader: "EEE", formatDayTitle: "MMMM yyyy", formatMonthTitle: "yyyy", datepickerMode: "day", minMode: "day", maxMode: "year", showWeeks: !0, startingDay: 0, yearRange: 20, minDate: null, maxDate: null, shortcutPropagation: !1 }).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) { var i = this, j = {$setViewValue: angular.noop}; this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) { i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c] }), angular.forEach(["minDate", "maxDate"], function (d) { b[d] ? a.$parent.$watch(c(b[d]), function (a) { i[d] = a ? new Date(a) : null, i.refreshView() }) : i[d] = h[d] ? new Date(h[d]) : null }), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) { a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView()) })) : this.activeDate = new Date, a.isActive = function (b) { return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1 }, this.init = function (a) { j = a, j.$render = function () { i.render() } }, this.render = function () { if (j.$viewValue) { var a = new Date(j.$viewValue), b = !isNaN(a); b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b) } this.refreshView() }, this.refreshView = function () { if (this.element) { this._refreshView(); var a = j.$viewValue ? new Date(j.$viewValue) : null; j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a)) } }, this.createDateObject = function (a, b) { var c = j.$viewValue ? new Date(j.$viewValue) : null; return { date: a, label: g(a, b), selected: c && 0 === this.compare(a, c), disabled: this.isDisabled(a), current: 0 === this.compare(a, new Date), customClass: this.customClass(a) } }, this.isDisabled = function (c) { return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({ date: c, mode: a.datepickerMode }) }, this.customClass = function (b) { return a.customClass({date: b, mode: a.datepickerMode}) }, this.split = function (a, b) { for (var c = []; a.length > 0;)c.push(a.splice(0, b)); return c }, a.select = function (b) { if (a.datepickerMode === i.minMode) { var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0); c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render() } else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1] }, a.move = function (a) { var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0); i.activeDate.setFullYear(b, c, 1), i.refreshView() }, a.toggleMode = function (b) { b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b]) }, a.keys = { 13: "enter", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 37: "left", 38: "up", 39: "right", 40: "down" }; var k = function () { e(function () { i.element[0].focus() }, 0, !1) }; a.$on("datepicker.focus", k), a.keydown = function (b) { var c = a.keys[b.which]; if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) { if (i.isDisabled(i.activeDate))return; a.select(i.activeDate), k() } else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k()) } }]).directive("datepicker", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/datepicker.html", scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"}, require: ["datepicker", "?^ngModel"], controller: "DatepickerController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f) } } }).directive("daypicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/day.html", require: "^datepicker", link: function (b, c, d, e) { function f(a, b) { return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29 } function g(a, b) { var c = new Array(b), d = new Date(a), e = 0; for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1); return c } function h(a) { var b = new Date(a); b.setDate(b.getDate() + 4 - (b.getDay() || 7)); var c = b.getTime(); return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1 } b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c; var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; e._refreshView = function () { var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f); j > 0 && k.setDate(-j + 1); for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), { secondary: l[m].getMonth() !== d, uid: b.uniqueId + "-" + m }); b.labels = new Array(7); for (var n = 0; 7 > n; n++)b.labels[n] = { abbr: a(l[n].date, e.formatDayHeader), full: a(l[n].date, "EEEE") }; if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) { b.weekNumbers = []; for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date)) } }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getDate(); if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1); e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b) } else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth())); e.activeDate.setDate(b) }, e.refreshView() } } }]).directive("monthpicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/month.html", require: "^datepicker", link: function (b, c, d, e) { e.step = {years: 1}, e.element = c, e._refreshView = function () { for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f}); b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3) }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getMonth(); if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1); e.activeDate.setFullYear(c) } else"home" === a ? b = 0 : "end" === a && (b = 11); e.activeDate.setMonth(b) }, e.refreshView() } } }]).directive("yearpicker", ["dateFilter", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/year.html", require: "^datepicker", link: function (a, b, c, d) { function e(a) { return parseInt((a - 1) / f, 10) * f + 1 } var f = d.yearRange; d.step = {years: f}, d.element = b, d._refreshView = function () { for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c}); a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5) }, d.compare = function (a, b) { return a.getFullYear() - b.getFullYear() }, d.handleKeyDown = function (a) { var b = d.activeDate.getFullYear(); "left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b) }, d.refreshView() } } }]).constant("datepickerPopupConfig", { datepickerPopup: "yyyy-MM-dd", html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"}, currentText: "Today", clearText: "Clear", closeText: "Done", closeOnDateSelection: !0, appendToBody: !1, showButtonBar: !0 }).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) { return { restrict: "EA", require: "ngModel", scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"}, link: function (h, i, j, k) { function l(a) { return a.replace(/([A-Z])/g, function (a) { return "-" + a.toLowerCase() }) } function m(a) { if (angular.isNumber(a) && (a = new Date(a)), a) { if (angular.isDate(a) && !isNaN(a))return a; if (angular.isString(a)) { var b = f.parse(a, o, h.date) || new Date(a); return isNaN(b) ? void 0 : b } return void 0 } return null } function n(a, b) { var c = a || b; if (angular.isNumber(c) && (c = new Date(c)), c) { if (angular.isDate(c) && !isNaN(c))return !0; if (angular.isString(c)) { var d = f.parse(c, o) || new Date(c); return !isNaN(d) } return !1 } return !0 } var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody; h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) { return h[a + "Text"] || g[a + "Text"] }; var r = !1; if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) { var b = a || g.datepickerPopup; if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.") })), !o)throw new Error("datepickerPopup must have a date format specified."); if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats."); var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>"); s.attr({"ng-model": "date", "ng-change": "dateSelection()"}); var t = angular.element(s.children()[0]); if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) { var u = h.$parent.$eval(j.datepickerOptions); u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) { t.attr(l(b), a) }) } h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) { if (j[a]) { var c = b(j[a]); if (h.$parent.$watch(c, function (b) { h.watchData[a] = b }), t.attr(l(a), "watchData." + a), "datepickerMode" === a) { var d = c.assign; h.$watch("watchData." + a, function (a, b) { a !== b && d(h.$parent, a) }) } } }), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) { return h.date = a, a }) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) { return h.date = a, k.$isEmpty(a) ? a : e(a, o) })), h.dateSelection = function (a) { angular.isDefined(a) && (h.date = a); var b = h.date ? e(h.date, o) : ""; i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus()) }, k.$viewChangeListeners.push(function () { h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue) }); var v = function (a) { h.isOpen && a.target !== i[0] && h.$apply(function () { h.isOpen = !1 }) }, w = function (a) { h.keydown(a) }; i.bind("keydown", w), h.keydown = function (a) { 27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0) }, h.$watch("isOpen", function (a) { a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v) }), h.select = function (a) { if ("today" === a) { var b = new Date; angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0)) } h.dateSelection(a) }, h.close = function () { h.isOpen = !1, i[0].focus() }; var x = a(s)(h); s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () { x.remove(), i.unbind("keydown", w), c.unbind("click", v) }) } } }]).directive("datepickerPopupWrap", function () { return { restrict: "EA", replace: !0, transclude: !0, templateUrl: "template/datepicker/popup.html", link: function (a, b) { b.bind("click", function (a) { a.preventDefault(), a.stopPropagation() }) } } }), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) { var c = null; this.open = function (b) { c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b }, this.close = function (b) { c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e)) }; var d = function (a) { if (c && (!a || "disabled" !== c.getAutoClose())) { var d = c.getToggleElement(); if (!(a && d && d[0].contains(a.target))) { var e = c.getElement(); a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply()) } } }, e = function (a) { 27 === a.which && (c.focusToggleElement(), d()) } }]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) { var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1; this.init = function (d) { j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) { k.isOpen = !!a })), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () { j.dropdownMenu.remove() })) }, this.toggle = function (a) { return k.isOpen = arguments.length ? !!a : !k.isOpen }, this.isOpen = function () { return k.isOpen }, k.getToggleElement = function () { return j.toggleElement }, k.getAutoClose = function () { return b.autoClose || "always" }, k.getElement = function () { return j.$element }, k.focusToggleElement = function () { j.toggleElement && j.toggleElement[0].focus() }, k.$watch("isOpen", function (b, c) { if (o && j.dropdownMenu) { var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0); j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"}) } f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b}) }), a.$on("$locationChangeSuccess", function () { k.isOpen = !1 }), a.$on("$destroy", function () { k.$destroy() }) }]).directive("dropdown", function () { return { controller: "DropdownController", link: function (a, b, c, d) { d.init(b) } } }).directive("dropdownMenu", function () { return { restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) { d && (d.dropdownMenu = b) } } }).directive("dropdownToggle", function () { return { require: "?^dropdown", link: function (a, b, c, d) { if (d) { d.toggleElement = b; var e = function (e) { e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () { d.toggle() }) }; b.bind("click", e), b.attr({ "aria-haspopup": !0, "aria-expanded": !1 }), a.$watch(d.isOpen, function (a) { b.attr("aria-expanded", !!a) }), a.$on("$destroy", function () { b.unbind("click", e) }) } } } }), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () { return { createNew: function () { var a = []; return { add: function (b, c) { a.push({key: b, value: c}) }, get: function (b) { for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c] }, keys: function () { for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key); return b }, top: function () { return a[a.length - 1] }, remove: function (b) { for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) { c = d; break } return a.splice(c, 1)[0] }, removeTop: function () { return a.splice(a.length - 1, 1)[0] }, length: function () { return a.length } } } } }).directive("modalBackdrop", ["$timeout", function (a) { function b(b) { b.animate = !1, a(function () { b.animate = !0 }) } return { restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) { return a.addClass(c.backdropClass), b } } }]).directive("modalWindow", ["$modalStack", "$q", function (a, b) { return { restrict: "EA", scope: {index: "@", animate: "="}, replace: !0, transclude: !0, templateUrl: function (a, b) { return b.templateUrl || "template/modal/window.html" }, link: function (c, d, e) { d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) { var c = a.getTop(); c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click")) }, c.$isRendered = !0; var f = b.defer(); e.$observe("modalRender", function (a) { "true" == a && f.resolve() }), f.promise.then(function () { c.animate = !0; var b = d[0].querySelectorAll("[autofocus]"); b.length ? b[0].focus() : d[0].focus(); var e = a.getTop(); e && a.modalRendered(e.key) }) } } }]).directive("modalAnimationClass", [function () { return { compile: function (a, b) { b.modalAnimation && a.addClass(b.modalAnimationClass) } } }]).directive("modalTransclude", function () { return { link: function (a, b, c, d, e) { e(a.$parent, function (a) { b.empty(), b.append(a) }) } } }).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) { function g() { for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c); return a } function h(a) { var b = c.find("body").eq(0), d = o.get(a).value; o.remove(a), j(d.modalDomEl, d.modalScope, function () { b.toggleClass(n, o.length() > 0), i() }) } function i() { if (l && -1 == g()) { var a = m; j(l, m, function () { a = null }), l = void 0, m = void 0 } } function j(c, d, f) { function g() { g.done || (g.done = !0, c.remove(), d.$destroy(), f && f()) } d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () { e.$evalAsync(g) }) : b(g) } function k(a, b, c) { return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented } var l, m, n = "modal-open", o = f.createNew(), p = {}; return e.$watch(g, function (a) { m && (m.index = a) }), c.bind("keydown", function (a) { var b; 27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () { p.dismiss(b.key, "escape key press") }))) }), p.open = function (a, b) { var f = c[0].activeElement; o.add(a, { deferred: b.deferred, renderDeferred: b.renderDeferred, modalScope: b.scope, backdrop: b.backdrop, keyboard: b.keyboard }); var h = c.find("body").eq(0), i = g(); if (i >= 0 && !l) { m = e.$new(!0), m.index = i; var j = angular.element('<div modal-backdrop="modal-backdrop"></div>'); j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l) } var k = angular.element('<div modal-window="modal-window"></div>'); k.attr({ "template-url": b.windowTemplateUrl, "window-class": b.windowClass, size: b.size, index: o.length() - 1, animate: "animate" }).html(b.content), b.animation && k.attr("modal-animation", "true"); var p = d(k)(b.scope); o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n) }, p.close = function (a, b) { var c = o.get(a); return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismiss = function (a, b) { var c = o.get(a); return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismissAll = function (a) { for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop() }, p.getTop = function () { return o.top() }, p.modalRendered = function (a) { var b = o.get(a); b && b.value.renderDeferred.resolve() }, p }]).provider("$modal", function () { var a = { options: {animation: !0, backdrop: !0, keyboard: !0}, $get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) { function h(a) { return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl) } function i(a) { var c = []; return angular.forEach(a, function (a) { (angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a))) }), c } var j = {}; return j.open = function (b) { var e = d.defer(), j = d.defer(), k = d.defer(), l = { result: e.promise, opened: j.promise, rendered: k.promise, close: function (a) { return g.close(l, a) }, dismiss: function (a) { return g.dismiss(l, a) } }; if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required."); var m = d.all([h(b)].concat(i(b.resolve))); return m.then(function (a) { var d = (b.scope || c).$new(); d.$close = l.close, d.$dismiss = l.dismiss; var h, i = {}, j = 1; b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) { i[c] = a[j++] }), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, { scope: d, deferred: e, renderDeferred: k, content: a[0], animation: b.animation, backdrop: b.backdrop, keyboard: b.keyboard, backdropClass: b.backdropClass, windowClass: b.windowClass, windowTemplateUrl: b.windowTemplateUrl, size: b.size }) }, function (a) { e.reject(a) }), m.then(function () { j.resolve(!0) }, function (a) { j.reject(a) }), l }, j }] }; return a }), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) { var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop; this.init = function (g, h) { e = g, this.config = h, e.$render = function () { d.render() }, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) { d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages() }) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () { a.totalPages = d.calculateTotalPages() }), a.$watch("totalPages", function (b) { f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render() }) }, this.calculateTotalPages = function () { var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage); return Math.max(b || 0, 1) }, this.render = function () { a.page = parseInt(e.$viewValue, 10) || 1 }, a.selectPage = function (b, c) { a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render()) }, a.getText = function (b) { return a[b + "Text"] || d.config[b + "Text"] }, a.noPrevious = function () { return 1 === a.page }, a.noNext = function () { return a.page === a.totalPages } }]).constant("paginationConfig", { itemsPerPage: 10, boundaryLinks: !1, directionLinks: !0, firstText: "First", previousText: "Previous", nextText: "Next", lastText: "Last", rotate: !0 }).directive("pagination", ["$parse", "paginationConfig", function (a, b) { return { restrict: "EA", scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"}, require: ["pagination", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pagination.html", replace: !0, link: function (c, d, e, f) { function g(a, b, c) { return {number: a, text: b, active: c} } function h(a, b) { var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k; f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b))); for (var h = d; e >= h; h++) { var i = g(h, h, h === a); c.push(i) } if (f && !l) { if (d > 1) { var j = g(d - 1, "...", !1); c.unshift(j) } if (b > e) { var m = g(e + 1, "...", !1); c.push(m) } } return c } var i = f[0], j = f[1]; if (j) { var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate; c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) { k = parseInt(a, 10), i.render() }); var m = i.render; i.render = function () { m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages)) } } } } }]).constant("pagerConfig", { itemsPerPage: 10, previousText: "« Previous", nextText: "Next »", align: !0 }).directive("pager", ["pagerConfig", function (a) { return { restrict: "EA", scope: {totalItems: "=", previousText: "@", nextText: "@"}, require: ["pager", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pager.html", replace: !0, link: function (b, c, d, e) { var f = e[0], g = e[1]; g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a)) } } }]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () { function a(a) { var b = /[A-Z]/g, c = "-"; return a.replace(b, function (a, b) { return (b ? c : "") + a.toLowerCase() }) } var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = { mouseenter: "mouseleave", click: "click", focus: "blur" }, d = {}; this.options = function (a) { angular.extend(d, a) }, this.setTriggers = function (a) { angular.extend(c, a) }, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) { return function (e, k, l, m) { function n(a) { var b = a || m.trigger || l, d = c[b] || b; return {show: b, hide: d} } m = angular.extend({}, b, d, m); var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>'; return { restrict: "EA", compile: function () { var a = f(r); return function (b, c, d) { function f() { E.isOpen ? l() : j() } function j() { (!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) { a() })) : o()()) } function l() { b.$apply(function () { p() }) } function o() { return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({ top: 0, left: 0, display: "block" }), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop } function p() { E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r() } function q() { x && r(), y = E.$new(), x = a(y, function (a) { B ? h.find("body").append(a) : c.after(a) }), y.$watch(function () { g(F, 0, !1) }), m.useContentExp && y.$watch("contentExp()", function (a) { !a && E.isOpen && p() }) } function r() { z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null) } function s() { t(), u(), v() } function t() { E.popupClass = d[k + "Class"] } function u() { var a = d[k + "Placement"]; E.placement = angular.isDefined(a) ? a : m.placement } function v() { var a = d[k + "PopupDelay"], b = parseInt(a, 10); E.popupDelay = isNaN(b) ? m.popupDelay : b } function w() { var a = d[k + "Trigger"]; G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l)) } var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () { if (x) { var a = i.positionElements(c, x, E.placement, B); a.top += "px", a.left += "px", x.css(a) } }; E.origScope = b, E.isOpen = !1, E.contentExp = function () { return b.$eval(d[e]) }, m.useContentExp || d.$observe(e, function (a) { E.content = a, !a && E.isOpen && p() }), d.$observe("disabled", function (a) { a && E.isOpen && p() }), d.$observe(k + "Title", function (a) { E.title = a }); var G = function () { c.unbind(C.show, j), c.unbind(C.hide, l) }; w(); var H = b.$eval(d[k + "Animation"]); E.animation = angular.isDefined(H) ? !!H : m.animation; var I = b.$eval(d[k + "AppendToBody"]); B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () { E.isOpen && p() }), b.$on("$destroy", function () { g.cancel(z), g.cancel(A), G(), r(), E = null }) } } } } }] }).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) { return { link: function (e, f, g) { var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () { i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () { i = null }), i = j, j = null) }; e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) { var g = ++l; b ? (d(b, !0).then(function (d) { if (g === l) { var e = k.$new(), i = d, n = c(i)(e, function (b) { m(), a.enter(b, f) }); h = e, j = n, h.$emit("$includeContentLoaded", b) } }, function () { g === l && (m(), e.$emit("$includeContentError", b)) }), e.$emit("$includeContentRequested", b)) : m() }), e.$on("$destroy", m) } } }]).directive("tooltipClasses", function () { return { restrict: "A", link: function (a, b, c) { a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass) } } }).directive("tooltipPopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-popup.html" } }).directive("tooltip", ["$tooltip", function (a) { return a("tooltip", "tooltip", "mouseenter") }]).directive("tooltipTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"}, templateUrl: "template/tooltip/tooltip-template-popup.html" } }).directive("tooltipTemplate", ["$tooltip", function (a) { return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlPopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-popup.html" } }).directive("tooltipHtml", ["$tooltip", function (a) { return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlUnsafePopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html" } }).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) { return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter") }]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: { title: "@", contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&" }, templateUrl: "template/popover/popover-template.html" } }).directive("popoverTemplate", ["$tooltip", function (a) { return a("popoverTemplate", "popover", "click", {useContentExp: !0}) }]).directive("popoverPopup", function () { return { restrict: "EA", replace: !0, scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/popover/popover.html" } }).directive("popover", ["$tooltip", function (a) { return a("popover", "popover", "click") }]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", { animate: !0, max: 100 }).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) { var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate; this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) { e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) { b.percent = +(100 * c / a.max).toFixed(2) }), b.$on("$destroy", function () { c = null, d.removeBar(b) }) }, this.removeBar = function (a) { this.bars.splice(this.bars.indexOf(a), 1) } }]).directive("progress", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", require: "progress", scope: {}, templateUrl: "template/progressbar/progress.html" } }).directive("bar", function () { return { restrict: "EA", replace: !0, transclude: !0, require: "^progress", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/bar.html", link: function (a, b, c, d) { d.addBar(a, b) } } }).directive("progressbar", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/progressbar.html", link: function (a, b, c, d) { d.addBar(a, angular.element(b.children()[0])) } } }), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", { max: 5, stateOn: null, stateOff: null }).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) { var d = {$setViewValue: angular.noop}; this.init = function (e) { d = e, d.$render = this.render, d.$formatters.push(function (a) { return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a }), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff; var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max); a.range = this.buildTemplateObjects(f) }, this.buildTemplateObjects = function (a) { for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, { stateOn: this.stateOn, stateOff: this.stateOff }, a[b]); return a }, a.rate = function (b) { !a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render()) }, a.enter = function (b) { a.readonly || (a.value = b), a.onHover({value: b}) }, a.reset = function () { a.value = d.$viewValue, a.onLeave() }, a.onKeydown = function (b) { /(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1))) }, this.render = function () { a.value = d.$viewValue } }]).directive("rating", function () { return { restrict: "EA", require: ["rating", "ngModel"], scope: {readonly: "=?", onHover: "&", onLeave: "&"}, controller: "RatingController", templateUrl: "template/rating/rating.html", replace: !0, link: function (a, b, c, d) { var e = d[0], f = d[1]; e.init(f) } } }), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) { var b = this, c = b.tabs = a.tabs = []; b.select = function (a) { angular.forEach(c, function (b) { b.active && b !== a && (b.active = !1, b.onDeselect()) }), a.active = !0, a.onSelect() }, b.addTab = function (a) { c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1 }, b.removeTab = function (a) { var e = c.indexOf(a); if (a.active && c.length > 1 && !d) { var f = e == c.length - 1 ? e - 1 : e + 1; b.select(c[f]) } c.splice(e, 1) }; var d; a.$on("$destroy", function () { d = !0 }) }]).directive("tabset", function () { return { restrict: "EA", transclude: !0, replace: !0, scope: {type: "@"}, controller: "TabsetController", templateUrl: "template/tabs/tabset.html", link: function (a, b, c) { a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1 } } }).directive("tab", ["$parse", "$log", function (a, b) { return { require: "^tabset", restrict: "EA", replace: !0, templateUrl: "template/tabs/tab.html", transclude: !0, scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"}, controller: function () { }, compile: function (c, d, e) { return function (c, d, f, g) { c.$watch("active", function (a) { a && g.select(c) }), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) { c.disabled = !!a }), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) { c.disabled = !!a })), c.select = function () { c.disabled || (c.active = !0) }, g.addTab(c), c.$on("$destroy", function () { g.removeTab(c) }), c.$transcludeFn = e } } } }]).directive("tabHeadingTransclude", [function () { return { restrict: "A", require: "^tab", link: function (a, b) { a.$watch("headingElement", function (a) { a && (b.html(""), b.append(a)) }) } } }]).directive("tabContentTransclude", function () { function a(a) { return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase()) } return { restrict: "A", require: "^tabset", link: function (b, c, d) { var e = b.$eval(d.tabContentTransclude); e.$transcludeFn(e.$parent, function (b) { angular.forEach(b, function (b) { a(b) ? e.headingElement = b : c.append(b) }) }) } } }), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", { hourStep: 1, minuteStep: 1, showMeridian: !0, meridians: null, readonlyInput: !1, mousewheel: !0, arrowkeys: !0 }).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) { function g() { var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b; return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0 } function h() { var b = parseInt(a.minutes, 10); return b >= 0 && 60 > b ? b : void 0 } function i(a) { return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString() } function j(a) { k(), o.$setViewValue(new Date(n)), l(a) } function k() { o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1 } function l(b) { var c = n.getHours(), d = n.getMinutes(); a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1] } function m(a) { var b = new Date(n.getTime() + 6e4 * a); n.setHours(b.getHours(), b.getMinutes()), j() } var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS; this.init = function (c, d) { o = c, o.$render = this.render, o.$formatters.unshift(function (a) { return a ? new Date(a) : null }); var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel; h && this.setupMousewheelEvents(e, g); var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys; i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g) }; var q = f.hourStep; b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) { q = parseInt(a, 10) }); var r = f.minuteStep; b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) { r = parseInt(a, 10) }), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) { if (a.showMeridian = !!b, o.$error.time) { var c = g(), d = h(); angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j()) } else l() }), this.setupMousewheelEvents = function (b, c) { var d = function (a) { a.originalEvent && (a = a.originalEvent); var b = a.wheelDelta ? a.wheelDelta : -a.deltaY; return a.detail || b > 0 }; b.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault() }), c.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault() }) }, this.setupArrowkeyEvents = function (b, c) { b.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply()) }), c.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply()) }) }, this.setupInputEvents = function (b, c) { if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop); var d = function (b, c) { o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c) }; a.updateHours = function () { var a = g(); angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0) }, b.bind("blur", function () { !a.invalidHours && a.hours < 10 && a.$apply(function () { a.hours = i(a.hours) }) }), a.updateMinutes = function () { var a = h(); angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0) }, c.bind("blur", function () { !a.invalidMinutes && a.minutes < 10 && a.$apply(function () { a.minutes = i(a.minutes) }) }) }, this.render = function () { var a = o.$viewValue; isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l()) }, a.incrementHours = function () { m(60 * q) }, a.decrementHours = function () { m(60 * -q) }, a.incrementMinutes = function () { m(r) }, a.decrementMinutes = function () { m(-r) }, a.toggleMeridian = function () { m(720 * (n.getHours() < 12 ? 1 : -1)) } }]).directive("timepicker", function () { return { restrict: "EA", require: ["timepicker", "?^ngModel"], controller: "TimepickerController", replace: !0, scope: {}, templateUrl: "template/timepicker/timepicker.html", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f, b.find("input")) } } }), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) { function f(a) { for (var b in a)if (void 0 !== h.style[b])return a[b] } e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead."); var g = function (d, e, f) { f = f || {}; var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () { c.$apply(function () { d.unbind(i, j), h.resolve(d) }) }; return i && d.bind(i, j), b(function () { angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d) }), h.promise.cancel = function () { i && d.unbind(i, j), h.reject("Transition cancelled") }, h.promise }, h = document.createElement("trans"), i = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd", transition: "transitionend" }, j = { WebkitTransition: "webkitAnimationEnd", MozTransition: "animationend", OTransition: "oAnimationEnd", transition: "animationend" }; return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g }]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) { var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/; return { parse: function (c) { var d = c.match(b); if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".'); return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])} } } }]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) { var h = [9, 13, 27, 38, 40]; return { require: "ngModel", link: function (i, j, k, l) { var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new(); i.$on("$destroy", function () { x.$destroy() }); var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random()); j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y}); var z = angular.element("<div typeahead-popup></div>"); z.attr({ id: y, matches: "matches", active: "activeIdx", select: "select(activeIdx)", query: "query", position: "position" }), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl); var A = function () { x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1) }, B = function (a) { return y + "-option-" + a }; x.$watch("activeIdx", function (a) { 0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a)) }); var C = function (a) { var b = {$viewValue: a}; q(i, !0), c.when(w.source(i, b)).then(function (c) { var d = a === l.$viewValue; if (d && m)if (c && c.length > 0) { x.activeIdx = u ? 0 : -1, x.matches.length = 0; for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({ id: B(e), label: w.viewMapper(x, b), model: c[e] }); x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0) } else A(); d && q(i, !1) }, function () { A(), q(i, !1) }) }; A(), x.query = void 0; var D, E = function (a) { D = d(function () { C(a) }, o) }, F = function () { D && d.cancel(D) }; l.$parsers.unshift(function (a) { return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a) }), l.$formatters.push(function (a) { var b, c, d = {}; return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a) }), x.select = function (a) { var b, c, e = {}; e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, { $item: c, $model: b, $label: w.viewMapper(i, e) }), A(), d(function () { j[0].focus() }, 0, !1) }, j.bind("keydown", function (a) { 0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () { x.select(x.activeIdx) }) : 27 === a.which && (a.stopPropagation(), A(), x.$digest())) }), j.bind("blur", function () { m = !1 }); var G = function (a) { j[0] !== a.target && (A(), x.$digest()) }; e.bind("click", G), i.$on("$destroy", function () { e.unbind("click", G), t && H.remove(), z.remove() }); var H = a(z)(x); t ? e.find("body").append(H) : j.after(H) } } }]).directive("typeaheadPopup", function () { return { restrict: "EA", scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"}, replace: !0, templateUrl: "template/typeahead/typeahead-popup.html", link: function (a, b, c) { a.templateUrl = c.templateUrl, a.isOpen = function () { return a.matches.length > 0 }, a.isActive = function (b) { return a.active == b }, a.selectActive = function (b) { a.active = b }, a.selectMatch = function (b) { a.select({activeIdx: b}) } } } }).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) { return { restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) { var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html"; a(g).then(function (a) { b(a.trim())(d, function (a) { e.replaceWith(a) }) }) } } }]).filter("typeaheadHighlight", function () { function a(a) { return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") } return function (b, c) { return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b } }), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>') }]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) { a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">&times;</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n') }]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) { a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n') }]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) { a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n') }]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>') }]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n') }]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) { a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n') }]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) { a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n') }]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>') }]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>') }]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n') }]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n') }]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n') }]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>') }]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n') }]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) { a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>') }]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n') }]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n') }]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) { a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>') }]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n') }]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceLockController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.entity.vo.LockInfo; import com.ctrip.framework.apollo.portal.service.NamespaceLockService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @RestController public class NamespaceLockController { private final NamespaceLockService namespaceLockService; public NamespaceLockController(final NamespaceLockService namespaceLockService) { this.namespaceLockService = namespaceLockService; } @Deprecated @GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public NamespaceLockDTO getNamespaceLock(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { return namespaceLockService.getNamespaceLock(appId, Env.valueOf(env), clusterName, namespaceName); } @GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/lock-info") public LockInfo getNamespaceLockInfo(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { return namespaceLockService.getNamespaceLockInfo(appId, Env.valueOf(env), clusterName, namespaceName); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.entity.vo.LockInfo; import com.ctrip.framework.apollo.portal.service.NamespaceLockService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @RestController public class NamespaceLockController { private final NamespaceLockService namespaceLockService; public NamespaceLockController(final NamespaceLockService namespaceLockService) { this.namespaceLockService = namespaceLockService; } @Deprecated @GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public NamespaceLockDTO getNamespaceLock(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { return namespaceLockService.getNamespaceLock(appId, Env.valueOf(env), clusterName, namespaceName); } @GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/lock-info") public LockInfo getNamespaceLockInfo(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName) { return namespaceLockService.getNamespaceLockInfo(appId, Env.valueOf(env), clusterName, namespaceName); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.metaservice.controller; import static org.junit.Assert.*; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.core.ServiceNameConsts; import com.ctrip.framework.apollo.core.dto.ServiceDTO; import com.ctrip.framework.apollo.metaservice.service.DiscoveryService; import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ServiceControllerTest { @Mock private DiscoveryService discoveryService; @Mock private List<ServiceDTO> someServices; private ServiceController serviceController; @Before public void setUp() throws Exception { serviceController = new ServiceController(discoveryService); } @Test public void testGetMetaService() { assertTrue(serviceController.getMetaService().isEmpty()); } @Test public void testGetConfigService() { String someAppId = "someAppId"; String someClientIp = "someClientIp"; when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getConfigService(someAppId, someClientIp)); } @Test public void testGetAdminService() { when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_ADMINSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getAdminService()); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.metaservice.controller; import static org.junit.Assert.*; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.core.ServiceNameConsts; import com.ctrip.framework.apollo.core.dto.ServiceDTO; import com.ctrip.framework.apollo.metaservice.service.DiscoveryService; import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ServiceControllerTest { @Mock private DiscoveryService discoveryService; @Mock private List<ServiceDTO> someServices; private ServiceController serviceController; @Before public void setUp() throws Exception { serviceController = new ServiceController(discoveryService); } @Test public void testGetMetaService() { assertTrue(serviceController.getMetaService().isEmpty()); } @Test public void testGetConfigService() { String someAppId = "someAppId"; String someClientIp = "someClientIp"; when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getConfigService(someAppId, someClientIp)); } @Test public void testGetAdminService() { when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_ADMINSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getAdminService()); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/ApolloConfigRegistrarHelper.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring.spi; import com.ctrip.framework.apollo.core.spi.Ordered; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.EnvironmentAware; import org.springframework.core.type.AnnotationMetadata; public interface ApolloConfigRegistrarHelper extends Ordered, EnvironmentAware { void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring.spi; import com.ctrip.framework.apollo.core.spi.Ordered; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.EnvironmentAware; import org.springframework.core.type.AnnotationMetadata; public interface ApolloConfigRegistrarHelper extends Ordered, EnvironmentAware { void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry); }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/faq/faq.md
## 1. Apollo是什么？ Apollo（阿波罗）是携程框架部门研发的配置管理平台，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性。 更多介绍，可以参考[Apollo配置中心介绍](zh/design/apollo-introduction) ## 2. Cluster是什么？ 一个应用下不同实例的分组，比如典型的可以按照数据中心分，把A机房的应用实例分为一个集群，把B机房的应用实例分为另一个集群。 ## 3. Namespace是什么？ 一个应用下不同配置的分组。 请参考[Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace) ## 4. 我想要接入Apollo，该如何操作？ 请参考[Apollo使用指南](zh/usage/apollo-user-guide) ## 5. 我的应用需要不同机房的配置不一样，Apollo是否能支持？ Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`三、集群独立配置说明` ## 6. 我有多个应用需要使用同一份配置，Apollo是否能支持？ Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`四、多个AppId使用同一份配置` ## 7. Apollo是否支持查看权限控制或者配置加密？ 从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。 这里的项目成员是指： 1. 项目的管理员 2. 具备该私有Namespace在该环境下的修改或发布权限 配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。 ![configView.memberOnly.envs](https://user-images.githubusercontent.com/837658/46456519-c155e100-c7e1-11e8-969b-8f332379fa29.png) 配置加密可以参考[spring-boot-encrypt demo项目](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-encrypt) ## 8. 如果有多个config server，打包时如何配置meta server地址？ 有多台meta server可以通过nginx反向代理，通过一个域名代理多个meta server实现ha。 ## 9. Apollo相比于Spring Cloud Config有什么优势？ Spring Cloud Config的精妙之处在于它的配置存储于Git，这就天然的把配置的修改、权限、版本等问题隔离在外。通过这个设计使得Spring Cloud Config整体很简单，不过也带来了一些不便之处。 下面尝试做一个简单的小结： | 功能点 | Apollo | Spring Cloud Config | 备注 | |------------------|--------------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------| | 配置界面 | 一个界面管理不同环境、不同集群配置 | 无，需要通过git操作 | | | 配置生效时间 | 实时 | 重启生效，或手动refresh生效 | Spring Cloud Config需要通过Git webhook，加上额外的消息队列才能支持实时生效 | | 版本管理 | 界面上直接提供发布历史和回滚按钮 | 无，需要通过git操作 | | | 灰度发布 | 支持 | 不支持 | | | 授权、审核、审计 | 界面上直接支持，而且支持修改、发布权限分离 | 需要通过git仓库设置，且不支持修改、发布权限分离 | | | 实例配置监控 | 可以方便的看到当前哪些客户端在使用哪些配置 | 不支持 | | | 配置获取性能 | 快，通过数据库访问，还有缓存支持 | 较慢，需要从git clone repository，然后从文件系统读取 | | | 客户端支持 | 原生支持所有Java和.Net应用，提供API支持其它语言应用，同时也支持Spring annotation获取配置 | 支持Spring应用，提供annotation获取配置 | Apollo的适用范围更广一些 | ## 10. Apollo和Disconf相比有什么优点？ 由于我们自己并非Disconf的资深用户，所以无法主观地给出评价。 不过之前Apollo技术支持群中的热心网友[@Krast](https://github.com/krast)做了一个[开源配置中心对比矩阵](https://github.com/ctripcorp/apollo/files/983064/default.pdf)，可以参考一下。
## 1. Apollo是什么？ Apollo（阿波罗）是携程框架部门研发的配置管理平台，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性。 更多介绍，可以参考[Apollo配置中心介绍](zh/design/apollo-introduction) ## 2. Cluster是什么？ 一个应用下不同实例的分组，比如典型的可以按照数据中心分，把A机房的应用实例分为一个集群，把B机房的应用实例分为另一个集群。 ## 3. Namespace是什么？ 一个应用下不同配置的分组。 请参考[Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace) ## 4. 我想要接入Apollo，该如何操作？ 请参考[Apollo使用指南](zh/usage/apollo-user-guide) ## 5. 我的应用需要不同机房的配置不一样，Apollo是否能支持？ Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`三、集群独立配置说明` ## 6. 我有多个应用需要使用同一份配置，Apollo是否能支持？ Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`四、多个AppId使用同一份配置` ## 7. Apollo是否支持查看权限控制或者配置加密？ 从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。 这里的项目成员是指： 1. 项目的管理员 2. 具备该私有Namespace在该环境下的修改或发布权限 配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。 ![configView.memberOnly.envs](https://user-images.githubusercontent.com/837658/46456519-c155e100-c7e1-11e8-969b-8f332379fa29.png) 配置加密可以参考[spring-boot-encrypt demo项目](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-encrypt) ## 8. 如果有多个config server，打包时如何配置meta server地址？ 有多台meta server可以通过nginx反向代理，通过一个域名代理多个meta server实现ha。 ## 9. Apollo相比于Spring Cloud Config有什么优势？ Spring Cloud Config的精妙之处在于它的配置存储于Git，这就天然的把配置的修改、权限、版本等问题隔离在外。通过这个设计使得Spring Cloud Config整体很简单，不过也带来了一些不便之处。 下面尝试做一个简单的小结： | 功能点 | Apollo | Spring Cloud Config | 备注 | |------------------|--------------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------| | 配置界面 | 一个界面管理不同环境、不同集群配置 | 无，需要通过git操作 | | | 配置生效时间 | 实时 | 重启生效，或手动refresh生效 | Spring Cloud Config需要通过Git webhook，加上额外的消息队列才能支持实时生效 | | 版本管理 | 界面上直接提供发布历史和回滚按钮 | 无，需要通过git操作 | | | 灰度发布 | 支持 | 不支持 | | | 授权、审核、审计 | 界面上直接支持，而且支持修改、发布权限分离 | 需要通过git仓库设置，且不支持修改、发布权限分离 | | | 实例配置监控 | 可以方便的看到当前哪些客户端在使用哪些配置 | 不支持 | | | 配置获取性能 | 快，通过数据库访问，还有缓存支持 | 较慢，需要从git clone repository，然后从文件系统读取 | | | 客户端支持 | 原生支持所有Java和.Net应用，提供API支持其它语言应用，同时也支持Spring annotation获取配置 | 支持Spring应用，提供annotation获取配置 | Apollo的适用范围更广一些 | ## 10. Apollo和Disconf相比有什么优点？ 由于我们自己并非Disconf的资深用户，所以无法主观地给出评价。 不过之前Apollo技术支持群中的热心网友[@Krast](https://github.com/krast)做了一个[开源配置中心对比矩阵](https://github.com/ctripcorp/apollo/files/983064/default.pdf)，可以参考一下。
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/item-modal.html
<form id="itemModal" class="modal fade" valdr-type="Item" name="itemForm" ng-submit="doItem()"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title"> <span ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch"> {{'Component.ConfigItem.Title' | translate }} <small class="text-info">{{'Component.ConfigItem.TitleTips' | translate }}</small> </span> <span ng-show="item.tableViewOperType == 'create' && toOperationNamespace.isBranch"> {{'Component.ConfigItem.AddGrayscaleItem' | translate }}</span> <span ng-show="item.tableViewOperType == 'update'"> {{'Component.ConfigItem.ModifyItem' | translate }}</span> </h4> </div> <div class="modal-body form-horizontal"> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield ng-show="item.tableViewOperType == 'create'"></apollorequiredfield> {{'Component.ConfigItem.ItemKey' | translate }} </label> <div class="col-sm-10" valdr-form-group> <input type="text" name="key" class="form-control" ng-model="item.key" tabindex="1" ng-required="true" ng-disabled="item.tableViewOperType != 'create'" /> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemValue' | translate }}</label> <div class="col-sm-10" valdr-form-group> <textarea id="valueEditor" name="value" class="form-control" rows="6" tabindex="2" ng-required="false" ng-model="item.value"> </textarea> {{'Component.ConfigItem.ItemValueTips' | translate }} <a ng-click="showHiddenChars()">{{'Component.ConfigItem.ItemValueShowDetection' | translate }}</a> <br> <div class="bg-info" ng-show="showHiddenCharsContext && hiddenCharCounter == 0"> {{'Component.ConfigItem.ItemValueNotHiddenChars' | translate }}</div> <div class="bg-info" ng-bind-html="valueWithHiddenChars" ng-show="showHiddenCharsContext && hiddenCharCounter > 0"></div> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemComment' | translate }}</label> <div class="col-sm-10" valdr-form-group> <textarea class="form-control" name="comment" ng-model="item.comment" tabindex="3" rows="2"> </textarea> </div> </div> <div class="form-group" ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Component.ConfigItem.ChooseCluster' | translate }} </label> <div class="col-sm-10"> <apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="false" apollo-default-checked-env="env" apollo-default-checked-cluster="cluster" apollo-select="collectSelectedClusters"> </apolloclusterselector> </div> </div> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal"> {{'Common.Cancel' | translate }} </button> <button type="submit" class="btn btn-primary" ng-disabled="itemForm.$invalid || (item.addItemBtnDisabled && item.tableViewOperType == 'create')"> {{'Common.Submit' | translate }} </button> </div> </div> </div> </form>
<form id="itemModal" class="modal fade" valdr-type="Item" name="itemForm" ng-submit="doItem()"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title"> <span ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch"> {{'Component.ConfigItem.Title' | translate }} <small class="text-info">{{'Component.ConfigItem.TitleTips' | translate }}</small> </span> <span ng-show="item.tableViewOperType == 'create' && toOperationNamespace.isBranch"> {{'Component.ConfigItem.AddGrayscaleItem' | translate }}</span> <span ng-show="item.tableViewOperType == 'update'"> {{'Component.ConfigItem.ModifyItem' | translate }}</span> </h4> </div> <div class="modal-body form-horizontal"> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield ng-show="item.tableViewOperType == 'create'"></apollorequiredfield> {{'Component.ConfigItem.ItemKey' | translate }} </label> <div class="col-sm-10" valdr-form-group> <input type="text" name="key" class="form-control" ng-model="item.key" tabindex="1" ng-required="true" ng-disabled="item.tableViewOperType != 'create'" /> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemValue' | translate }}</label> <div class="col-sm-10" valdr-form-group> <textarea id="valueEditor" name="value" class="form-control" rows="6" tabindex="2" ng-required="false" ng-model="item.value"> </textarea> {{'Component.ConfigItem.ItemValueTips' | translate }} <a ng-click="showHiddenChars()">{{'Component.ConfigItem.ItemValueShowDetection' | translate }}</a> <br> <div class="bg-info" ng-show="showHiddenCharsContext && hiddenCharCounter == 0"> {{'Component.ConfigItem.ItemValueNotHiddenChars' | translate }}</div> <div class="bg-info" ng-bind-html="valueWithHiddenChars" ng-show="showHiddenCharsContext && hiddenCharCounter > 0"></div> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemComment' | translate }}</label> <div class="col-sm-10" valdr-form-group> <textarea class="form-control" name="comment" ng-model="item.comment" tabindex="3" rows="2"> </textarea> </div> </div> <div class="form-group" ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Component.ConfigItem.ChooseCluster' | translate }} </label> <div class="col-sm-10"> <apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="false" apollo-default-checked-env="env" apollo-default-checked-cluster="cluster" apollo-select="collectSelectedClusters"> </apolloclusterselector> </div> </div> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal"> {{'Common.Cancel' | translate }} </button> <button type="submit" class="btn btn-primary" ng-disabled="itemForm.$invalid || (item.addItemBtnDisabled && item.tableViewOperType == 'create')"> {{'Common.Submit' | translate }} </button> </div> </div> </div> </form>
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/main/java/com/ctrip/framework/apollo/core/ServiceNameConsts.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core; public interface ServiceNameConsts { String APOLLO_METASERVICE = "apollo-metaservice"; String APOLLO_CONFIGSERVICE = "apollo-configservice"; String APOLLO_ADMINSERVICE = "apollo-adminservice"; String APOLLO_PORTAL = "apollo-portal"; }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core; public interface ServiceNameConsts { String APOLLO_METASERVICE = "apollo-metaservice"; String APOLLO_CONFIGSERVICE = "apollo-configservice"; String APOLLO_ADMINSERVICE = "apollo-adminservice"; String APOLLO_PORTAL = "apollo-portal"; }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/NetworkProvider.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.spi.provider; /** * Provider for network related properties */ public interface NetworkProvider extends Provider { /** * @return the host address, i.e. ip */ String getHostAddress(); /** * @return the host name */ String getHostName(); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.spi.provider; /** * Provider for network related properties */ public interface NetworkProvider extends Provider { /** * @return the host address, i.e. ip */ String getHostAddress(); /** * @return the host name */ String getHostName(); }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/java/com/ctrip/framework/test/tools/AloneWith.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.test.tools; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.junit.runner.Runner; /** * @author kl (http://kailing.pub) * @since 2021/5/21 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Inherited public @interface AloneWith { Class<? extends Runner> value(); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.test.tools; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.junit.runner.Runner; /** * @author kl (http://kailing.pub) * @since 2021/5/21 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Inherited public @interface AloneWith { Class<? extends Runner> value(); }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/angular/angular-ui-router.min.js
/** * State-based routing for AngularJS * @version v1.0.0alpha0 * @link http://angular-ui.github.com/ * @license MIT License, http://www.opensource.org/licenses/MIT */ !function (a, b) { "object" == typeof exports && "object" == typeof module ? module.exports = b() : "function" == typeof define && define.amd ? define([], b) : "object" == typeof exports ? exports["ui.router"] = b() : a["ui.router"] = b() }(this, function () { return function (a) { function b(d) { if (c[d])return c[d].exports; var e = c[d] = {exports: {}, id: d, loaded: !1}; return a[d].call(e.exports, e, e.exports, b), e.loaded = !0, e.exports } var c = {}; return b.m = a, b.c = c, b.p = "", b(0) }([function (a, b, c) { a.exports = c(1) }, function (a, b, c) { var d = c(2); b.common = d; var e = c(36); b.params = e; var f = c(15); b.path = f; var g = c(17); b.resolve = g; var h = c(12); b.state = h; var i = c(9); b.transition = i; var j = c(34); b.url = j; var k = c(49); b.view = k, Object.defineProperty(b, "__esModule", {value: !0}), b["default"] = "ui.router" }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(3)), d(c(4)), d(c(5)), d(c(6)) }, function (a, b) { function c(a) { function b(c) { return c.length >= d ? a.apply(null, c) : function () { return b(c.concat([].slice.apply(arguments))) } } var c = [].slice.apply(arguments, [1]), d = a.length; return b(c) } function d() { var a = arguments, b = a.length - 1; return function () { for (var c = b, d = a[b].apply(this, arguments); c--;)d = a[c].call(this, d); return d } } function e() { for (var a = [], b = 0; b < arguments.length; b++)a[b - 0] = arguments[b]; return d.apply(null, [].slice.call(arguments).reverse()) } function f(a, b) { return function () { for (var c = [], d = 0; d < arguments.length; d++)c[d - 0] = arguments[d]; return a.apply(null, c) && b.apply(null, c) } } function g(a, b) { return function () { for (var c = [], d = 0; d < arguments.length; d++)c[d - 0] = arguments[d]; return a.apply(null, c) || b.apply(null, c) } } function h(a, b) { return function (c) { return c[a].apply(c, b) } } function i(a) { return function (b) { for (var c = 0; c < a.length; c++)if (a[c][0](b))return a[c][1](b) } } function j(a) { void 0 === a && (a = {}); for (var b = [], c = 1; c < arguments.length; c++)b[c - 1] = arguments[c]; var d = k.apply(null, [{}].concat(b)); return J({}, d, o(a || {}, Object.keys(d))) } function k(a) { for (var b = [], c = 1; c < arguments.length; c++)b[c - 1] = arguments[c]; return I(b, function (b) { I(b, function (b, c) { a.hasOwnProperty(c) || (a[c] = b) }) }), a } function l(a, b) { var c = []; for (var d in a.path) { if (a.path[d] !== b.path[d])break; c.push(a.path[d]) } return c } function m(a, b, c) { void 0 === c && (c = Object.keys(a)); for (var d = 0; d < c.length; d++) { var e = c[d]; if (a[e] != b[e])return !1 } return !0 } function n(a, b) { var c = {}, d = Q(arguments, 2); for (var e in b)a(d, e) && (c[e] = b[e]); return c } function o(a) { return n.apply(null, [R].concat(Q(arguments))) } function p(a) { return n.apply(null, [b.not(R)].concat(Q(arguments))) } function q(a, c) { return t(a, b.prop(c)) } function r(a, b) { var c = H(a), d = c ? [] : {}, e = c ? function (a) { return d.push(a) } : function (a, b) { return d[b] = a }; return I(a, function (a, c) { b(a, c) && e(a, c) }), d } function s(a, b) { var c; return I(a, function (a, d) { c || b(a, d) && (c = a) }), c } function t(a, b) { var c = H(a) ? [] : {}; return I(a, function (a, d) { return c[d] = b(a, d) }), c } function u(a, b) { return void 0 === b && (b = "assert failure"), function (c) { if (!a(c))throw new Error(b); return !0 } } function v() { for (var a = [], c = 0; c < arguments.length; c++)a[c - 0] = arguments[c]; if (0 === a.length)return []; var d = a.reduce(function (a, b) { return Math.min(b.length, a) }, 9007199254740991); return Array.apply(null, Array(d)).map(function (c, d) { return a.map(function (a) { return a[d] }).reduce(b.pushR, []) }) } function w(a, b) { var c, d; if (H(b) && (c = b[0], d = b[1]), !F(c))throw new Error("invalid parameters to applyPairs"); return a[c] = d, a } function x(a) { if (H(a) && a.length) { var c = a.slice(0, -1), d = a.slice(-1); if (c.filter(b.not(F)).length || d.filter(b.not(D)).length)return !1 } return D(a) } function y(a) { var c = i([[H, function (a) { return a.slice(-1)[0] }], [b.val(!0), P]])(a); return c && c.toString() || "undefined" } function z(a, b) { return b.length <= a ? b : b.substr(0, a - 3) + "..." } function A(a, b) { for (; b.length < a;)b += " "; return b } function B(a) { return a.length && a[a.length - 1] || void 0 } var C = angular.isDefined, D = angular.isFunction, E = angular.isNumber, F = angular.isString, G = angular.isObject, H = angular.isArray, I = angular.forEach, J = angular.extend, K = angular.copy, L = angular.noop, M = angular.toJson, N = angular.fromJson, O = angular.equals, P = angular.identity; b.isDefined = C, b.isFunction = D, b.isNumber = E, b.isString = F, b.isObject = G, b.isArray = H, b.forEach = I, b.extend = J, b.copy = K, b.noop = L, b.toJson = M, b.fromJson = N, b.equals = O, b.identity = P, b.abstractKey = "abstract", b.curry = c, b.compose = d, b.pipe = e, b.prop = function (a) { return function (b) { return b && b[a] } }, b.propEq = c(function (a, b, c) { return c && c[a] === b }), b.parse = function (a) { return e.apply(null, a.split(".").map(b.prop)) }, b.not = function (a) { return function () { for (var b = [], c = 0; c < arguments.length; c++)b[c - 0] = arguments[c]; return !a.apply(null, b) } }, b.and = f, b.or = g, b.is = function (a) { return function (b) { return null != b && b.constructor === a || b instanceof a } }, b.eq = function (a) { return function (b) { return a === b } }, b.val = function (a) { return function () { return a } }, b.invoke = h, b.pattern = i, b.inherit = function (a, b) { return J(new (J(function () { }, {prototype: a})), b) }; var Q = function (a, b) { return void 0 === b && (b = 0), Array.prototype.concat.apply(Array.prototype, Array.prototype.slice.call(a, b)) }, R = function (a, b) { return -1 !== a.indexOf(b) }; b.removeFrom = function (a) { return function (b) { var c = a.indexOf(b); return c >= 0 && a.splice(c, 1), a } }, b.defaults = j, b.merge = k, b.mergeR = function (a, b) { return J(a, b) }, b.ancestors = l, b.equalForKeys = m, b.pick = o, b.omit = p, b.pluck = q, b.filter = r, b.find = s, b.map = t, b.values = function (a) { return Object.keys(a).map(function (b) { return a[b] }) }, b.allTrueR = function (a, b) { return a && b }, b.anyTrueR = function (a, b) { return a || b }, b.pushR = function (a, b) { return a.push(b), a }, b.unnestR = function (a, b) { return a.concat(b) }, b.flattenR = function (a, c) { return H(c) ? a.concat(c.reduce(b.flattenR, [])) : b.pushR(a, c) }, b.unnest = function (a) { return a.reduce(b.unnestR, []) }, b.flatten = function (a) { return a.reduce(b.flattenR, []) }, b.assertPredicate = u, b.pairs = function (a) { return Object.keys(a).map(function (b) { return [b, a[b]] }) }, b.arrayTuples = v, b.applyPairs = w, b.isInjectable = x, b.isNull = function (a) { return null === a }, b.isPromise = f(G, e(b.prop("then"), D)), b.fnToString = y, b.maxLength = z, b.padString = A, b.tail = B, angular.module("ui.router.util", ["ng", "ui.router.init"]), angular.module("ui.router.router", ["ui.router.util"]), angular.module("ui.router.state", ["ui.router.router", "ui.router.util", "ui.router.angular1"]), angular.module("ui.router", ["ui.router.init", "ui.router.state", "ui.router.angular1"]), angular.module("ui.router.compat", ["ui.router"]) }, function (a, b) { var c = function (a) { return function () { throw new Error(a + "(): No coreservices implementation for UI-Router is loaded. You should include one of: ['angular1.js']") } }, d = {$q: void 0, $injector: void 0, location: {}, locationConfig: {}}; b.services = d, ["replace", "url", "path", "search", "hash"].forEach(function (a) { return d.location[a] = c(a) }), ["port", "protocol", "host", "baseHref", "html5Mode", "hashPrefix"].forEach(function (a) { return d.locationConfig[a] = c(a) }) }, function (a, b) { var c = function () { function a(a) { void 0 === a && (a = []), this._items = a } return a.prototype.enqueue = function (a) { return this._items.push(a), a }, a.prototype.dequeue = function () { return this.size() ? this._items.splice(0, 1)[0] : void 0 }, a.prototype.clear = function () { var a = this._items; return this._items = [], a }, a.prototype.size = function () { return this._items.length }, a.prototype.remove = function (a) { var b = this._items.indexOf(a); return b > -1 && this._items.splice(b, 1)[0] }, a.prototype.peekTail = function () { return this._items[this._items.length - 1] }, a.prototype.peekHead = function () { return this.size() ? this._items[0] : void 0 }, a }(); b.Queue = c }, function (a, b, c) { function d(a) { return j.is(m.TransitionRejection)(a.reason) ? a.reason.toString() : "Promise(" + JSON.stringify(a) + ")" } function e(a) { var b = j.fnToString(a), c = b.match(/^(function [^ ]+\([^)]*\))/); return c ? c[1] : b } function f(a) { return j.isNumber(a) ? i[a] : i[i[a]] } function g(a) { var b = j.pattern([[j.not(j.isDefined), j.val("undefined")], [j.isNull, j.val("null")], [j.isPromise, d], [j.is(l.Transition), j.invoke("toString")], [j.is(k.Resolvable), j.invoke("toString")], [j.isInjectable, e], [j.val(!0), j.identity]]); return JSON.stringify(a, function (a, c) { return b(c) }).replace(/\\"/g, '"') } function h(a) { a.$watch(function () { q.approximateDigests++ }) } var i, j = c(3), k = c(7), l = c(8), m = c(28), n = function (a) { return "ui-view id#" + a.id + ", contextual name '" + a.name + "@" + a.creationContext + "', fqn: '" + a.fqn + "'" }, o = function (a) { return "ViewConfig targeting ui-view: '" + a.uiViewName + "@" + a.uiViewContextAnchor + "', context: '" + a.context.name + "'" }; !function (a) { a[a.RESOLVE = 0] = "RESOLVE", a[a.TRANSITION = 1] = "TRANSITION", a[a.HOOK = 2] = "HOOK", a[a.INVOKE = 3] = "INVOKE", a[a.UIVIEW = 4] = "UIVIEW", a[a.VIEWCONFIG = 5] = "VIEWCONFIG" }(i || (i = {})); var p = function () { function a() { var a = this; this._enabled = {}, this.enable = function () { for (var b = [], c = 0; c < arguments.length; c++)b[c - 0] = arguments[c]; return a._set(!0, b) }, this.disable = function () { for (var b = [], c = 0; c < arguments.length; c++)b[c - 0] = arguments[c]; return a._set(!1, b) }, this.approximateDigests = 0 } return a.prototype._set = function (a, b) { var c = this; b.length || (b = Object.keys(i).filter(function (a) { return isNaN(parseInt(a, 10)) }).map(function (a) { return i[a] })), b.map(f).forEach(function (b) { return c._enabled[b] = a }) }, a.prototype.enabled = function (a) { return !!this._enabled[f(a)] }, a.prototype.traceTransitionStart = function (a) { if (this.enabled(i.TRANSITION)) { var b = a.$id, c = this.approximateDigests, d = g(a); console.log("Transition #" + b + " Digest #" + c + ": Started -> " + d) } }, a.prototype.traceTransitionIgnored = function (a) { if (this.enabled(i.TRANSITION)) { var b = a.$id, c = this.approximateDigests, d = g(a); console.log("Transition #" + b + " Digest #" + c + ": Ignored <> " + d) } }, a.prototype.traceHookInvocation = function (a, b) { if (this.enabled(i.HOOK)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, f = j.parse("traceData.hookType")(b) || "internal", g = j.parse("traceData.context.state.name")(b) || j.parse("traceData.context")(b) || "unknown", h = e(a.fn); console.log("Transition #" + c + " Digest #" + d + ": Hook -> " + f + " context: " + g + ", " + j.maxLength(200, h)) } }, a.prototype.traceHookResult = function (a, b, c) { if (this.enabled(i.HOOK)) { var d = j.parse("transition.$id")(c), e = this.approximateDigests, f = g(a), h = g(b); console.log("Transition #" + d + " Digest #" + e + ": <- Hook returned: " + j.maxLength(200, f) + ", transition result: " + j.maxLength(200, h)) } }, a.prototype.traceResolvePath = function (a, b) { if (this.enabled(i.RESOLVE)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, e = a && a.toString(), f = b && b.resolvePolicy; console.log("Transition #" + c + " Digest #" + d + ": Resolving " + e + " (" + f + ")") } }, a.prototype.traceResolvePathElement = function (a, b, c) { if (this.enabled(i.RESOLVE) && b.length) { var d = j.parse("transition.$id")(c), e = this.approximateDigests, f = Object.keys(b).join(", "), g = a && a.toString(), h = c && c.resolvePolicy; console.log("Transition #" + d + " Digest #" + e + ": Resolve " + g + " resolvables: [" + f + "] (" + h + ")") } }, a.prototype.traceResolveResolvable = function (a, b) { if (this.enabled(i.RESOLVE)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, e = a && a.toString(); console.log("Transition #" + c + " Digest #" + d + ": Resolving -> " + e) } }, a.prototype.traceResolvableResolved = function (a, b) { if (this.enabled(i.RESOLVE)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, e = a && a.toString(), f = g(a.data); console.log("Transition #" + c + " Digest #" + d + ": <- Resolved " + e + " to: " + j.maxLength(200, f)) } }, a.prototype.tracePathElementInvoke = function (a, b, c, d) { if (this.enabled(i.INVOKE)) { var f = j.parse("transition.$id")(d), g = this.approximateDigests, h = a && a.state && a.state.toString(), k = e(b); console.log("Transition #" + f + " Digest #" + g + ": Invoke " + d.when + ": context: " + h + " " + j.maxLength(200, k)) } }, a.prototype.traceError = function (a, b) { if (this.enabled(i.TRANSITION)) { var c = b.$id, d = this.approximateDigests, e = g(b); console.log("Transition #" + c + " Digest #" + d + ": <- Rejected " + e + ", reason: " + a) } }, a.prototype.traceSuccess = function (a, b) { if (this.enabled(i.TRANSITION)) { var c = b.$id, d = this.approximateDigests, e = a.name, f = g(b); console.log("Transition #" + c + " Digest #" + d + ": <- Success " + f + ", final state: " + e) } }, a.prototype.traceUiViewEvent = function (a, b, c) { void 0 === c && (c = ""), this.enabled(i.UIVIEW) && console.log("ui-view: " + j.padString(30, a) + " " + n(b) + c) }, a.prototype.traceUiViewConfigUpdated = function (a, b) { this.enabled(i.UIVIEW) && this.traceUiViewEvent("Updating", a, " with ViewConfig from context='" + b + "'") }, a.prototype.traceUiViewScopeCreated = function (a, b) { this.enabled(i.UIVIEW) && this.traceUiViewEvent("Created scope for", a, ", scope #" + b.$id) }, a.prototype.traceUiViewFill = function (a, b) { this.enabled(i.UIVIEW) && this.traceUiViewEvent("Fill", a, " with: " + j.maxLength(200, b)) }, a.prototype.traceViewServiceEvent = function (a, b) { this.enabled(i.VIEWCONFIG) && console.log("$view.ViewConfig: " + a + " " + o(b)) }, a.prototype.traceViewServiceUiViewEvent = function (a, b) { this.enabled(i.VIEWCONFIG) && console.log("$view.ViewConfig: " + a + " " + n(b)) }, a }(), q = new p; b.trace = q, h.$inject = ["$rootScope"], angular.module("ui.router").run(h), angular.module("ui.router").service("$trace", function () { return q }) }, function (a, b, c) { var d = c(3), e = c(4), f = c(6), g = function () { function a(a, b, c) { this.promise = void 0, d.extend(this, { name: a, resolveFn: b, deps: e.services.$injector.annotate(b), data: c }) } return a.prototype.resolveResolvable = function (a, b) { var c = this; void 0 === b && (b = {}); var g = this, h = g.name, i = g.deps, j = g.resolveFn; f.trace.traceResolveResolvable(this, b); var k = e.services.$q.defer(); this.promise = k.promise; var l = a.getResolvables(null, {omitOwnLocals: [h]}), m = d.pick(l, i), n = d.map(m, function (c) { return c.get(a, b) }); return e.services.$q.all(n).then(function (a) { try { var b = e.services.$injector.invoke(j, null, a); k.resolve(b) } catch (d) { k.reject(d) } return c.promise }).then(function (a) { return c.data = a, f.trace.traceResolvableResolved(c, b), c.promise }) }, a.prototype.get = function (a, b) { return this.promise || this.resolveResolvable(a, b) }, a.prototype.toString = function () { return "Resolvable(name: " + this.name + ", requires: [" + this.deps + "])" }, a.makeResolvables = function (b) { var c = d.filter(b, d.not(d.isFunction)), e = Object.keys(c); if (e.length)throw new Error("Invalid resolve key/value: " + e[0] + "/" + c[e[0]]); return d.map(b, function (b, c) { return new a(c, b) }) }, a }(); b.Resolvable = g }, function (a, b, c) { var d = c(6), e = c(4), f = c(3), g = c(9), h = c(15), i = c(12), j = c(36), k = c(17), l = 0, m = new g.RejectFactory, n = f.prop("self"), o = function () { function a(a, b) { var c = this; if (this._deferred = e.services.$q.defer(), this.promise = this._deferred.promise, this.treeChanges = function () { return c._treeChanges }, this.isActive = function () { return c === c._options.current() }, !b.valid())throw new Error(b.error()); g.HookRegistry.mixin(new g.HookRegistry, this), this._options = f.extend({current: f.val(this)}, b.options()), this.$id = l++; var d = h.PathFactory.buildToPath(a, b); this._treeChanges = h.PathFactory.treeChanges(a, d, this._options.reloadState), h.PathFactory.bindTransitionResolve(this._treeChanges, this) } return a.prototype.$from = function () { return f.tail(this._treeChanges.from).state }, a.prototype.$to = function () { return f.tail(this._treeChanges.to).state }, a.prototype.from = function () { return this.$from().self }, a.prototype.to = function () { return this.$to().self }, a.prototype.is = function (b) { return b instanceof a ? this.is({ to: b.$to().name, from: b.$from().name }) : !(b.to && !g.matchState(this.$to(), b.to) || b.from && !g.matchState(this.$from(), b.from)) }, a.prototype.params = function (a) { return void 0 === a && (a = "to"), this._treeChanges[a].map(f.prop("values")).reduce(f.mergeR, {}) }, a.prototype.resolves = function () { return f.map(f.tail(this._treeChanges.to).resolveContext.getResolvables(), function (a) { return a.data }) }, a.prototype.addResolves = function (a, b) { void 0 === b && (b = ""); var c = "string" == typeof b ? b : b.name, d = this._treeChanges.to, e = f.find(d, function (a) { return a.state.name === c }); f.tail(d).resolveContext.addResolvables(k.Resolvable.makeResolvables(a), e.state) }, a.prototype.previous = function () { return this._options.previous || null }, a.prototype.options = function () { return this._options }, a.prototype.entering = function () { return f.map(this._treeChanges.entering, f.prop("state")).map(n) }, a.prototype.exiting = function () { return f.map(this._treeChanges.exiting, f.prop("state")).map(n).reverse() }, a.prototype.retained = function () { return f.map(this._treeChanges.retained, f.prop("state")).map(n) }, a.prototype.views = function (a, b) { void 0 === a && (a = "entering"); var c = this._treeChanges[a]; return b ? f.find(c, f.propEq("state", b)).views : f.unnest(c.map(f.prop("views"))) }, a.prototype.redirect = function (b) { var c = f.extend({}, this.options(), b.options(), {previous: this}); b = new i.TargetState(b.identifier(), b.$state(), b.params(), c); var d = new a(this._treeChanges.from, b), e = this.treeChanges().to, g = h.Node.matching(d.treeChanges().to, e), j = function (a, b) { return -1 === ["$stateParams", "$transition$"].indexOf(b) }; return g.forEach(function (a, b) { return f.extend(a.resolves, f.filter(e[b].resolves, j)) }), d }, a.prototype.ignored = function () { var a = this._treeChanges, b = a.to, c = a.from; if (this._options.reload || f.tail(b).state !== f.tail(c).state)return !1; var d = b.map(function (a) { return a.schema.filter(f.not(f.prop("dynamic"))) }), e = [b, c].map(function (a) { return a.map(f.prop("values")) }), g = e[0], h = e[1], i = f.arrayTuples(d, g, h); return i.map(function (a) { var b = a[0], c = a[1], d = a[2]; return j.Param.equals(b, c, d) }).reduce(f.allTrueR, !0) }, a.prototype.hookBuilder = function () { return new g.HookBuilder(g.$transitions, this, {transition: this, current: this._options.current}) }, a.prototype.run = function () { var a = this, b = this.hookBuilder(), c = g.TransitionHook.runSynchronousHooks, f = function () { return c(b.getOnSuccessHooks(), {}, !0) }, h = function (a) { return c(b.getOnErrorHooks(), {$error$: a}, !0) }; this.promise.then(f, h); var i = c(b.getOnBeforeHooks()); if (g.TransitionHook.isRejection(i)) { var j = i.reason; return this._deferred.reject(j), this.promise } if (!this.valid()) { var k = new Error(this.error()); return this._deferred.reject(k), this.promise } if (this.ignored()) { d.trace.traceTransitionIgnored(this); var l = m.ignored(); return this._deferred.reject(l.reason), this.promise } var n = function () { a._deferred.resolve(a), d.trace.traceSuccess(a.$to(), a) }, o = function (b) { return a._deferred.reject(b), d.trace.traceError(b, a), e.services.$q.reject(b) }; d.trace.traceTransitionStart(this); var p = b.asyncHooks().reduce(function (a, b) { return a.then(b.invokeStep) }, i); return p.then(n, o), this.promise }, a.prototype.valid = function () { return !this.error() }, a.prototype.error = function () { var a = this.$to(); return a.self[f.abstractKey] ? "Cannot transition to abstract state '" + a.name + "'" : j.Param.validates(a.parameters(), this.params()) ? void 0 : "Param values not valid for state '" + a.name + "'" }, a.prototype.toString = function () { var a = this.from(), b = this.to(), c = function (a) { return null !== a["#"] && void 0 !== a["#"] ? a : f.omit(a, "#") }, d = this.$id, e = f.isObject(a) ? a.name : a, g = f.toJson(c(this._treeChanges.from.map(f.prop("values")).reduce(f.mergeR, {}))), h = this.valid() ? "" : "(X) ", i = f.isObject(b) ? b.name : b, j = f.toJson(c(this.params())); return "Transition#" + d + "( '" + e + "'" + g + " -> " + h + "'" + i + "'" + j + " )" }, a }(); b.Transition = o }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(10)), d(c(11)), d(c(28)), d(c(8)), d(c(47)), d(c(48)) }, function (a, b, c) { var d = c(3), e = c(9), f = function () { function a(a, b, c) { var e = this; this.$transitions = a, this.transition = b, this.baseHookOptions = c, this.getOnBeforeHooks = function () { return e._buildTransitionHooks("onBefore", {}, {async: !1}) }, this.getOnStartHooks = function () { return e._buildTransitionHooks("onStart") }, this.getOnExitHooks = function () { return e._buildNodeHooks("onExit", e.treeChanges.exiting.reverse(), function (a) { return e._toFrom({from: a.state}) }) }, this.getOnRetainHooks = function () { return e._buildNodeHooks("onRetain", e.treeChanges.retained, function (a) { return e._toFrom() }) }, this.getOnEnterHooks = function () { return e._buildNodeHooks("onEnter", e.treeChanges.entering, function (a) { return e._toFrom({to: a.state}) }) }, this.getOnFinishHooks = function () { return e._buildTransitionHooks("onFinish", {$treeChanges$: e.treeChanges}) }, this.getOnSuccessHooks = function () { return e._buildTransitionHooks("onSuccess", {}, {async: !1, rejectIfSuperseded: !1}) }, this.getOnErrorHooks = function () { return e._buildTransitionHooks("onError", {}, {async: !1, rejectIfSuperseded: !1}) }, this.treeChanges = b.treeChanges(), this.toState = d.tail(this.treeChanges.to).state, this.fromState = d.tail(this.treeChanges.from).state, this.transitionOptions = b.options() } return a.prototype.asyncHooks = function () { var a = this.getOnStartHooks(), b = this.getOnExitHooks(), c = this.getOnRetainHooks(), e = this.getOnEnterHooks(), f = this.getOnFinishHooks(); return d.flatten([a, b, c, e, f]).filter(d.identity) }, a.prototype._toFrom = function (a) { return d.extend({to: this.toState, from: this.fromState}, a) }, a.prototype._buildTransitionHooks = function (a, b, c) { var e = this; void 0 === b && (b = {}), void 0 === c && (c = {}); var f = this.treeChanges.to, g = d.tail(f); c.traceData = {hookType: a, context: f}; var h = function (a) { return e.buildHook(g, a.callback, b, c) }; return this._matchingHooks(a, this._toFrom()).map(h) }, a.prototype._buildNodeHooks = function (a, b, c, d, e) { var f = this; void 0 === d && (d = {}), void 0 === e && (e = {}); var g = function (b) { var g = c(b); e.traceData = {hookType: a, context: b}, d.$state$ = b.state; var h = function (a) { return f.buildHook(b, a.callback, d, e) }; return f._matchingHooks(a, g).map(h) }; return b.map(g) }, a.prototype.buildHook = function (a, b, c, f) { void 0 === f && (f = {}); var g = d.extend({}, this.baseHookOptions, f); return new e.TransitionHook(b, d.extend({}, c), a.resolveContext, g) }, a.prototype._matchingHooks = function (a, b) { var c = function (a) { return a.matches(b.to, b.from) }, e = function (a, b) { return b.priority - a.priority }; return [this.transition, this.$transitions].map(function (b) { return b.getHooks(a) }).filter(d.assertPredicate(d.isArray, "broken event named: " + a)).reduce(d.unnestR).filter(c).sort(e) }, a }(); b.HookBuilder = f }, function (a, b, c) { function d(a, b) { function c(a) { for (var b = 0; b < d.length; b++) { var c = g.Glob.fromString(d[b]); if (c && c.matches(a.name) || !c && d[b] === a.name)return !0 } return !1 } var d = f.isString(b) ? [b] : b, e = f.isFunction(d) ? d : c; return !!e(a) } function e(a, b) { return function (c, d, e) { void 0 === e && (e = {}); var g = new h(c, d, e); return a[b].push(g), function () { f.removeFrom(a[b])(g) } } } var f = c(3), g = c(12); b.matchState = d; var h = function () { function a(a, b, c) { void 0 === c && (c = {}), this.callback = b, this.matchCriteria = f.extend({ to: f.val(!0), from: f.val(!0) }, a), this.priority = c.priority || 0 } return a.prototype.matches = function (a, b) { return d(a, this.matchCriteria.to) && d(b, this.matchCriteria.from) }, a }(); b.EventHook = h; var i = function () { function a() { var a = this; this._transitionEvents = { onBefore: [], onStart: [], onEnter: [], onRetain: [], onExit: [], onFinish: [], onSuccess: [], onError: [] }, this.getHooks = function (b) { return a._transitionEvents[b] }, this.onBefore = e(this._transitionEvents, "onBefore"), this.onStart = e(this._transitionEvents, "onStart"), this.onEnter = e(this._transitionEvents, "onEnter"), this.onRetain = e(this._transitionEvents, "onRetain"), this.onExit = e(this._transitionEvents, "onExit"), this.onFinish = e(this._transitionEvents, "onFinish"), this.onSuccess = e(this._transitionEvents, "onSuccess"), this.onError = e(this._transitionEvents, "onError") } return a.mixin = function (a, b) { Object.keys(a._transitionEvents).concat(["getHooks"]).forEach(function (c) { return b[c] = a[c] }) }, a }(); b.HookRegistry = i }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(13)), d(c(14)), d(c(41)), d(c(42)), d(c(43)), d(c(23)), d(c(44)), d(c(45)), d(c(46)), d(c(29)) }, function (a, b) { var c = function () { function a(a) { this.text = a, this.glob = a.split(".") } return a.prototype.matches = function (a) { for (var b = a.split("."), c = 0, d = this.glob.length; d > c; c++)"*" === this.glob[c] && (b[c] = "*"); return "**" === this.glob[0] && (b = b.slice(b.indexOf(this.glob[1])), b.unshift("**")), "**" === this.glob[this.glob.length - 1] && (b.splice(b.indexOf(this.glob[this.glob.length - 2]) + 1, Number.MAX_VALUE), b.push("**")), this.glob.length != b.length ? !1 : b.join("") === this.glob.join("") }, a.is = function (a) { return a.indexOf("*") > -1 }, a.fromString = function (b) { return this.is(b) ? new a(b) : null }, a }(); b.Glob = c }, function (a, b, c) { function d(a, b) { function c(a, b) { return r.builder(a, b) || this } function d(a, b) { return e.isObject(a) ? b = a : b.name = a, s.register(b), this } function l(a) { w.push(a) } function m(a, b, c, d, l, m) { function r(c, d) { function e(a) { if (a instanceof g.TargetState) { var b = a; return b = p.target(b.identifier(), b.params(), b.options()), b.valid() ? j() !== k ? v.superseded() : p.transitionTo(b.identifier(), b.params(), b.options()) : v.invalid(b.error()) } } function h() { var a = m.dequeue(); return void 0 === a ? v.invalid(d.error()) : n(a).then(e).then(function (a) { return a || h() }) } var j = function () { return t.peekTail() || u.peekTail() }, k = j(), l = i.PathFactory.makeTargetState(c), m = new f.Queue([].concat(w)), n = function (c) { return a.when(b.invoke(c, null, {$to$: d, $from$: l})) }; return h() } var x = m, y = { name: "", url: "^", views: null, params: {"#": {value: null, type: "hash"}}, "abstract": !0 }; n = s.register(y, !0), n.navigable = null; var z = function () { return i.PathFactory.bindTransNodesToPath([new i.Node(n, {})]) }; return c.rootContext(n), e.extend(p, { params: new k.StateParams, current: n.self, $current: n, transition: null }), s.flush(p), s.autoFlush = !0, p.reload = function (a) { return p.transitionTo(p.current, d, {reload: e.isDefined(a) ? a : !0, inherit: !1, notify: !1}) }, p.go = function (a, b, c) { var d = {relative: p.$current, inherit: !0}, f = e.defaults(c, d, h.defaultTransOpts); return p.transitionTo(a, b, f) }, p.target = function (a, b, c) { void 0 === c && (c = {}); var d = q.find(a, c.relative); return new g.TargetState(a, d, b, c) }, p.transitionTo = function (b, f, g) { if (void 0 === f && (f = {}), void 0 === g && (g = {}), g = e.defaults(g, h.defaultTransOpts), g = e.extend(g, {current: t.peekTail.bind(t)}), e.isObject(g.reload) && !g.reload.name)throw new Error("Invalid reload state object"); if (g.reloadState = g.reload === !0 ? p.$current.path[0] : q.find(g.reload, g.relative), g.reload && !g.reloadState)throw new Error("No such reload state '" + (e.isString(g.reload) ? g.reload : g.reload.name) + "'"); var i = p.target(b, f, g), k = u.peekTail(), m = k ? k.to : z(); if (!i.exists())return r(m, i); if (!i.valid())return a.reject(i.error()); var n = x.create(m, i), o = new j.TransitionManager(n, x, l, c, p, d, a, t, u), s = o.runTransition(); return e.extend(s, {transition: n}) }, p.is = function (a, b, c) { c = e.defaults(c, {relative: p.$current}); var f = q.find(a, c.relative); return e.isDefined(f) ? p.$current !== f ? !1 : e.isDefined(b) && null !== b ? k.Param.equals(f.parameters(), d, b) : !0 : void 0 }, p.includes = function (a, b, c) { c = e.defaults(c, {relative: p.$current}); var f = e.isString(a) && g.Glob.fromString(a); if (f) { if (!f.matches(p.$current.name))return !1; a = p.$current.name } var h = q.find(a, c.relative), i = p.$current.includes; return e.isDefined(h) ? e.isDefined(i[h.name]) ? b ? e.equalForKeys(k.Param.values(h.parameters(), b), d, Object.keys(b)) : !0 : !1 : void 0 }, p.href = function (a, b, c) { var f = {lossy: !0, inherit: !0, absolute: !1, relative: p.$current}; c = e.defaults(c, f); var g = q.find(a, c.relative); if (!e.isDefined(g))return null; c.inherit && (b = d.$inherit(b || {}, p.$current, g)); var h = g && c.lossy ? g.navigable : g; return h && void 0 !== h.url && null !== h.url ? l.href(h.url, k.Param.values(g.parameters(), b), {absolute: c.absolute}) : null }, p.get = function (a, b) { if (0 === arguments.length)return Object.keys(o).map(function (a) { return o[a].self }); var c = q.find(a, b || p.$current); return c && c.self || null }, p } var n, o = {}, p = function () { }, q = new g.StateMatcher(o), r = new g.StateBuilder(function () { return n }, q, b), s = new g.StateQueueManager(o, r, a, p), t = new f.Queue, u = new f.Queue, v = new h.RejectFactory; this.decorator = c, this.state = d; var w = []; this.onInvalid = l, this.$get = m, m.$inject = ["$q", "$injector", "$view", "$stateParams", "$urlRouter", "$transitions"] } var e = c(3), f = c(5), g = c(12), h = c(9), i = c(15), j = c(23), k = c(36); b.$StateProvider = d }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(16)), d(c(22)) }, function (a, b, c) { var d = c(3), e = c(17), f = c(21), g = function () { function a(a, b, c) { void 0 === c && (c = {}), this.state = a, this.schema = a.parameters({inherit: !1}); var g = function (a) { return [a.id, a.value(b[a.id])] }; this.values = this.schema.reduce(function (a, b) { return d.applyPairs(a, g(b)) }, {}), this.resolves = d.extend(d.map(a.resolve, function (a, b) { return new e.Resolvable(b, a) }), c); var h = function (c, d) { return new f.ViewConfig({rawViewName: d, viewDeclarationObj: c, context: a, params: b}) }; this.views = d.values(d.map(a.views, h)) } return a.prototype.parameter = function (a) { return d.find(this.schema, d.propEq("id", a)) }, a.prototype.equals = function (a, b) { var c = this; void 0 === b && (b = this.schema.map(d.prop("id"))); var e = function (b) { return c.parameter(b).type.equals(c.values[b], a.values[b]) }; return this.state === a.state && b.map(e).reduce(d.allTrueR, !0) }, a.clone = function (b, c) { return void 0 === c && (c = {}), new a(b.state, c.values || b.values, c.resolves || b.resolves) }, a.matching = function (a, b) { var c = a.reduce(function (a, c, d) { return a === d && d < b.length && c.state === b[d].state ? d + 1 : a }, 0); return a.slice(0, c) }, a }(); b.Node = g }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(7)), d(c(18)), d(c(20)) }, function (a, b, c) { function d(a, b) { var c = e.isString(a) ? a : null, d = e.isObject(a) ? a : {}, f = d[b.name] || c || i; return h.ResolvePolicy[f] } var e = c(3), f = c(6), g = c(4), h = c(19), i = h.ResolvePolicy[h.ResolvePolicy.LAZY], j = function () { function a(a) { this._path = a, e.extend(this, { _nodeFor: function (a) { return e.find(this._path, e.propEq("state", a)) }, _pathTo: function (a) { var b = this._nodeFor(a), c = this._path.indexOf(b); if (-1 === c)throw new Error("This path does not contain the state"); return this._path.slice(0, c + 1) } }) } return a.prototype.getResolvables = function (a, b) { b = e.defaults(b, {omitOwnLocals: []}); var c = (e.find(this._path, e.propEq("")), a ? this._pathTo(a) : this._path), d = e.tail(c); return c.reduce(function (a, c) { var f = c === d ? b.omitOwnLocals : [], g = e.omit(c.resolves, f); return e.extend(a, g) }, {}) }, a.prototype.getResolvablesForFn = function (a) { var b = g.services.$injector.annotate(a); return e.pick(this.getResolvables(), b) }, a.prototype.isolateRootTo = function (b) { return new a(this._pathTo(b)) }, a.prototype.addResolvables = function (a, b) { e.extend(this._nodeFor(b).resolves, a) }, a.prototype.getOwnResolvables = function (a) { return e.extend({}, this._nodeFor(a).resolves) }, a.prototype.resolvePath = function (a) { var b = this; void 0 === a && (a = {}), f.trace.traceResolvePath(this._path, a); var c = function (c) { return b.resolvePathElement(c.state, a) }; return g.services.$q.all(e.map(this._path, c)).then(e.noop) }, a.prototype.resolvePathElement = function (a, b) { var c = this; void 0 === b && (b = {}); var j = b && b.resolvePolicy, k = h.ResolvePolicy[j || i], l = this.getOwnResolvables(a), m = function (b) { return d(a.resolvePolicy, b) >= k }, n = e.filter(l, m), o = function (d) { return d.get(c.isolateRootTo(a), b) }, p = e.map(n, o); return f.trace.traceResolvePathElement(this, n, b), g.services.$q.all(p).then(e.noop) }, a.prototype.invokeLater = function (a, b, c) { var d = this; void 0 === b && (b = {}), void 0 === c && (c = {}); var h = this.getResolvablesForFn(a); f.trace.tracePathElementInvoke(e.tail(this._path), a, Object.keys(h), e.extend({when: "Later"}, c)); var i = function (a) { return a.get(d, c) }, j = e.map(h, i); return g.services.$q.all(j).then(function () { try { return d.invokeNow(a, b, c) } catch (e) { return g.services.$q.reject(e) } }) }, a.prototype.invokeNow = function (a, b, c) { void 0 === c && (c = {}); var d = this.getResolvablesForFn(a); f.trace.tracePathElementInvoke(e.tail(this._path), a, Object.keys(d), e.extend({when: "Now "}, c)); var h = e.map(d, e.prop("data")); return g.services.$injector.invoke(a, null, e.extend({}, b, h)) }, a }(); b.ResolveContext = j }, function (a, b) { !function (a) { a[a.JIT = 0] = "JIT", a[a.LAZY = 1] = "LAZY", a[a.EAGER = 2] = "EAGER" }(b.ResolvePolicy || (b.ResolvePolicy = {})); b.ResolvePolicy }, function (a, b, c) { var d = c(3), e = function () { function a(a, b) { this._resolveContext = a, this._state = b } return a.prototype.invokeLater = function (a, b) { return this._resolveContext.invokeLater(a, b) }, a.prototype.invokeNow = function (a, b) { return this._resolveContext.invokeNow(null, a, b) }, a.prototype.getLocals = function (a) { var b = this, c = function (a) { return a.get(b._resolveContext) }; return d.map(this._resolveContext.getResolvablesForFn(a), c) }, a }(); b.ResolveInjector = e }, function (a, b, c) { "use strict"; function d(a) { void 0 === a && (a = ""); var b = a.split("@"), c = b[0] || "$default", d = f.isString(b[1]) ? b[1] : "^", e = /^(\^(?:\.\^)*)\.(.*$)/.exec(c); return e && (d = e[1], c = e[2]), "!" === c.charAt(0) && (c = c.substr(1), d = ""), { uiViewName: c, uiViewContextAnchor: d } } function e(a, b, c, d) { var e = [], h = [], i = function (a) { for (var b = [], c = 1; c < arguments.length; c++)b[c - 1] = arguments[c]; return function (c) { return b.reduce(function (b, d) { return b && a[d] === c[d] }, !0) } }; this.rootContext = function (a) { return a ? this._rootContext = a : this._rootContext }, this.load = function (a, d) { if (!a.hasTemplate())throw new Error("No template configuration specified for '" + a.uiViewName + "@" + a.uiViewContextAnchor + "'"); var e = {template: c.when(a.getTemplate(b, d)), controller: c.when(a.getController(d))}; return c.all(e).then(function (b) { return g.trace.traceViewServiceEvent("Loaded", a), f.extend(a, b) }) }, this.reset = function (a) { g.trace.traceViewServiceEvent("<- Removing", a), h.filter(i(a, "uiViewName", "context")).forEach(f.removeFrom(h)) }, this.registerStateViewConfig = function (a) { g.trace.traceViewServiceEvent("-> Registering", a), h.push(a) }, this.sync = function () { function a(a) { return a.fqn.split(".").length } function b(a) { for (var b = a.context, c = 0; ++c && b.parent;)b = b.parent; return c } var c = e.map(function (a) { return [a.fqn, a] }).reduce(f.applyPairs, {}), d = f.curry(function (a, b) { var d = b.uiViewName.split("."), e = a.fqn.split("."); if (!angular.equals(d, e.slice(0 - d.length)))return !1; var f = 1 - d.length || void 0, g = e.slice(0, f).join("."), h = c[g].creationContext; return b.uiViewContextAnchor === (h && h.name) }), g = f.curry(function (a, b, c, d) { return b * (a(c) - a(d)) }), i = function (a) { var c = h.filter(d(a)); return c.length > 1 && c.sort(g(b, -1)), [a, c[0]] }, j = function (a) { var b = a[0], c = a[1]; -1 !== e.indexOf(b) && b.configUpdated(c) }; e.sort(g(a, 1)).map(i).forEach(j) }, this.registerUiView = function (a) { g.trace.traceViewServiceUiViewEvent("-> Registering", a); var b = function (b) { return b.fqn === a.fqn }; return e.filter(b).length && g.trace.traceViewServiceUiViewEvent("!!!! duplicate uiView named:", a), e.push(a), this.sync(), function () { var b = e.indexOf(a); return 0 >= b ? void g.trace.traceViewServiceUiViewEvent("Tried removing non-registered uiView", a) : (g.trace.traceViewServiceUiViewEvent("<- Deregistering", a), void f.removeFrom(e)(a)) } }, this.available = function () { return e.map(f.prop("fqn")) }, this.active = function () { return e.filter(f.prop("$config")).map(f.prop("name")) } } var f = c(3), g = c(2), h = function () { function a(a) { var b = d(a.rawViewName), c = b.uiViewName, e = b.uiViewContextAnchor, g = /^(\^(?:\.\^)*)$/; if (g.exec(e)) { var h = e.split(".").reduce(function (a, b) { return a.parent }, a.context); e = h.name } f.extend(this, f.pick(a, "viewDeclarationObj", "params", "context", "locals"), { uiViewName: c, uiViewContextAnchor: e }), this.controllerAs = a.viewDeclarationObj.controllerAs } return a.prototype.hasTemplate = function () { var a = this.viewDeclarationObj; return !!(a.template || a.templateUrl || a.templateProvider) }, a.prototype.getTemplate = function (a, b) { return a.fromConfig(this.viewDeclarationObj, this.params, b.invokeLater.bind(b)) }, a.prototype.getController = function (a) { var b = this.viewDeclarationObj.controllerProvider; return f.isInjectable(b) ? a.invokeLater(b, {}) : this.viewDeclarationObj.controller }, a }(); b.ViewConfig = h, e.$inject = ["$rootScope", "$templateFactory", "$q", "$timeout"], angular.module("ui.router.state").service("$view", e) }, function (a, b, c) { var d = c(3), e = c(12), f = c(15), g = c(17), h = function () { function a() { } return a.makeTargetState = function (a) { var b = d.tail(a).state; return new e.TargetState(b, b, a.map(d.prop("values")).reduce(d.mergeR, {})) }, a.buildToPath = function (b, c) { var d = c.params(), e = a.makeParamsNode(d), f = c.$state().path.map(e); return c.options().inherit && (f = a.inheritParams(b, f, Object.keys(d))), f }, a.inheritParams = function (a, b, c) { function e(a, b) { var c = d.find(a, d.propEq("state", b)); return d.extend({}, c && c.values) } void 0 === c && (c = []); var g = d.curry(function (a, b, c) { var g = d.extend({}, c && c.values), h = d.pick(g, b); g = d.omit(g, b); var i = e(a, c.state) || {}, j = d.extend(g, i, h); return new f.Node(c.state, j) }); return b.map(g(a, c)) }, a.bindTransNodesToPath = function (a) { var b = new g.ResolveContext(a); return a.forEach(function (a) { a.resolveContext = b.isolateRootTo(a.state), a.resolveInjector = new g.ResolveInjector(a.resolveContext, a.state), a.resolves.$stateParams = new g.Resolvable("$stateParams", function () { return a.values }, a.values) }), a }, a.treeChanges = function (b, c, e) { function g(a, b) { return f.Node.clone(a, {values: c[b].values}) } for (var h = 0, i = Math.min(b.length, c.length), j = function (a) { return a.parameters({inherit: !1}).filter(d.not(d.prop("dynamic"))).map(d.prop("id")) }, k = function (a, b) { return a.equals(b, j(a.state)) }; i > h && b[h].state !== e && k(b[h], c[h]);)h++; var l, m, n, o, p, q, r, s; return l = b, m = l.slice(0, h), n = l.slice(h), q = m.map(g), r = c.slice(h), s = q.concat(r), p = a.bindTransNodesToPath(s), o = p.slice(h), { from: l, to: p, retained: m, exiting: n, entering: o } }, a.bindTransitionResolve = function (a, b) { var c = a.to[0]; c.resolves.$transition$ = new g.Resolvable("$transition$", function () { return b }, b) }, a.makeParamsNode = d.curry(function (a, b) { return new f.Node(b, a) }), a }(); b.PathFactory = h }, function (a, b, c) { var d = c(3), e = c(24), f = c(28), g = c(29), h = c(30), i = c(39), j = c(40), k = function () { function a(a, b, c, d, e, f, g, k, l) { this.transition = a, this.$transitions = b, this.$urlRouter = c, this.$view = d, this.$state = e, this.$stateParams = f, this.$q = g, this.activeTransQ = k, this.changeHistory = l, this.viewHooks = new h.ViewHooks(a, d), this.enterExitHooks = new i.EnterExitHooks(a), this.resolveHooks = new j.ResolveHooks(a), this.treeChanges = a.treeChanges(), this.registerUpdateGlobalState(), this.viewHooks.registerHooks(), this.enterExitHooks.registerHooks(), this.resolveHooks.registerHooks() } return a.prototype.runTransition = function () { var a = this; return this.activeTransQ.clear(), this.activeTransQ.enqueue(this.transition), this.transition.run().then(function (a) { return a.to() })["catch"](function (b) { return a.transRejected(b) })["finally"](function () { return a.activeTransQ.remove(a.transition) }) }, a.prototype.registerUpdateGlobalState = function () { this.transition.onFinish({}, this.updateGlobalState.bind(this), {priority: -1e4}) }, a.prototype.updateGlobalState = function () { var a = this, b = a.treeChanges, c = a.transition, d = a.$state, e = a.changeHistory; d.$current = c.$to(), d.current = d.$current.self, e.enqueue(b), this.updateStateParams() }, a.prototype.transRejected = function (a) { var b = this, c = b.transition, h = b.$state, i = b.$stateParams, j = b.$q; if (a instanceof f.TransitionRejection) { if (a.type === f.RejectType.IGNORED) { var k = h.$current.parameters().filter(d.prop("dynamic")); return e.Param.equals(k, i, c.params()) || this.updateStateParams(), h.current } if (a.type === f.RejectType.SUPERSEDED && a.redirected && a.detail instanceof g.TargetState)return this._redirectMgr(c.redirect(a.detail)).runTransition() } return this.$transitions.defaultErrorHandler()(a), j.reject(a) }, a.prototype.updateStateParams = function () { var a = this, b = a.transition, c = a.$urlRouter, e = a.$state, f = a.$stateParams, g = b.options(); e.params = b.params(), d.copy(e.params, f), f.$sync().$off(), g.location && e.$current.navigable && c.push(e.$current.navigable.url, f, {replace: "replace" === g.location}), c.update(!0) }, a.prototype._redirectMgr = function (b) { var c = this, d = c.$transitions, e = c.$urlRouter, f = c.$view, g = c.$state, h = c.$stateParams, i = c.$q, j = c.activeTransQ, k = c.changeHistory; return new a(b, d, e, f, g, h, i, j, k) }, a }(); b.TransitionManager = k }, function (a, b, c) { var d, e = c(3), f = c(4), g = c(25), h = c(26), i = c(27), j = Object.prototype.hasOwnProperty, k = function (a) { return 0 === ["value", "type", "squash", "array", "dynamic"].filter(j.bind(a || {})).length }; !function (a) { a[a.PATH = 0] = "PATH", a[a.SEARCH = 1] = "SEARCH", a[a.CONFIG = 2] = "CONFIG" }(d || (d = {})); var l = function () { function a(a, b, c, f) { function j(a) { return a = k(a) && {value: a} || a, e.extend(a, { $$fn: e.isInjectable(a.value) ? a.value : function () { return a.value } }) } function l(b, c, e) { if (b.type && c && "string" !== c.name)throw new Error("Param '" + a + "' has two type configurations."); return b.type && c && "string" === c.name && i.paramTypes.type(b.type) ? i.paramTypes.type(b.type) : c ? c : b.type ? b.type instanceof h.Type ? b.type : i.paramTypes.type(b.type) : e === d.CONFIG ? i.paramTypes.type("any") : i.paramTypes.type("string") } function m() { var b = {array: f === d.SEARCH ? "auto" : !1}, g = a.match(/\[\]$/) ? {array: !0} : {}; return e.extend(b, g, c).array } function n(a, b) { var c = a.squash; if (!b || c === !1)return !1; if (!e.isDefined(c) || null == c)return g.matcherConfig.defaultSquashPolicy(); if (c === !0 || e.isString(c))return c; throw new Error("Invalid squash policy: '" + c + "'. Valid policies: false, true, or arbitrary string") } function o(a, b, c, d) { var f, g, h = [{from: "", to: c || b ? void 0 : ""}, {from: null, to: c || b ? void 0 : ""}]; return f = e.isArray(a.replace) ? a.replace : [], e.isString(d) && f.push({ from: d, to: void 0 }), g = e.map(f, e.prop("from")), e.filter(h, function (a) { return -1 === g.indexOf(a.from) }).concat(f) } c = j(c), b = l(c, b, f); var p = m(); b = p ? b.$asArray(p, f === d.SEARCH) : b; var q = void 0 !== c.value, r = c.dynamic === !0, s = n(c, q), t = o(c, p, q, s); e.extend(this, { id: a, type: b, location: f, squash: s, replace: t, isOptional: q, dynamic: r, config: c, array: p }) } return a.prototype.isDefaultValue = function (a) { return this.isOptional && this.type.equals(this.value(), a) }, a.prototype.value = function (a) { var b = this, c = function () { if (!f.services.$injector)throw new Error("Injectable functions cannot be called at configuration time"); var a = f.services.$injector.invoke(b.config.$$fn); if (null !== a && void 0 !== a && !b.type.is(a))throw new Error("Default value (" + a + ") for parameter '" + b.id + "' is not an instance of Type (" + b.type.name + ")"); return a }, d = function (a) { var c = e.map(e.filter(b.replace, e.propEq("from", a)), e.prop("to")); return c.length ? c[0] : a }; return a = d(a), e.isDefined(a) ? this.type.$normalize(a) : c() }, a.prototype.isSearch = function () { return this.location === d.SEARCH }, a.prototype.validates = function (a) { if ((!e.isDefined(a) || null === a) && this.isOptional)return !0; var b = this.type.$normalize(a); if (!this.type.is(b))return !1; var c = this.type.encode(b); return e.isString(c) && !this.type.pattern.exec(c) ? !1 : !0 }, a.prototype.toString = function () { return "{Param:" + this.id + " " + this.type + " squash: '" + this.squash + "' optional: " + this.isOptional + "}" }, a.fromConfig = function (b, c, e) { return new a(b, c, e, d.CONFIG) }, a.fromPath = function (b, c, e) { return new a(b, c, e, d.PATH) }, a.fromSearch = function (b, c, e) { return new a(b, c, e, d.SEARCH) }, a.values = function (a, b) { return b = b || {}, a.map(function (a) { return [a.id, a.value(b[a.id])] }).reduce(e.applyPairs, {}) }, a.equals = function (a, b, c) { return b = b || {}, c = c || {}, -1 === a.map(function (a) { return a.type.equals(b[a.id], c[a.id]) }).indexOf(!1) }, a.validates = function (a, b) { return b = b || {}, -1 === a.map(function (a) { return a.validates(b[a.id]) }).indexOf(!1) }, a }(); b.Param = l }, function (a, b, c) { var d = c(3), e = function () { function a() { this._isCaseInsensitive = !1, this._isStrictMode = !0, this._defaultSquashPolicy = !1 } return a.prototype.caseInsensitive = function (a) { return this._isCaseInsensitive = d.isDefined(a) ? a : this._isCaseInsensitive }, a.prototype.strictMode = function (a) { return this._isStrictMode = d.isDefined(a) ? a : this._isStrictMode }, a.prototype.defaultSquashPolicy = function (a) { if (d.isDefined(a) && a !== !0 && a !== !1 && !d.isString(a))throw new Error("Invalid squash policy: " + a + ". Valid policies: false, true, arbitrary-string"); return this._defaultSquashPolicy = d.isDefined(a) ? a : this._defaultSquashPolicy }, a }(); b.matcherConfig = new e }, function (a, b, c) { function d(a, b) { function c(a) { return e.isArray(a) ? a : e.isDefined(a) ? [a] : [] } function d(a) { switch (a.length) { case 0: return void 0; case 1: return "auto" === b ? a[0] : a; default: return a } } function f(a, b) { return function (f) { var g = c(f), h = e.map(g, a); return b === !0 ? 0 === e.filter(h, function (a) { return !a }).length : d(h) } } function g(a) { return function (b, d) { var e = c(b), f = c(d); if (e.length !== f.length)return !1; for (var g = 0; g < e.length; g++)if (!a(e[g], f[g]))return !1; return !0 } } var h = this; ["encode", "decode", "equals", "$normalize"].map(function (b) { h[b] = ("equals" === b ? g : f)(a[b].bind(a)) }), e.extend(this, {name: a.name, pattern: a.pattern, is: f(a.is.bind(a), !0), $arrayMode: b}) } var e = c(3), f = function () { function a(a) { this.pattern = /.*/, e.extend(this, a) } return a.prototype.is = function (a, b) { return !0 }, a.prototype.encode = function (a, b) { return a }, a.prototype.decode = function (a, b) { return a }, a.prototype.equals = function (a, b) { return a == b }, a.prototype.$subPattern = function () { var a = this.pattern.toString(); return a.substr(1, a.length - 2) }, a.prototype.toString = function () { return "{Type:" + this.name + "}" }, a.prototype.$normalize = function (a) { return this.is(a) ? a : this.decode(a) }, a.prototype.$asArray = function (a, b) { if (!a)return this; if ("auto" === a && !b)throw new Error("'auto' array mode is for query parameters only"); return new d(this, a) }, a }(); b.Type = f }, function (a, b, c) { var d = c(3), e = c(4), f = c(26), g = function (a, b) { return function (c) { return null != c ? c.toString().replace(a, b) : c } }, h = g(/\//g, "%2F"), i = g(/%2F/g, "/"), j = function () { function a() { this.enqueue = !0, this.typeQueue = [], this.defaultTypes = { hash: { encode: h, decode: i, is: d.is(String), pattern: /.*/, equals: d.val(!0) }, string: {encode: h, decode: i, is: d.is(String), pattern: /[^\/]*/}, "int": { encode: h, decode: function (a) { return parseInt(a, 10) }, is: function (a) { return d.isDefined(a) && this.decode(a.toString()) === a }, pattern: /-?\d+/ }, bool: { encode: function (a) { return a && 1 || 0 }, decode: function (a) { return 0 !== parseInt(a, 10) }, is: d.is(Boolean), pattern: /0|1/ }, date: { encode: function (a) { return this.is(a) ? [a.getFullYear(), ("0" + (a.getMonth() + 1)).slice(-2), ("0" + a.getDate()).slice(-2)].join("-") : void 0 }, decode: function (a) { if (this.is(a))return a; var b = this.capture.exec(a); return b ? new Date(b[1], b[2] - 1, b[3]) : void 0 }, is: function (a) { return a instanceof Date && !isNaN(a.valueOf()) }, equals: function (a, b) { return this.is(a) && this.is(b) && a.toISOString() === b.toISOString() }, pattern: /[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/, capture: /([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/ }, json: {encode: d.toJson, decode: d.fromJson, is: d.is(Object), equals: d.equals, pattern: /[^\/]*/}, any: {encode: d.identity, decode: d.identity, equals: d.equals, pattern: /.*/} }; var a = function (a, b) { return new f.Type(d.extend({name: b}, a)) }; this.types = d.inherit(d.map(this.defaultTypes, a), {}) } return a.prototype.type = function (a, b, c) { if (!d.isDefined(b))return this.types[a]; if (this.types.hasOwnProperty(a))throw new Error("A type named '" + a + "' has already been defined."); return this.types[a] = new f.Type(d.extend({name: a}, b)), c && (this.typeQueue.push({ name: a, def: c }), this.enqueue || this._flushTypeQueue()), this }, a.prototype._flushTypeQueue = function () { for (; this.typeQueue.length;) { var a = this.typeQueue.shift(); if (a.pattern)throw new Error("You cannot override a type's .pattern at runtime."); d.extend(this.types[a.name], e.services.$injector.invoke(a.def)) } }, a }(); b.paramTypes = new j }, function (a, b, c) { "use strict"; var d = c(3), e = c(4); !function (a) { a[a.SUPERSEDED = 2] = "SUPERSEDED", a[a.ABORTED = 3] = "ABORTED", a[a.INVALID = 4] = "INVALID", a[a.IGNORED = 5] = "IGNORED" }(b.RejectType || (b.RejectType = {})); var f = b.RejectType, g = function () { function a(a, b, c) { d.extend(this, {type: a, message: b, detail: c}) } return a.prototype.toString = function () { var a = function (a) { return a && a.toString !== Object.prototype.toString ? a.toString() : JSON.stringify(a) }, b = this.type, c = this.message, d = a(this.detail); return "TransitionRejection(type: " + b + ", message: " + c + ", detail: " + d + ")" }, a }(); b.TransitionRejection = g; var h = function () { function a() { } return a.prototype.superseded = function (a, b) { var c = "The transition has been superseded by a different transition (see detail).", h = new g(f.SUPERSEDED, c, a); return b && b.redirected && (h.redirected = !0), d.extend(e.services.$q.reject(h), {reason: h}) }, a.prototype.redirected = function (a) { return this.superseded(a, {redirected: !0}) }, a.prototype.invalid = function (a) { var b = "This transition is invalid (see detail)", c = new g(f.INVALID, b, a); return d.extend(e.services.$q.reject(c), {reason: c}) }, a.prototype.ignored = function (a) { var b = "The transition was ignored.", c = new g(f.IGNORED, b, a); return d.extend(e.services.$q.reject(c), {reason: c}) }, a.prototype.aborted = function (a) { var b = "The transition has been aborted.", c = new g(f.ABORTED, b, a); return d.extend(e.services.$q.reject(c), {reason: c}) }, a }(); b.RejectFactory = h }, function (a, b) { var c = function () { function a(a, b, c, d) { void 0 === c && (c = {}), void 0 === d && (d = {}), this._identifier = a, this._definition = b, this._options = d, this._params = c || {} } return a.prototype.name = function () { return this._definition && this._definition.name || this._identifier }, a.prototype.identifier = function () { return this._identifier }, a.prototype.params = function () { return this._params }, a.prototype.$state = function () { return this._definition }, a.prototype.state = function () { return this._definition && this._definition.self }, a.prototype.options = function () { return this._options }, a.prototype.exists = function () { return !(!this._definition || !this._definition.self) }, a.prototype.valid = function () { return !this.error() }, a.prototype.error = function () { var a = this.options().relative; if (!this._definition && a) { var b = a.name ? a.name : a; return "Could not resolve '" + this.name() + "' from state '" + b + "'" } return this._definition ? this._definition.self ? void 0 : "State '" + this.name() + "' has an invalid definition" : "No such state '" + this.name() + "'" }, a }(); b.TargetState = c }, function (a, b, c) { var d = c(3), e = c(4), f = c(31), g = function () { function a(a, b) { this.transition = a, this.$view = b, this.treeChanges = a.treeChanges(), this.enteringViews = a.views("entering"), this.exitingViews = a.views("exiting") } return a.prototype.loadAllEnteringViews = function () { var a = this, b = function (b) { var c = d.find(a.treeChanges.to, d.propEq("state", b.context)).resolveInjector; return a.$view.load(b, c) }; return e.services.$q.all(this.enteringViews.map(b)).then(d.noop) }, a.prototype.loadAllControllerLocals = function () { var a = this, b = function (b) { function c() { } var g = f.annotateController(b.controller), h = d.find(a.treeChanges.to, d.propEq("state", b.context)).resolveInjector; return c.$inject = g, e.services.$q.all(h.getLocals(c)).then(function (a) { return b.locals = a }) }, c = this.enteringViews.filter(function (a) { return !!a.controller }).map(b); return e.services.$q.all(c).then(d.noop) }, a.prototype.updateViews = function () { var a = this.$view; this.exitingViews.forEach(function (b) { return a.reset(b) }), this.enteringViews.forEach(function (b) { return a.registerStateViewConfig(b) }), a.sync() }, a.prototype.registerHooks = function () { this.enteringViews.length && (this.transition.onStart({}, this.loadAllEnteringViews.bind(this)), this.transition.onFinish({}, this.loadAllControllerLocals.bind(this))), (this.exitingViews.length || this.enteringViews.length) && this.transition.onSuccess({}, this.updateViews.bind(this)) }, a }(); b.ViewHooks = g }, function (a, b, c) { function d(a) { var b = h.services.$injector, c = b.get("$controller"), d = b.instantiate; try { var e; return b.instantiate = function (a) { b.instantiate = d, e = b.annotate(a) }, c(a, {$scope: {}}), e } finally { b.instantiate = d } } function e(a, b) { h.services.$injector = a, h.services.$q = b } function f(a) { function b(b, c, d) { return h.services.locationConfig.html5Mode = function () { var b = a.html5Mode(); return b = i.isObject(b) ? b.enabled : b, b && d.history }, k(["replace", "url", "path", "search", "hash"], b, h.services.location), k(["port", "protocol", "host"], b, h.services.locationConfig), k(["baseHref"], c, h.services.locationConfig), l } l = new g.Router, k(["hashPrefix"], a, h.services.locationConfig), this.$get = b, b.$inject = ["$location", "$browser", "$sniffer"] } var g = c(32), h = c(4), i = c(3), j = angular.module("ui.router.angular1", []); b.annotateController = d, e.$inject = ["$injector", "$q"], j.run(e); var k = function (a, b, c) { return a.forEach(function (a) { return c[a] = b[a].bind(b) }) }, l = null; f.$inject = ["$locationProvider"], angular.module("ui.router.init", []).provider("ng1UIRouter", f), angular.module("ui.router.util").provider("$urlMatcherFactory", ["ng1UIRouterProvider", function () { return l.urlMatcherFactory }]), angular.module("ui.router.router").provider("$urlRouter", ["ng1UIRouterProvider", function () { return l.urlRouterProvider }]), angular.module("ui.router.state").provider("$state", ["ng1UIRouterProvider", function () { return l.stateProvider }]), angular.module("ui.router.init").run(["ng1UIRouter", function (a) { }]), angular.module("ui.router.state").run(["$state", function (a) { }]), angular.module("ui.router.util").run(["$urlMatcherFactory", function (a) { }]) }, function (a, b, c) { var d = c(33), e = c(38), f = c(14), g = function () { function a() { this.urlMatcherFactory = new d.UrlMatcherFactory, this.urlRouterProvider = new e.$UrlRouterProvider(this.urlMatcherFactory), this.stateProvider = new f.$StateProvider(this.urlRouterProvider, this.urlMatcherFactory) } return a }(); b.Router = g }, function (a, b, c) { function d() { return {strict: f.matcherConfig.strictMode(), caseInsensitive: f.matcherConfig.caseInsensitive()} } var e = c(3), f = c(34), g = c(36), h = function () { function a() { e.extend(this, {UrlMatcher: f.UrlMatcher, Param: g.Param}) } return a.prototype.caseInsensitive = function (a) { return f.matcherConfig.caseInsensitive(a) }, a.prototype.strictMode = function (a) { return f.matcherConfig.strictMode(a) }, a.prototype.defaultSquashPolicy = function (a) { return f.matcherConfig.defaultSquashPolicy(a) }, a.prototype.compile = function (a, b) { return new f.UrlMatcher(a, e.extend(d(), b)) }, a.prototype.isMatcher = function (a) { if (!e.isObject(a))return !1; var b = !0; return e.forEach(f.UrlMatcher.prototype, function (c, d) { e.isFunction(c) && (b = b && e.isDefined(a[d]) && e.isFunction(a[d])) }), b }, a.prototype.type = function (a, b, c) { var d = g.paramTypes.type(a, b, c); return e.isDefined(b) ? this : d }, a.prototype.$get = function () { return g.paramTypes.enqueue = !1, g.paramTypes._flushTypeQueue(), this }, a }(); b.UrlMatcherFactory = h }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(35)), d(c(25)), d(c(33)), d(c(38)) }, function (a, b, c) { function d(a, b) { var c = ["", ""], d = a.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&"); if (!b)return d; switch (b.squash) { case!1: c = ["(", ")" + (b.isOptional ? "?" : "")]; break; case!0: c = ["?(", ")?"]; break; default: c = ["(" + b.squash + "|", ")?"] } return d + c[0] + b.type.pattern.source + c[1] } var e = c(3), f = c(36), g = function (a, b, c) { return a[b] = a[b] || c() }, h = function () { function a(b, c) { var g = this; this.pattern = b, this.config = c, this._cache = { path: [], pattern: null }, this._children = [], this._params = [], this._segments = [], this._compiled = [], this.config = e.defaults(this.config, { params: {}, strict: !0, caseInsensitive: !1, paramMap: e.identity }); for (var h, i, j, k = /([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, l = /([:]?)([\w\[\]-]+)|\{([\w\[\]-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, m = 0, n = [], o = function (c) { if (!a.nameValidator.test(c))throw new Error("Invalid parameter name '" + c + "' in pattern '" + b + "'"); if (e.find(g._params, e.propEq("id", c)))throw new Error("Duplicate parameter name '" + c + "' in pattern '" + b + "'") }, p = function (a, c) { var d = a[2] || a[3], h = c ? a[4] : a[4] || ("*" === a[1] ? ".*" : null); return { id: d, regexp: h, cfg: g.config.params[d], segment: b.substring(m, a.index), type: h ? f.paramTypes.type(h || "string") || e.inherit(f.paramTypes.type("string"), {pattern: new RegExp(h, g.config.caseInsensitive ? "i" : void 0)}) : null } }; (h = k.exec(b)) && (i = p(h, !1), !(i.segment.indexOf("?") >= 0));)o(i.id), this._params.push(f.Param.fromPath(i.id, i.type, this.config.paramMap(i.cfg, !1))), this._segments.push(i.segment), n.push([i.segment, e.tail(this._params)]), m = k.lastIndex; j = b.substring(m); var q = j.indexOf("?"); if (q >= 0) { var r = j.substring(q); if (j = j.substring(0, q), r.length > 0)for (m = 0; h = l.exec(r);)i = p(h, !0), o(i.id), this._params.push(f.Param.fromSearch(i.id, i.type, this.config.paramMap(i.cfg, !0))), m = k.lastIndex } this._segments.push(j), e.extend(this, { _compiled: n.map(function (a) { return d.apply(null, a) }).concat(d(j)), prefix: this._segments[0] }), Object.freeze(this) } return a.prototype.append = function (a) { return this._children.push(a), e.forEach(a._cache, function (b, c) { return a._cache[c] = e.isArray(b) ? [] : null }), a._cache.path = this._cache.path.concat(this), a }, a.prototype.isRoot = function () { return 0 === this._cache.path.length }, a.prototype.toString = function () { return this.pattern }, a.prototype.exec = function (a, b, c, d) { function f(a) { var b = function (a) { return a.split("").reverse().join("") }, c = function (a) { return a.replace(/\\-/g, "-") }, d = b(a).split(/-(?!\\)/), f = e.map(d, b); return e.map(f, c).reverse() } var h = this; void 0 === b && (b = {}), void 0 === d && (d = {}); var i = g(this._cache, "pattern", function () { return new RegExp(["^", e.unnest(h._cache.path.concat(h).map(e.prop("_compiled"))).join(""), h.config.strict === !1 ? "/?" : "", "$"].join(""), h.config.caseInsensitive ? "i" : void 0) }).exec(a); if (!i)return null; var j = this.parameters(), k = j.filter(function (a) { return !a.isSearch() }), l = j.filter(function (a) { return a.isSearch() }), m = this._cache.path.concat(this).map(function (a) { return a._segments.length - 1 }).reduce(function (a, b) { return a + b }), n = {}; if (m !== i.length - 1)throw new Error("Unbalanced capture group in route '" + this.pattern + "'"); for (var o = 0; m > o; o++) { for (var p = k[o], q = i[o + 1], r = 0; r < p.replace; r++)p.replace[r].from === q && (q = p.replace[r].to); q && p.array === !0 && (q = f(q)), n[p.id] = p.value(q) } return e.forEach(l, function (a) { n[a.id] = a.value(b[a.id]) }), c && (n["#"] = c), n }, a.prototype.parameters = function (a) { return void 0 === a && (a = {}), a.inherit === !1 ? this._params : e.unnest(this._cache.path.concat(this).map(e.prop("_params"))) }, a.prototype.parameter = function (a, b) { void 0 === b && (b = {}); var c = e.tail(this._cache.path); return e.find(this._params, e.propEq("id", a)) || b.inherit !== !1 && c && c.parameter(a) || null }, a.prototype.validates = function (a) { var b = this, c = function (a, b) { return !a || a.validates(b) }; return e.pairs(a || {}).map(function (a) { var d = a[0], e = a[1]; return c(b.parameter(d), e) }).reduce(e.allTrueR, !0) }, a.prototype.format = function (a) { function b(a) { return encodeURIComponent(a).replace(/-/g, function (a) { return "%5C%" + a.charCodeAt(0).toString(16).toUpperCase() }) } void 0 === a && (a = {}); var c = this._segments, d = c[0], f = !1, g = this.parameters({inherit: !1}), h = e.tail(this._cache.path); if (!this.validates(a))return null; g.map(function (g, h) { var i = h < c.length - 1, j = g.value(a[g.id]), k = g.isDefaultValue(j), l = k ? g.squash : !1, m = g.type.encode(j); if (!i) { if (null == m || k && l !== !1)return; return e.isArray(m) || (m = [m]), m = e.map(m, encodeURIComponent).join("&" + g.id + "="), d += (f ? "&" : "?") + (g.id + "=" + m), void(f = !0) } d += function (a, c) { return l === !0 ? a.match(c.match(/\/$/) ? /\/?(.*)/ : /(.*)/)[1] : e.isString(l) ? l + a : l !== !1 ? "" : null == m ? a : e.isArray(m) ? e.map(m, b).join("-") + a : g.type.raw ? m + a : encodeURIComponent(m) + a }(c[h + 1], d) }), a["#"] && (d += "#" + a["#"]); var i = ["#"].concat(g.map(e.prop("id"))); return (h && h.format(e.omit(a, i)) || "") + d }, a.nameValidator = /^\w+(-+\w+)*(?:\[\])?$/, a }(); b.UrlMatcher = h }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(24)), d(c(27)), d(c(37)), d(c(26)) }, function (a, b, c) { function d() { function a() { function a(a, b) { return function () { e.forEach(a.split(" "), function (a) { return c[a].splice(c[a].indexOf(b), 1) }) } } function b(a, b) { c[a] && c[a].length && e.forEach(c[a], function (a) { return a(b) }) } var c = {}, d = {}; return f.prototype.$digest = function () { var a = this; e.forEach(this, function (c, e) { c !== d[e] && a.hasOwnProperty(e) && (d[e] = c, b(e, c)) }) }, f.prototype.$inherit = function (a, b, c) { var d, f = e.ancestors(b, c), g = {}, h = []; for (var i in f)if (f[i].params && (d = Object.keys(f[i].params), d.length))for (var j in d)h.indexOf(d[j]) >= 0 || (h.push(d[j]), g[d[j]] = this[d[j]]); return e.extend({}, g, a) }, f.prototype.$set = function (a, c) { var d = this, f = !1, g = !1; return c && e.forEach(a, function (a, b) { (c.parameter(b) || {}).dynamic !== !0 && (g = !0) }), g ? !1 : (e.forEach(a, function (a, c) { a !== d[c] && (d[c] = a, b(c), f = !0) }), this.$sync(), f) }, f.prototype.$sync = function () { return e.copy(this, d), this }, f.prototype.$off = function () { return c = {}, this }, f.prototype.$raw = function () { return e.omit(this, Object.keys(this).filter(f.prototype.hasOwnProperty.bind(f.prototype))) }, f.prototype.$localize = function (a, b) { return new f(e.pick(b || this, Object.keys(a.params))) }, f.prototype.$observe = function (b, d) { return e.forEach(b.split(" "), function (a) { return (c[a] || (c[a] = [])).push(d) }), a(b, d) }, new f } function b(a) { return a.$watch(function () { c.$digest() }), c } var c = a(); this.$get = b, b.$inject = ["$rootScope"] } var e = c(3), f = function () { function a(a) { void 0 === a && (a = {}), e.extend(this, a) } return a.prototype.$digest = function () { }, a.prototype.$inherit = function (a, b, c) { }, a.prototype.$set = function (a, b) { }, a.prototype.$sync = function () { }, a.prototype.$off = function () { }, a.prototype.$raw = function () { }, a.prototype.$localize = function (a, b) { }, a.prototype.$observe = function (a, b) { }, a }(); b.StateParams = f, d.$inject = [], angular.module("ui.router.state").provider("$stateParams", d) }, function (a, b, c) { function d(a) { function b(a) { var b = /^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source); return null != b ? b[1].replace(/\\(.)/g, "$1") : "" } function c(a, b) { return a.replace(/\$(\$|\d{1,2})/, function (a, c) { return b["$" === c ? 0 : Number(c)] }) } function d(a, b, c) { if (!c)return !1; var d = a.invoke(b, b, {$match: c}); return e.isDefined(d) ? d : !0 } function h(a) { function b(a, b, c) { var d = f.services.locationConfig.baseHref(); return "/" === d ? a : b ? d.slice(0, -1) + a : c ? d.slice(1) + a : a } function c(a) { function b(a) { var b = a(f.services.$injector, g); return b ? (e.isString(b) && (g.replace(), g.url(b)), !0) : !1 } if (!a || !a.defaultPrevented) { var c, d = j.length; for (c = 0; d > c; c++)if (b(j[c]))return; k && b(k) } } function d() { return i = i || a.$on("$locationChangeSuccess", c) } var h = g.url(); return l || d(), { sync: function () { c() }, listen: function () { return d() }, update: function (a) { return a ? void(h = g.url()) : void(g.url() !== h && (g.url(h), g.replace())) }, push: function (a, b, c) { g.url(a.format(b || {})), c && c.replace && g.replace() }, href: function (a, c, d) { if (!a.validates(c))return null; var e = a.format(c); d = d || {}; var g = f.services.locationConfig, h = g.html5Mode(); if (h || null === e || (e = "#" + g.hashPrefix() + e), e = b(e, h, d.absolute), !d.absolute || !e)return e; var i = !h && e ? "/" : "", j = g.port(); return j = 80 === j || 443 === j ? "" : ":" + j, [g.protocol(), "://", g.host(), j, i, e].join("") } } } var i, j = [], k = null, l = !1; this.rule = function (a) { if (!e.isFunction(a))throw new Error("'rule' must be a function"); return j.push(a), this }, this.otherwise = function (a) { if (!e.isFunction(a) && !e.isString(a))throw new Error("'rule' must be a string or function"); return k = e.isString(a) ? function () { return a } : a, this }, this.when = function (h, i) { var j, k = e.isString(i); if (e.isString(h) && (h = a.compile(h)), !k && !e.isFunction(i) && !e.isArray(i))throw new Error("invalid 'handler' in when()"); var l = { matcher: function (b, c) { return k && (j = a.compile(c), c = ["$match", j.format.bind(j)]), e.extend(function () { return d(f.services.$injector, c, b.exec(g.path(), g.search(), g.hash())) }, {prefix: e.isString(b.prefix) ? b.prefix : ""}) }, regex: function (a, h) { if (a.global || a.sticky)throw new Error("when() RegExp must not be global or sticky"); return k && (j = h, h = ["$match", function (a) { return c(j, a) }]), e.extend(function () { return d(f.services.$injector, h, a.exec(g.path())) }, {prefix: b(a)}) } }, m = {matcher: a.isMatcher(h), regex: h instanceof RegExp}; for (var n in m)if (m[n])return this.rule(l[n](h, i)); throw new Error("invalid 'what' in when()") }, this.deferIntercept = function (a) { void 0 === a && (a = !0), l = a }, this.$get = h, h.$inject = ["$rootScope"] } var e = c(3), f = c(4), g = f.services.location; b.$UrlRouterProvider = d }, function (a, b) { var c = function () { function a(a) { this.transition = a } return a.prototype.registerHooks = function () { this.registerOnEnterHooks(), this.registerOnRetainHooks(), this.registerOnExitHooks() }, a.prototype.registerOnEnterHooks = function () { var a = this, b = function (b) { return a.transition.onEnter({to: b.name}, b.onEnter) }; this.transition.entering().filter(function (a) { return !!a.onEnter }).forEach(b) }, a.prototype.registerOnRetainHooks = function () { var a = this, b = function (b) { return a.transition.onRetain({}, b.onRetain) }; this.transition.retained().filter(function (a) { return !!a.onRetain }).forEach(b) }, a.prototype.registerOnExitHooks = function () { var a = this, b = function (b) { return a.transition.onExit({from: b.name}, b.onExit) }; this.transition.exiting().filter(function (a) { return !!a.onExit }).forEach(b) }, a }(); b.EnterExitHooks = c }, function (a, b, c) { var d = c(3), e = c(19), f = e.ResolvePolicy[e.ResolvePolicy.LAZY], g = e.ResolvePolicy[e.ResolvePolicy.EAGER], h = function () { function a(a) { this.transition = a } return a.prototype.registerHooks = function () { function a(a) { return d.tail(c.to).resolveContext.resolvePath(d.extend({transition: a}, {resolvePolicy: g})) } function b(a, b) { var e = d.find(c.entering, d.propEq("state", a)); return e.resolveContext.resolvePathElement(e.state, d.extend({transition: b}, {resolvePolicy: f})) } var c = this.transition.treeChanges(); a.$inject = ["$transition$"], b.$inject = ["$state$", "$transition$"], this.transition.onStart({}, a, {priority: 1e3}), this.transition.onEnter({}, b, {priority: 1e3}) }, a }(); b.ResolveHooks = h }, function (a, b, c) { var d = c(3), e = c(36), f = function (a) { if (!d.isString(a))return !1; var b = "^" === a.charAt(0); return {val: b ? a.substring(1) : a, root: b} }, g = function () { function a(a, b, c) { this.matcher = b; var g = this; this.builders = { parent: [function (c) { return c === a() ? null : b.find(g.parentName(c)) || a() }], data: [function (a) { return a.parent && a.parent.data && (a.data = a.self.data = d.extend({}, a.parent.data, a.data)), a.data }], url: [function (b) { var e = b, g = f(e.url), h = b.parent, i = g ? c.compile(g.val, { params: b.params || {}, paramMap: function (a, b) { return e.reloadOnSearch === !1 && b && (a = d.extend(a || {}, {dynamic: !0})), a } }) : e.url; if (!i)return null; if (!c.isMatcher(i))throw new Error("Invalid url '" + i + "' in state '" + b + "'"); return g && g.root ? i : (h && h.navigable || a()).url.append(i) }], navigable: [function (b) { return b !== a() && b.url ? b : b.parent ? b.parent.navigable : null }], params: [function (a) { var b = function (a, b) { return e.Param.fromConfig(b, null, a) }, c = a.url && a.url.parameters({inherit: !1}) || [], f = d.values(d.map(d.omit(a.params || {}, c.map(d.prop("id"))), b)); return c.concat(f).map(function (a) { return [a.id, a] }).reduce(d.applyPairs, {}) }], views: [function (a) { var b = {}, c = ["templateProvider", "templateUrl", "template", "notify", "async"], e = ["controller", "controllerProvider", "controllerAs"], f = c.concat(e); return d.forEach(a.views || {$default: d.pick(a, f)}, function (c, f) { f = f || "$default", d.forEach(e, function (b) { a[b] && !c[b] && (c[b] = a[b]) }), Object.keys(c).length > 0 && (b[f] = c) }), b }], path: [function (a) { return a.parent ? a.parent.path.concat(a) : [a] }], includes: [function (a) { var b = a.parent ? d.extend({}, a.parent.includes) : {}; return b[a.name] = !0, b }] } } return a.prototype.builder = function (a, b) { var c = this.builders, e = c[a] || []; return d.isString(a) && !d.isDefined(b) ? e.length > 1 ? e : e[0] : d.isString(a) && d.isFunction(b) ? (c[a] = e, c[a].push(b), function () { return c[a].splice(c[a].indexOf(b, 1)) && null }) : void 0 }, a.prototype.build = function (a) { var b = this, c = b.matcher, e = b.builders, f = this.parentName(a); if (f && !c.find(f))return null; for (var g in e)if (e.hasOwnProperty(g)) { var h = e[g].reduce(function (a, b) { return function (c) { return b(c, a) } }, d.noop); a[g] = h(a) } return a }, a.prototype.parentName = function (a) { var b = a.name || ""; return -1 !== b.indexOf(".") ? b.substring(0, b.lastIndexOf(".")) : a.parent ? d.isString(a.parent) ? a.parent : a.parent.name : "" }, a.prototype.name = function (a) { var b = a.name; if (-1 !== b.indexOf(".") || !a.parent)return b; var c = d.isString(a.parent) ? a.parent : a.parent.name; return c ? c + "." + b : b }, a }(); b.StateBuilder = g }, function (a, b, c) { function d(a, b) { var c, d = a.match(/^\s*({[^}]*})\s*$/); if (d && (a = b + "(" + d[1] + ")"), c = a.replace(/\n/g, " ").match(/^([^(]+?)\s*(\((.*)\))?$/), !c || 4 !== c.length)throw new Error("Invalid state ref '" + a + "'"); return {state: c[1], paramExpr: c[3] || null} } function e(a) { var b = a.parent().inheritedData("$uiView"); return b && b.context && b.context.name ? b.context : void 0 } function f(a, b) { return { restrict: "A", require: ["?^uiSrefActive", "?^uiSrefActiveEq"], link: function (c, f, g, j) { var k = d(g.uiSref, a.current.name), l = null, m = e(f) || a.$current, n = null, o = "A" === f.prop("tagName"), p = "FORM" === f[0].nodeName, q = p ? "action" : "href", r = !0, s = c.$eval(g.uiSrefOpts), t = { relative: m, inherit: !0 }, u = h.defaults(s, t, i.defaultTransOpts), v = function (b) { if (b && (l = h.copy(b)), r) { n = a.href(k.state, l, u); var c = j[1] || j[0]; return c && c.$$addStateInfo(k.state, l), null === n ? (r = !1, !1) : void g.$set(q, n) } }; k.paramExpr && (c.$watch(k.paramExpr, function (a) { a !== l && v(a) }, !0), l = h.copy(c.$eval(k.paramExpr))), v(), p || f.bind("click", function (c) { var d = c.which || c.button; if (!(d > 1 || c.ctrlKey || c.metaKey || c.shiftKey || f.attr("target"))) { var e = b(function () { a.go(k.state, l, u) }); c.preventDefault(); var g = o && !n ? 1 : 0; c.preventDefault = function () { g-- <= 0 && b.cancel(e) } } }) } } } function g(a, b, c) { return { restrict: "A", controller: ["$scope", "$element", "$attrs", "$timeout", "$transitions", function (b, f, g, i, j) { function k(b, c, d) { var g = a.get(b, e(f)), h = m(b, c); t.push({state: g || {name: b}, params: c, hash: h}), u[h] = d } function l(a) { a.promise.then(n) } function m(a, c) { if (!h.isString(a))throw new Error("state should be a string"); return h.isObject(c) ? a + h.toJson(c) : (c = b.$eval(c), h.isObject(c) ? a + h.toJson(c) : a) } function n() { for (var a = 0; a < t.length; a++)q(t[a].state, t[a].params) ? o(f, u[t[a].hash]) : p(f, u[t[a].hash]), r(t[a].state, t[a].params) ? o(f, s) : p(f, s) } function o(a, b) { i(function () { a.addClass(b) }) } function p(a, b) { a.removeClass(b) } function q(b, c) { return a.includes(b.name, c) } function r(b, c) { return a.is(b.name, c) } var s, t = [], u = {}; s = c(g.uiSrefActiveEq || "", !1)(b); var v = b.$eval(g.uiSrefActive) || c(g.uiSrefActive || "", !1)(b); h.isObject(v) && h.forEach(v, function (c, e) { if (h.isString(c)) { var f = d(c, a.current.name); k(f.state, b.$eval(f.paramExpr), e) } }), this.$$addStateInfo = function (a, b) { h.isObject(v) && t.length > 0 || (k(a, b, v), n()) }, b.$on("$stateChangeSuccess", n), l.$inject = ["$transition$"]; var w = j.onStart({}, l); b.$on("$destroy", w) }] } } var h = c(3), i = c(9); f.$inject = ["$state", "$timeout"], g.$inject = ["$state", "$stateParams", "$interpolate"], angular.module("ui.router.state").directive("uiSref", f).directive("uiSrefActive", g).directive("uiSrefActiveEq", g) }, function (a, b) { function c(a) { return function (b) { return a.is(b) } } function d(a) { return function (b, c, d) { return a.includes(b, c, d) } } c.$inject = ["$state"], b.$IsStateFilter = c, d.$inject = ["$state"], b.$IncludedByStateFilter = d, angular.module("ui.router.state").filter("isState", c).filter("includedByState", d) }, function (a, b, c) { var d = c(2), e = function () { function a(a) { d.extend(this, a) } return a.prototype.is = function (a) { return this === a || this.self === a || this.fqn() === a }, a.prototype.fqn = function () { if (!(this.parent && this.parent instanceof this.constructor))return this.name; var a = this.parent.fqn(); return a ? a + "." + this.name : this.name }, a.prototype.root = function () { return this.parent && this.parent.root() || this }, a.prototype.parameters = function (a) { a = d.defaults(a, {inherit: !0}); var b = a.inherit && this.parent && this.parent.parameters() || []; return b.concat(d.values(this.params)) }, a.prototype.parameter = function (a, b) { return void 0 === b && (b = {}), this.url && this.url.parameter(a, b) || d.find(d.values(this.params), d.propEq("id", a)) || b.inherit && this.parent && this.parent.parameter(a) }, a.prototype.toString = function () { return this.fqn() }, a }(); b.State = e }, function (a, b, c) { var d = c(3), e = function () { function a(a) { this._states = a } return a.prototype.isRelative = function (a) { return a = a || "", 0 === a.indexOf(".") || 0 === a.indexOf("^") }, a.prototype.find = function (a, b) { if (!a && "" !== a)return void 0; var c = d.isString(a), e = c ? a : a.name; this.isRelative(e) && (e = this.resolvePath(e, b)); var f = this._states[e]; return !f || !c && (c || f !== a && f.self !== a) ? void 0 : f }, a.prototype.resolvePath = function (a, b) { if (!b)throw new Error("No reference point given for path '" + a + "'"); for (var c = this.find(b), d = a.split("."), e = 0, f = d.length, g = c; f > e; e++)if ("" !== d[e] || 0 !== e) { if ("^" !== d[e])break; if (!g.parent)throw new Error("Path '" + a + "' not valid for state '" + c.name + "'"); g = g.parent } else g = c; var h = d.slice(e).join("."); return g.name + (g.name && h ? "." : "") + h }, a }(); b.StateMatcher = e }, function (a, b, c) { var d = c(3), e = c(12), f = function () { function a(a, b, c, d) { this.states = a, this.builder = b, this.$urlRouterProvider = c, this.$state = d, this.autoFlush = !1, this.queue = [] } return a.prototype.register = function (a, b) { var c = this, f = c.states, g = c.queue, h = c.$state, i = d.inherit(new e.State, d.extend({}, a, { self: a, resolve: a.resolve || {}, toString: function () { return a.name } })); if (!d.isString(i.name))throw new Error("State must have a valid name"); if (f.hasOwnProperty(i.name) || -1 !== d.pluck(g, "name").indexOf(i.name))throw new Error("State '" + i.name + "' is already defined"); return g[b ? "unshift" : "push"](i), this.autoFlush && this.flush(h), i }, a.prototype.flush = function (a) { for (var b, c, d, e = this, f = e.queue, g = e.states, h = e.builder, i = [], j = {}; f.length > 0;)if (c = f.shift(), b = h.build(c), d = i.indexOf(c), b) { if (g.hasOwnProperty(c.name))throw new Error("State '" + name + "' is already defined"); g[c.name] = c, this.attachRoute(a, c), d >= 0 && i.splice(d, 1) } else { var k = j[c.name]; if (j[c.name] = f.length, d >= 0 && k === f.length)throw new Error("Cannot register orphaned state '" + c.name + "'"); 0 > d && i.push(c), f.push(c) } return g }, a.prototype.attachRoute = function (a, b) { var c = this.$urlRouterProvider; !b[d.abstractKey] && b.url && c.when(b.url, ["$match", "$stateParams", function (c, e) { a.$current.navigable === b && d.equalForKeys(c, e) || a.transitionTo(b, c, { inherit: !0, location: !1 }) }]) }, a }(); b.StateQueueManager = f }, function (a, b, c) { var d = c(3), e = c(6), f = c(4), g = c(28), h = c(12), i = new g.RejectFactory, j = { async: !0, rejectIfSuperseded: !0, current: d.noop, transition: null, traceData: {} }, k = function () { function a(a, b, c, f) { var g = this; this.fn = a, this.locals = b, this.resolveContext = c, this.options = f, this.isSuperseded = function () { return g.options.current() !== g.options.transition }, this.mapHookResult = d.pattern([[this.isSuperseded, function () { return i.superseded(g.options.current()) }], [d.eq(!1), d.val(i.aborted("Hook aborted transition"))], [d.is(h.TargetState), function (a) { return i.redirected(a) }], [d.isPromise, function (a) { return a.then(g.handleHookResult.bind(g)) }]]), this.invokeStep = function (a) { var b = g, c = b.options, f = b.fn, h = b.resolveContext, j = d.extend({}, g.locals, a); if (e.trace.traceHookInvocation(g, c), c.rejectIfSuperseded && g.isSuperseded())return i.superseded(c.current()); if (!c.async) { var k = h.invokeNow(f, j, c); return g.handleHookResult(k) } return h.invokeLater(f, j, c).then(g.handleHookResult.bind(g)) }, this.options = d.defaults(f, j) } return a.prototype.handleHookResult = function (a) { if (!d.isDefined(a))return void 0; e.trace.traceHookResult(a, void 0, this.options); var b = this.mapHookResult(a); return b && e.trace.traceHookResult(a, b, this.options), b }, a.prototype.toString = function () { var a = this, b = a.options, c = a.fn, e = d.parse("traceData.hookType")(b) || "internal", f = d.parse("traceData.context.state.name")(b) || d.parse("traceData.context")(b) || "unknown", g = d.fnToString(c); return e + " context: " + f + ", " + d.maxLength(200, g) }, a.runSynchronousHooks = function (b, c, e) { void 0 === c && (c = {}), void 0 === e && (e = !1); for (var g = [], h = 0; h < b.length; h++)try { g.push(b[h].invokeStep(c)) } catch (i) { if (!e)throw i; console.log("Swallowed exception during synchronous hook handler: " + i) } var j = g.filter(a.isRejection); return j.length ? j[0] : g.filter(d.not(a.isRejection)).filter(d.isPromise).reduce(function (a, b) { return a.then(d.val(b)) }, f.services.$q.when()) }, a.isRejection = function (a) { return a && a.reason instanceof g.TransitionRejection && a }, a }(); b.TransitionHook = k }, function (a, b, c) { function d() { this._reinit.bind(b.$transitions)(), this.$get = function () { return b.$transitions } } var e = c(8), f = c(11); b.defaultTransOpts = { location: !0, relative: null, inherit: !1, notify: !0, reload: !1, custom: {}, current: function () { return null } }; var g = function () { function a() { this._defaultErrorHandler = function (a) { a instanceof Error && console.log(a) }, this._reinit() } return a.prototype.defaultErrorHandler = function (a) { return this._defaultErrorHandler = a || this._defaultErrorHandler }, a.prototype._reinit = function () { f.HookRegistry.mixin(new f.HookRegistry, this) }, a.prototype.create = function (a, b) { return new e.Transition(a, b) }, a }(); b.$transitions = new g, d.prototype = b.$transitions, b.$transitionsProvider = d, angular.module("ui.router.state").provider("$transitions", b.$transitionsProvider) }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(50)), d(c(21)), d(c(51)), d(c(52)) }, function (a, b, c) { function d(a, b) { this.fromConfig = function (a, b, c) { return e.isDefined(a.template) ? this.fromString(a.template, b) : e.isDefined(a.templateUrl) ? this.fromUrl(a.templateUrl, b) : e.isDefined(a.templateProvider) ? this.fromProvider(a.templateProvider, b, c) : null }, this.fromString = function (a, b) { return e.isFunction(a) ? a(b) : a }, this.fromUrl = function (c, d) { return e.isFunction(c) && (c = c(d)), null == c ? null : a.get(c, { cache: b, headers: {Accept: "text/html"} }).then(e.prop("data")) }, this.fromProvider = function (a, b, c) { return c(a) } } var e = c(3); d.$inject = ["$http", "$templateCache"], angular.module("ui.router.util").service("$templateFactory", d) }, function (a, b, c) { function d(a, b, c, d, e) { function h(a, c) { return { enter: function (a, c, d) { angular.version.minor > 2 ? b.enter(a, null, c).then(d) : b.enter(a, null, c, d) }, leave: function (a, c) { angular.version.minor > 2 ? b.leave(a).then(c) : b.leave(a, c) } } } function i(a, b) { return a === b } var j = {context: a.rootContext()}, k = { count: 0, restrict: "ECA", terminal: !0, priority: 400, transclude: "element", compile: function (b, e, l) { return function (b, e, m) { function n(a) { i(x, a) || (g.trace.traceUiViewConfigUpdated(A, a && a.context), x = a, p(a)) } function o() { q && (g.trace.traceUiViewEvent("Removing (previous) el", A), q.remove(), q = null), s && (g.trace.traceUiViewEvent("Destroying (previous) scope", A), s.$destroy(), s = null), r && (g.trace.traceUiViewEvent("Animate out (previous)", A), w.leave(r, function () { q = null }), q = r, r = null) } function p(a) { a = a || {}; var d = b.$new(); g.trace.traceUiViewScopeCreated(A, d), f.extend(A, { context: a.context, $template: a.template, $controller: a.controller, $controllerAs: a.controllerAs, $locals: a.locals }); var h = l(d, function (a) { w.enter(a.data("$uiView", A), e, function () { s && s.$emit("$viewContentAnimationEnded"), (f.isDefined(v) && !v || b.$eval(v)) && c(a) }), o() }); r = h, s = d, s.$emit("$viewContentLoaded", a || x), s.$eval(u) } var q, r, s, t, u = m.onload || "", v = m.autoscroll, w = h(m, b), x = void 0, y = e.inheritedData("$uiView") || j, z = d(m.uiView || m.name || "")(b) || "$default", A = { id: k.count++, name: z, fqn: y.name ? y.fqn + "." + z : z, config: null, configUpdated: n, get creationContext() { return y.context } }; g.trace.traceUiViewEvent("Linking", A), e.data("$uiView", A), p(), t = a.registerUiView(A), b.$on("$destroy", function () { g.trace.traceUiViewEvent("Destroying/Unregistering", A), t() }) } } }; return k } function e(a, b, c, d, e) { return { restrict: "ECA", priority: -400, compile: function (c) { var d = c.html(); return function (c, e) { var h = e.data("$uiView"); if (h) { e.html(h.$template || d), g.trace.traceUiViewFill(h, e.html()); var i = a(e.contents()), j = h.$controller, k = h.$controllerAs; if (j) { var l = h.$locals, m = b(j, f.extend(l, {$scope: c})); k && (c[k] = m), e.data("$ngControllerController", m), e.children().data("$ngControllerController", m) } i(c) } } } } } var f = c(3), g = c(6); d.$inject = ["$view", "$animate", "$uiViewScroll", "$interpolate", "$q"], e.$inject = ["$compile", "$controller", "$interpolate", "$injector", "$q"], angular.module("ui.router.state").directive("uiView", d), angular.module("ui.router.state").directive("uiView", e) }, function (a, b) { function c() { var a = !1; this.useAnchorScroll = function () { a = !0 }, this.$get = ["$anchorScroll", "$timeout", function (b, c) { return a ? b : function (a) { return c(function () { a[0].scrollIntoView() }, 0, !1) } }] } angular.module("ui.router.state").provider("$uiViewScroll", c) }]) });
/** * State-based routing for AngularJS * @version v1.0.0alpha0 * @link http://angular-ui.github.com/ * @license MIT License, http://www.opensource.org/licenses/MIT */ !function (a, b) { "object" == typeof exports && "object" == typeof module ? module.exports = b() : "function" == typeof define && define.amd ? define([], b) : "object" == typeof exports ? exports["ui.router"] = b() : a["ui.router"] = b() }(this, function () { return function (a) { function b(d) { if (c[d])return c[d].exports; var e = c[d] = {exports: {}, id: d, loaded: !1}; return a[d].call(e.exports, e, e.exports, b), e.loaded = !0, e.exports } var c = {}; return b.m = a, b.c = c, b.p = "", b(0) }([function (a, b, c) { a.exports = c(1) }, function (a, b, c) { var d = c(2); b.common = d; var e = c(36); b.params = e; var f = c(15); b.path = f; var g = c(17); b.resolve = g; var h = c(12); b.state = h; var i = c(9); b.transition = i; var j = c(34); b.url = j; var k = c(49); b.view = k, Object.defineProperty(b, "__esModule", {value: !0}), b["default"] = "ui.router" }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(3)), d(c(4)), d(c(5)), d(c(6)) }, function (a, b) { function c(a) { function b(c) { return c.length >= d ? a.apply(null, c) : function () { return b(c.concat([].slice.apply(arguments))) } } var c = [].slice.apply(arguments, [1]), d = a.length; return b(c) } function d() { var a = arguments, b = a.length - 1; return function () { for (var c = b, d = a[b].apply(this, arguments); c--;)d = a[c].call(this, d); return d } } function e() { for (var a = [], b = 0; b < arguments.length; b++)a[b - 0] = arguments[b]; return d.apply(null, [].slice.call(arguments).reverse()) } function f(a, b) { return function () { for (var c = [], d = 0; d < arguments.length; d++)c[d - 0] = arguments[d]; return a.apply(null, c) && b.apply(null, c) } } function g(a, b) { return function () { for (var c = [], d = 0; d < arguments.length; d++)c[d - 0] = arguments[d]; return a.apply(null, c) || b.apply(null, c) } } function h(a, b) { return function (c) { return c[a].apply(c, b) } } function i(a) { return function (b) { for (var c = 0; c < a.length; c++)if (a[c][0](b))return a[c][1](b) } } function j(a) { void 0 === a && (a = {}); for (var b = [], c = 1; c < arguments.length; c++)b[c - 1] = arguments[c]; var d = k.apply(null, [{}].concat(b)); return J({}, d, o(a || {}, Object.keys(d))) } function k(a) { for (var b = [], c = 1; c < arguments.length; c++)b[c - 1] = arguments[c]; return I(b, function (b) { I(b, function (b, c) { a.hasOwnProperty(c) || (a[c] = b) }) }), a } function l(a, b) { var c = []; for (var d in a.path) { if (a.path[d] !== b.path[d])break; c.push(a.path[d]) } return c } function m(a, b, c) { void 0 === c && (c = Object.keys(a)); for (var d = 0; d < c.length; d++) { var e = c[d]; if (a[e] != b[e])return !1 } return !0 } function n(a, b) { var c = {}, d = Q(arguments, 2); for (var e in b)a(d, e) && (c[e] = b[e]); return c } function o(a) { return n.apply(null, [R].concat(Q(arguments))) } function p(a) { return n.apply(null, [b.not(R)].concat(Q(arguments))) } function q(a, c) { return t(a, b.prop(c)) } function r(a, b) { var c = H(a), d = c ? [] : {}, e = c ? function (a) { return d.push(a) } : function (a, b) { return d[b] = a }; return I(a, function (a, c) { b(a, c) && e(a, c) }), d } function s(a, b) { var c; return I(a, function (a, d) { c || b(a, d) && (c = a) }), c } function t(a, b) { var c = H(a) ? [] : {}; return I(a, function (a, d) { return c[d] = b(a, d) }), c } function u(a, b) { return void 0 === b && (b = "assert failure"), function (c) { if (!a(c))throw new Error(b); return !0 } } function v() { for (var a = [], c = 0; c < arguments.length; c++)a[c - 0] = arguments[c]; if (0 === a.length)return []; var d = a.reduce(function (a, b) { return Math.min(b.length, a) }, 9007199254740991); return Array.apply(null, Array(d)).map(function (c, d) { return a.map(function (a) { return a[d] }).reduce(b.pushR, []) }) } function w(a, b) { var c, d; if (H(b) && (c = b[0], d = b[1]), !F(c))throw new Error("invalid parameters to applyPairs"); return a[c] = d, a } function x(a) { if (H(a) && a.length) { var c = a.slice(0, -1), d = a.slice(-1); if (c.filter(b.not(F)).length || d.filter(b.not(D)).length)return !1 } return D(a) } function y(a) { var c = i([[H, function (a) { return a.slice(-1)[0] }], [b.val(!0), P]])(a); return c && c.toString() || "undefined" } function z(a, b) { return b.length <= a ? b : b.substr(0, a - 3) + "..." } function A(a, b) { for (; b.length < a;)b += " "; return b } function B(a) { return a.length && a[a.length - 1] || void 0 } var C = angular.isDefined, D = angular.isFunction, E = angular.isNumber, F = angular.isString, G = angular.isObject, H = angular.isArray, I = angular.forEach, J = angular.extend, K = angular.copy, L = angular.noop, M = angular.toJson, N = angular.fromJson, O = angular.equals, P = angular.identity; b.isDefined = C, b.isFunction = D, b.isNumber = E, b.isString = F, b.isObject = G, b.isArray = H, b.forEach = I, b.extend = J, b.copy = K, b.noop = L, b.toJson = M, b.fromJson = N, b.equals = O, b.identity = P, b.abstractKey = "abstract", b.curry = c, b.compose = d, b.pipe = e, b.prop = function (a) { return function (b) { return b && b[a] } }, b.propEq = c(function (a, b, c) { return c && c[a] === b }), b.parse = function (a) { return e.apply(null, a.split(".").map(b.prop)) }, b.not = function (a) { return function () { for (var b = [], c = 0; c < arguments.length; c++)b[c - 0] = arguments[c]; return !a.apply(null, b) } }, b.and = f, b.or = g, b.is = function (a) { return function (b) { return null != b && b.constructor === a || b instanceof a } }, b.eq = function (a) { return function (b) { return a === b } }, b.val = function (a) { return function () { return a } }, b.invoke = h, b.pattern = i, b.inherit = function (a, b) { return J(new (J(function () { }, {prototype: a})), b) }; var Q = function (a, b) { return void 0 === b && (b = 0), Array.prototype.concat.apply(Array.prototype, Array.prototype.slice.call(a, b)) }, R = function (a, b) { return -1 !== a.indexOf(b) }; b.removeFrom = function (a) { return function (b) { var c = a.indexOf(b); return c >= 0 && a.splice(c, 1), a } }, b.defaults = j, b.merge = k, b.mergeR = function (a, b) { return J(a, b) }, b.ancestors = l, b.equalForKeys = m, b.pick = o, b.omit = p, b.pluck = q, b.filter = r, b.find = s, b.map = t, b.values = function (a) { return Object.keys(a).map(function (b) { return a[b] }) }, b.allTrueR = function (a, b) { return a && b }, b.anyTrueR = function (a, b) { return a || b }, b.pushR = function (a, b) { return a.push(b), a }, b.unnestR = function (a, b) { return a.concat(b) }, b.flattenR = function (a, c) { return H(c) ? a.concat(c.reduce(b.flattenR, [])) : b.pushR(a, c) }, b.unnest = function (a) { return a.reduce(b.unnestR, []) }, b.flatten = function (a) { return a.reduce(b.flattenR, []) }, b.assertPredicate = u, b.pairs = function (a) { return Object.keys(a).map(function (b) { return [b, a[b]] }) }, b.arrayTuples = v, b.applyPairs = w, b.isInjectable = x, b.isNull = function (a) { return null === a }, b.isPromise = f(G, e(b.prop("then"), D)), b.fnToString = y, b.maxLength = z, b.padString = A, b.tail = B, angular.module("ui.router.util", ["ng", "ui.router.init"]), angular.module("ui.router.router", ["ui.router.util"]), angular.module("ui.router.state", ["ui.router.router", "ui.router.util", "ui.router.angular1"]), angular.module("ui.router", ["ui.router.init", "ui.router.state", "ui.router.angular1"]), angular.module("ui.router.compat", ["ui.router"]) }, function (a, b) { var c = function (a) { return function () { throw new Error(a + "(): No coreservices implementation for UI-Router is loaded. You should include one of: ['angular1.js']") } }, d = {$q: void 0, $injector: void 0, location: {}, locationConfig: {}}; b.services = d, ["replace", "url", "path", "search", "hash"].forEach(function (a) { return d.location[a] = c(a) }), ["port", "protocol", "host", "baseHref", "html5Mode", "hashPrefix"].forEach(function (a) { return d.locationConfig[a] = c(a) }) }, function (a, b) { var c = function () { function a(a) { void 0 === a && (a = []), this._items = a } return a.prototype.enqueue = function (a) { return this._items.push(a), a }, a.prototype.dequeue = function () { return this.size() ? this._items.splice(0, 1)[0] : void 0 }, a.prototype.clear = function () { var a = this._items; return this._items = [], a }, a.prototype.size = function () { return this._items.length }, a.prototype.remove = function (a) { var b = this._items.indexOf(a); return b > -1 && this._items.splice(b, 1)[0] }, a.prototype.peekTail = function () { return this._items[this._items.length - 1] }, a.prototype.peekHead = function () { return this.size() ? this._items[0] : void 0 }, a }(); b.Queue = c }, function (a, b, c) { function d(a) { return j.is(m.TransitionRejection)(a.reason) ? a.reason.toString() : "Promise(" + JSON.stringify(a) + ")" } function e(a) { var b = j.fnToString(a), c = b.match(/^(function [^ ]+\([^)]*\))/); return c ? c[1] : b } function f(a) { return j.isNumber(a) ? i[a] : i[i[a]] } function g(a) { var b = j.pattern([[j.not(j.isDefined), j.val("undefined")], [j.isNull, j.val("null")], [j.isPromise, d], [j.is(l.Transition), j.invoke("toString")], [j.is(k.Resolvable), j.invoke("toString")], [j.isInjectable, e], [j.val(!0), j.identity]]); return JSON.stringify(a, function (a, c) { return b(c) }).replace(/\\"/g, '"') } function h(a) { a.$watch(function () { q.approximateDigests++ }) } var i, j = c(3), k = c(7), l = c(8), m = c(28), n = function (a) { return "ui-view id#" + a.id + ", contextual name '" + a.name + "@" + a.creationContext + "', fqn: '" + a.fqn + "'" }, o = function (a) { return "ViewConfig targeting ui-view: '" + a.uiViewName + "@" + a.uiViewContextAnchor + "', context: '" + a.context.name + "'" }; !function (a) { a[a.RESOLVE = 0] = "RESOLVE", a[a.TRANSITION = 1] = "TRANSITION", a[a.HOOK = 2] = "HOOK", a[a.INVOKE = 3] = "INVOKE", a[a.UIVIEW = 4] = "UIVIEW", a[a.VIEWCONFIG = 5] = "VIEWCONFIG" }(i || (i = {})); var p = function () { function a() { var a = this; this._enabled = {}, this.enable = function () { for (var b = [], c = 0; c < arguments.length; c++)b[c - 0] = arguments[c]; return a._set(!0, b) }, this.disable = function () { for (var b = [], c = 0; c < arguments.length; c++)b[c - 0] = arguments[c]; return a._set(!1, b) }, this.approximateDigests = 0 } return a.prototype._set = function (a, b) { var c = this; b.length || (b = Object.keys(i).filter(function (a) { return isNaN(parseInt(a, 10)) }).map(function (a) { return i[a] })), b.map(f).forEach(function (b) { return c._enabled[b] = a }) }, a.prototype.enabled = function (a) { return !!this._enabled[f(a)] }, a.prototype.traceTransitionStart = function (a) { if (this.enabled(i.TRANSITION)) { var b = a.$id, c = this.approximateDigests, d = g(a); console.log("Transition #" + b + " Digest #" + c + ": Started -> " + d) } }, a.prototype.traceTransitionIgnored = function (a) { if (this.enabled(i.TRANSITION)) { var b = a.$id, c = this.approximateDigests, d = g(a); console.log("Transition #" + b + " Digest #" + c + ": Ignored <> " + d) } }, a.prototype.traceHookInvocation = function (a, b) { if (this.enabled(i.HOOK)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, f = j.parse("traceData.hookType")(b) || "internal", g = j.parse("traceData.context.state.name")(b) || j.parse("traceData.context")(b) || "unknown", h = e(a.fn); console.log("Transition #" + c + " Digest #" + d + ": Hook -> " + f + " context: " + g + ", " + j.maxLength(200, h)) } }, a.prototype.traceHookResult = function (a, b, c) { if (this.enabled(i.HOOK)) { var d = j.parse("transition.$id")(c), e = this.approximateDigests, f = g(a), h = g(b); console.log("Transition #" + d + " Digest #" + e + ": <- Hook returned: " + j.maxLength(200, f) + ", transition result: " + j.maxLength(200, h)) } }, a.prototype.traceResolvePath = function (a, b) { if (this.enabled(i.RESOLVE)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, e = a && a.toString(), f = b && b.resolvePolicy; console.log("Transition #" + c + " Digest #" + d + ": Resolving " + e + " (" + f + ")") } }, a.prototype.traceResolvePathElement = function (a, b, c) { if (this.enabled(i.RESOLVE) && b.length) { var d = j.parse("transition.$id")(c), e = this.approximateDigests, f = Object.keys(b).join(", "), g = a && a.toString(), h = c && c.resolvePolicy; console.log("Transition #" + d + " Digest #" + e + ": Resolve " + g + " resolvables: [" + f + "] (" + h + ")") } }, a.prototype.traceResolveResolvable = function (a, b) { if (this.enabled(i.RESOLVE)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, e = a && a.toString(); console.log("Transition #" + c + " Digest #" + d + ": Resolving -> " + e) } }, a.prototype.traceResolvableResolved = function (a, b) { if (this.enabled(i.RESOLVE)) { var c = j.parse("transition.$id")(b), d = this.approximateDigests, e = a && a.toString(), f = g(a.data); console.log("Transition #" + c + " Digest #" + d + ": <- Resolved " + e + " to: " + j.maxLength(200, f)) } }, a.prototype.tracePathElementInvoke = function (a, b, c, d) { if (this.enabled(i.INVOKE)) { var f = j.parse("transition.$id")(d), g = this.approximateDigests, h = a && a.state && a.state.toString(), k = e(b); console.log("Transition #" + f + " Digest #" + g + ": Invoke " + d.when + ": context: " + h + " " + j.maxLength(200, k)) } }, a.prototype.traceError = function (a, b) { if (this.enabled(i.TRANSITION)) { var c = b.$id, d = this.approximateDigests, e = g(b); console.log("Transition #" + c + " Digest #" + d + ": <- Rejected " + e + ", reason: " + a) } }, a.prototype.traceSuccess = function (a, b) { if (this.enabled(i.TRANSITION)) { var c = b.$id, d = this.approximateDigests, e = a.name, f = g(b); console.log("Transition #" + c + " Digest #" + d + ": <- Success " + f + ", final state: " + e) } }, a.prototype.traceUiViewEvent = function (a, b, c) { void 0 === c && (c = ""), this.enabled(i.UIVIEW) && console.log("ui-view: " + j.padString(30, a) + " " + n(b) + c) }, a.prototype.traceUiViewConfigUpdated = function (a, b) { this.enabled(i.UIVIEW) && this.traceUiViewEvent("Updating", a, " with ViewConfig from context='" + b + "'") }, a.prototype.traceUiViewScopeCreated = function (a, b) { this.enabled(i.UIVIEW) && this.traceUiViewEvent("Created scope for", a, ", scope #" + b.$id) }, a.prototype.traceUiViewFill = function (a, b) { this.enabled(i.UIVIEW) && this.traceUiViewEvent("Fill", a, " with: " + j.maxLength(200, b)) }, a.prototype.traceViewServiceEvent = function (a, b) { this.enabled(i.VIEWCONFIG) && console.log("$view.ViewConfig: " + a + " " + o(b)) }, a.prototype.traceViewServiceUiViewEvent = function (a, b) { this.enabled(i.VIEWCONFIG) && console.log("$view.ViewConfig: " + a + " " + n(b)) }, a }(), q = new p; b.trace = q, h.$inject = ["$rootScope"], angular.module("ui.router").run(h), angular.module("ui.router").service("$trace", function () { return q }) }, function (a, b, c) { var d = c(3), e = c(4), f = c(6), g = function () { function a(a, b, c) { this.promise = void 0, d.extend(this, { name: a, resolveFn: b, deps: e.services.$injector.annotate(b), data: c }) } return a.prototype.resolveResolvable = function (a, b) { var c = this; void 0 === b && (b = {}); var g = this, h = g.name, i = g.deps, j = g.resolveFn; f.trace.traceResolveResolvable(this, b); var k = e.services.$q.defer(); this.promise = k.promise; var l = a.getResolvables(null, {omitOwnLocals: [h]}), m = d.pick(l, i), n = d.map(m, function (c) { return c.get(a, b) }); return e.services.$q.all(n).then(function (a) { try { var b = e.services.$injector.invoke(j, null, a); k.resolve(b) } catch (d) { k.reject(d) } return c.promise }).then(function (a) { return c.data = a, f.trace.traceResolvableResolved(c, b), c.promise }) }, a.prototype.get = function (a, b) { return this.promise || this.resolveResolvable(a, b) }, a.prototype.toString = function () { return "Resolvable(name: " + this.name + ", requires: [" + this.deps + "])" }, a.makeResolvables = function (b) { var c = d.filter(b, d.not(d.isFunction)), e = Object.keys(c); if (e.length)throw new Error("Invalid resolve key/value: " + e[0] + "/" + c[e[0]]); return d.map(b, function (b, c) { return new a(c, b) }) }, a }(); b.Resolvable = g }, function (a, b, c) { var d = c(6), e = c(4), f = c(3), g = c(9), h = c(15), i = c(12), j = c(36), k = c(17), l = 0, m = new g.RejectFactory, n = f.prop("self"), o = function () { function a(a, b) { var c = this; if (this._deferred = e.services.$q.defer(), this.promise = this._deferred.promise, this.treeChanges = function () { return c._treeChanges }, this.isActive = function () { return c === c._options.current() }, !b.valid())throw new Error(b.error()); g.HookRegistry.mixin(new g.HookRegistry, this), this._options = f.extend({current: f.val(this)}, b.options()), this.$id = l++; var d = h.PathFactory.buildToPath(a, b); this._treeChanges = h.PathFactory.treeChanges(a, d, this._options.reloadState), h.PathFactory.bindTransitionResolve(this._treeChanges, this) } return a.prototype.$from = function () { return f.tail(this._treeChanges.from).state }, a.prototype.$to = function () { return f.tail(this._treeChanges.to).state }, a.prototype.from = function () { return this.$from().self }, a.prototype.to = function () { return this.$to().self }, a.prototype.is = function (b) { return b instanceof a ? this.is({ to: b.$to().name, from: b.$from().name }) : !(b.to && !g.matchState(this.$to(), b.to) || b.from && !g.matchState(this.$from(), b.from)) }, a.prototype.params = function (a) { return void 0 === a && (a = "to"), this._treeChanges[a].map(f.prop("values")).reduce(f.mergeR, {}) }, a.prototype.resolves = function () { return f.map(f.tail(this._treeChanges.to).resolveContext.getResolvables(), function (a) { return a.data }) }, a.prototype.addResolves = function (a, b) { void 0 === b && (b = ""); var c = "string" == typeof b ? b : b.name, d = this._treeChanges.to, e = f.find(d, function (a) { return a.state.name === c }); f.tail(d).resolveContext.addResolvables(k.Resolvable.makeResolvables(a), e.state) }, a.prototype.previous = function () { return this._options.previous || null }, a.prototype.options = function () { return this._options }, a.prototype.entering = function () { return f.map(this._treeChanges.entering, f.prop("state")).map(n) }, a.prototype.exiting = function () { return f.map(this._treeChanges.exiting, f.prop("state")).map(n).reverse() }, a.prototype.retained = function () { return f.map(this._treeChanges.retained, f.prop("state")).map(n) }, a.prototype.views = function (a, b) { void 0 === a && (a = "entering"); var c = this._treeChanges[a]; return b ? f.find(c, f.propEq("state", b)).views : f.unnest(c.map(f.prop("views"))) }, a.prototype.redirect = function (b) { var c = f.extend({}, this.options(), b.options(), {previous: this}); b = new i.TargetState(b.identifier(), b.$state(), b.params(), c); var d = new a(this._treeChanges.from, b), e = this.treeChanges().to, g = h.Node.matching(d.treeChanges().to, e), j = function (a, b) { return -1 === ["$stateParams", "$transition$"].indexOf(b) }; return g.forEach(function (a, b) { return f.extend(a.resolves, f.filter(e[b].resolves, j)) }), d }, a.prototype.ignored = function () { var a = this._treeChanges, b = a.to, c = a.from; if (this._options.reload || f.tail(b).state !== f.tail(c).state)return !1; var d = b.map(function (a) { return a.schema.filter(f.not(f.prop("dynamic"))) }), e = [b, c].map(function (a) { return a.map(f.prop("values")) }), g = e[0], h = e[1], i = f.arrayTuples(d, g, h); return i.map(function (a) { var b = a[0], c = a[1], d = a[2]; return j.Param.equals(b, c, d) }).reduce(f.allTrueR, !0) }, a.prototype.hookBuilder = function () { return new g.HookBuilder(g.$transitions, this, {transition: this, current: this._options.current}) }, a.prototype.run = function () { var a = this, b = this.hookBuilder(), c = g.TransitionHook.runSynchronousHooks, f = function () { return c(b.getOnSuccessHooks(), {}, !0) }, h = function (a) { return c(b.getOnErrorHooks(), {$error$: a}, !0) }; this.promise.then(f, h); var i = c(b.getOnBeforeHooks()); if (g.TransitionHook.isRejection(i)) { var j = i.reason; return this._deferred.reject(j), this.promise } if (!this.valid()) { var k = new Error(this.error()); return this._deferred.reject(k), this.promise } if (this.ignored()) { d.trace.traceTransitionIgnored(this); var l = m.ignored(); return this._deferred.reject(l.reason), this.promise } var n = function () { a._deferred.resolve(a), d.trace.traceSuccess(a.$to(), a) }, o = function (b) { return a._deferred.reject(b), d.trace.traceError(b, a), e.services.$q.reject(b) }; d.trace.traceTransitionStart(this); var p = b.asyncHooks().reduce(function (a, b) { return a.then(b.invokeStep) }, i); return p.then(n, o), this.promise }, a.prototype.valid = function () { return !this.error() }, a.prototype.error = function () { var a = this.$to(); return a.self[f.abstractKey] ? "Cannot transition to abstract state '" + a.name + "'" : j.Param.validates(a.parameters(), this.params()) ? void 0 : "Param values not valid for state '" + a.name + "'" }, a.prototype.toString = function () { var a = this.from(), b = this.to(), c = function (a) { return null !== a["#"] && void 0 !== a["#"] ? a : f.omit(a, "#") }, d = this.$id, e = f.isObject(a) ? a.name : a, g = f.toJson(c(this._treeChanges.from.map(f.prop("values")).reduce(f.mergeR, {}))), h = this.valid() ? "" : "(X) ", i = f.isObject(b) ? b.name : b, j = f.toJson(c(this.params())); return "Transition#" + d + "( '" + e + "'" + g + " -> " + h + "'" + i + "'" + j + " )" }, a }(); b.Transition = o }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(10)), d(c(11)), d(c(28)), d(c(8)), d(c(47)), d(c(48)) }, function (a, b, c) { var d = c(3), e = c(9), f = function () { function a(a, b, c) { var e = this; this.$transitions = a, this.transition = b, this.baseHookOptions = c, this.getOnBeforeHooks = function () { return e._buildTransitionHooks("onBefore", {}, {async: !1}) }, this.getOnStartHooks = function () { return e._buildTransitionHooks("onStart") }, this.getOnExitHooks = function () { return e._buildNodeHooks("onExit", e.treeChanges.exiting.reverse(), function (a) { return e._toFrom({from: a.state}) }) }, this.getOnRetainHooks = function () { return e._buildNodeHooks("onRetain", e.treeChanges.retained, function (a) { return e._toFrom() }) }, this.getOnEnterHooks = function () { return e._buildNodeHooks("onEnter", e.treeChanges.entering, function (a) { return e._toFrom({to: a.state}) }) }, this.getOnFinishHooks = function () { return e._buildTransitionHooks("onFinish", {$treeChanges$: e.treeChanges}) }, this.getOnSuccessHooks = function () { return e._buildTransitionHooks("onSuccess", {}, {async: !1, rejectIfSuperseded: !1}) }, this.getOnErrorHooks = function () { return e._buildTransitionHooks("onError", {}, {async: !1, rejectIfSuperseded: !1}) }, this.treeChanges = b.treeChanges(), this.toState = d.tail(this.treeChanges.to).state, this.fromState = d.tail(this.treeChanges.from).state, this.transitionOptions = b.options() } return a.prototype.asyncHooks = function () { var a = this.getOnStartHooks(), b = this.getOnExitHooks(), c = this.getOnRetainHooks(), e = this.getOnEnterHooks(), f = this.getOnFinishHooks(); return d.flatten([a, b, c, e, f]).filter(d.identity) }, a.prototype._toFrom = function (a) { return d.extend({to: this.toState, from: this.fromState}, a) }, a.prototype._buildTransitionHooks = function (a, b, c) { var e = this; void 0 === b && (b = {}), void 0 === c && (c = {}); var f = this.treeChanges.to, g = d.tail(f); c.traceData = {hookType: a, context: f}; var h = function (a) { return e.buildHook(g, a.callback, b, c) }; return this._matchingHooks(a, this._toFrom()).map(h) }, a.prototype._buildNodeHooks = function (a, b, c, d, e) { var f = this; void 0 === d && (d = {}), void 0 === e && (e = {}); var g = function (b) { var g = c(b); e.traceData = {hookType: a, context: b}, d.$state$ = b.state; var h = function (a) { return f.buildHook(b, a.callback, d, e) }; return f._matchingHooks(a, g).map(h) }; return b.map(g) }, a.prototype.buildHook = function (a, b, c, f) { void 0 === f && (f = {}); var g = d.extend({}, this.baseHookOptions, f); return new e.TransitionHook(b, d.extend({}, c), a.resolveContext, g) }, a.prototype._matchingHooks = function (a, b) { var c = function (a) { return a.matches(b.to, b.from) }, e = function (a, b) { return b.priority - a.priority }; return [this.transition, this.$transitions].map(function (b) { return b.getHooks(a) }).filter(d.assertPredicate(d.isArray, "broken event named: " + a)).reduce(d.unnestR).filter(c).sort(e) }, a }(); b.HookBuilder = f }, function (a, b, c) { function d(a, b) { function c(a) { for (var b = 0; b < d.length; b++) { var c = g.Glob.fromString(d[b]); if (c && c.matches(a.name) || !c && d[b] === a.name)return !0 } return !1 } var d = f.isString(b) ? [b] : b, e = f.isFunction(d) ? d : c; return !!e(a) } function e(a, b) { return function (c, d, e) { void 0 === e && (e = {}); var g = new h(c, d, e); return a[b].push(g), function () { f.removeFrom(a[b])(g) } } } var f = c(3), g = c(12); b.matchState = d; var h = function () { function a(a, b, c) { void 0 === c && (c = {}), this.callback = b, this.matchCriteria = f.extend({ to: f.val(!0), from: f.val(!0) }, a), this.priority = c.priority || 0 } return a.prototype.matches = function (a, b) { return d(a, this.matchCriteria.to) && d(b, this.matchCriteria.from) }, a }(); b.EventHook = h; var i = function () { function a() { var a = this; this._transitionEvents = { onBefore: [], onStart: [], onEnter: [], onRetain: [], onExit: [], onFinish: [], onSuccess: [], onError: [] }, this.getHooks = function (b) { return a._transitionEvents[b] }, this.onBefore = e(this._transitionEvents, "onBefore"), this.onStart = e(this._transitionEvents, "onStart"), this.onEnter = e(this._transitionEvents, "onEnter"), this.onRetain = e(this._transitionEvents, "onRetain"), this.onExit = e(this._transitionEvents, "onExit"), this.onFinish = e(this._transitionEvents, "onFinish"), this.onSuccess = e(this._transitionEvents, "onSuccess"), this.onError = e(this._transitionEvents, "onError") } return a.mixin = function (a, b) { Object.keys(a._transitionEvents).concat(["getHooks"]).forEach(function (c) { return b[c] = a[c] }) }, a }(); b.HookRegistry = i }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(13)), d(c(14)), d(c(41)), d(c(42)), d(c(43)), d(c(23)), d(c(44)), d(c(45)), d(c(46)), d(c(29)) }, function (a, b) { var c = function () { function a(a) { this.text = a, this.glob = a.split(".") } return a.prototype.matches = function (a) { for (var b = a.split("."), c = 0, d = this.glob.length; d > c; c++)"*" === this.glob[c] && (b[c] = "*"); return "**" === this.glob[0] && (b = b.slice(b.indexOf(this.glob[1])), b.unshift("**")), "**" === this.glob[this.glob.length - 1] && (b.splice(b.indexOf(this.glob[this.glob.length - 2]) + 1, Number.MAX_VALUE), b.push("**")), this.glob.length != b.length ? !1 : b.join("") === this.glob.join("") }, a.is = function (a) { return a.indexOf("*") > -1 }, a.fromString = function (b) { return this.is(b) ? new a(b) : null }, a }(); b.Glob = c }, function (a, b, c) { function d(a, b) { function c(a, b) { return r.builder(a, b) || this } function d(a, b) { return e.isObject(a) ? b = a : b.name = a, s.register(b), this } function l(a) { w.push(a) } function m(a, b, c, d, l, m) { function r(c, d) { function e(a) { if (a instanceof g.TargetState) { var b = a; return b = p.target(b.identifier(), b.params(), b.options()), b.valid() ? j() !== k ? v.superseded() : p.transitionTo(b.identifier(), b.params(), b.options()) : v.invalid(b.error()) } } function h() { var a = m.dequeue(); return void 0 === a ? v.invalid(d.error()) : n(a).then(e).then(function (a) { return a || h() }) } var j = function () { return t.peekTail() || u.peekTail() }, k = j(), l = i.PathFactory.makeTargetState(c), m = new f.Queue([].concat(w)), n = function (c) { return a.when(b.invoke(c, null, {$to$: d, $from$: l})) }; return h() } var x = m, y = { name: "", url: "^", views: null, params: {"#": {value: null, type: "hash"}}, "abstract": !0 }; n = s.register(y, !0), n.navigable = null; var z = function () { return i.PathFactory.bindTransNodesToPath([new i.Node(n, {})]) }; return c.rootContext(n), e.extend(p, { params: new k.StateParams, current: n.self, $current: n, transition: null }), s.flush(p), s.autoFlush = !0, p.reload = function (a) { return p.transitionTo(p.current, d, {reload: e.isDefined(a) ? a : !0, inherit: !1, notify: !1}) }, p.go = function (a, b, c) { var d = {relative: p.$current, inherit: !0}, f = e.defaults(c, d, h.defaultTransOpts); return p.transitionTo(a, b, f) }, p.target = function (a, b, c) { void 0 === c && (c = {}); var d = q.find(a, c.relative); return new g.TargetState(a, d, b, c) }, p.transitionTo = function (b, f, g) { if (void 0 === f && (f = {}), void 0 === g && (g = {}), g = e.defaults(g, h.defaultTransOpts), g = e.extend(g, {current: t.peekTail.bind(t)}), e.isObject(g.reload) && !g.reload.name)throw new Error("Invalid reload state object"); if (g.reloadState = g.reload === !0 ? p.$current.path[0] : q.find(g.reload, g.relative), g.reload && !g.reloadState)throw new Error("No such reload state '" + (e.isString(g.reload) ? g.reload : g.reload.name) + "'"); var i = p.target(b, f, g), k = u.peekTail(), m = k ? k.to : z(); if (!i.exists())return r(m, i); if (!i.valid())return a.reject(i.error()); var n = x.create(m, i), o = new j.TransitionManager(n, x, l, c, p, d, a, t, u), s = o.runTransition(); return e.extend(s, {transition: n}) }, p.is = function (a, b, c) { c = e.defaults(c, {relative: p.$current}); var f = q.find(a, c.relative); return e.isDefined(f) ? p.$current !== f ? !1 : e.isDefined(b) && null !== b ? k.Param.equals(f.parameters(), d, b) : !0 : void 0 }, p.includes = function (a, b, c) { c = e.defaults(c, {relative: p.$current}); var f = e.isString(a) && g.Glob.fromString(a); if (f) { if (!f.matches(p.$current.name))return !1; a = p.$current.name } var h = q.find(a, c.relative), i = p.$current.includes; return e.isDefined(h) ? e.isDefined(i[h.name]) ? b ? e.equalForKeys(k.Param.values(h.parameters(), b), d, Object.keys(b)) : !0 : !1 : void 0 }, p.href = function (a, b, c) { var f = {lossy: !0, inherit: !0, absolute: !1, relative: p.$current}; c = e.defaults(c, f); var g = q.find(a, c.relative); if (!e.isDefined(g))return null; c.inherit && (b = d.$inherit(b || {}, p.$current, g)); var h = g && c.lossy ? g.navigable : g; return h && void 0 !== h.url && null !== h.url ? l.href(h.url, k.Param.values(g.parameters(), b), {absolute: c.absolute}) : null }, p.get = function (a, b) { if (0 === arguments.length)return Object.keys(o).map(function (a) { return o[a].self }); var c = q.find(a, b || p.$current); return c && c.self || null }, p } var n, o = {}, p = function () { }, q = new g.StateMatcher(o), r = new g.StateBuilder(function () { return n }, q, b), s = new g.StateQueueManager(o, r, a, p), t = new f.Queue, u = new f.Queue, v = new h.RejectFactory; this.decorator = c, this.state = d; var w = []; this.onInvalid = l, this.$get = m, m.$inject = ["$q", "$injector", "$view", "$stateParams", "$urlRouter", "$transitions"] } var e = c(3), f = c(5), g = c(12), h = c(9), i = c(15), j = c(23), k = c(36); b.$StateProvider = d }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(16)), d(c(22)) }, function (a, b, c) { var d = c(3), e = c(17), f = c(21), g = function () { function a(a, b, c) { void 0 === c && (c = {}), this.state = a, this.schema = a.parameters({inherit: !1}); var g = function (a) { return [a.id, a.value(b[a.id])] }; this.values = this.schema.reduce(function (a, b) { return d.applyPairs(a, g(b)) }, {}), this.resolves = d.extend(d.map(a.resolve, function (a, b) { return new e.Resolvable(b, a) }), c); var h = function (c, d) { return new f.ViewConfig({rawViewName: d, viewDeclarationObj: c, context: a, params: b}) }; this.views = d.values(d.map(a.views, h)) } return a.prototype.parameter = function (a) { return d.find(this.schema, d.propEq("id", a)) }, a.prototype.equals = function (a, b) { var c = this; void 0 === b && (b = this.schema.map(d.prop("id"))); var e = function (b) { return c.parameter(b).type.equals(c.values[b], a.values[b]) }; return this.state === a.state && b.map(e).reduce(d.allTrueR, !0) }, a.clone = function (b, c) { return void 0 === c && (c = {}), new a(b.state, c.values || b.values, c.resolves || b.resolves) }, a.matching = function (a, b) { var c = a.reduce(function (a, c, d) { return a === d && d < b.length && c.state === b[d].state ? d + 1 : a }, 0); return a.slice(0, c) }, a }(); b.Node = g }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(7)), d(c(18)), d(c(20)) }, function (a, b, c) { function d(a, b) { var c = e.isString(a) ? a : null, d = e.isObject(a) ? a : {}, f = d[b.name] || c || i; return h.ResolvePolicy[f] } var e = c(3), f = c(6), g = c(4), h = c(19), i = h.ResolvePolicy[h.ResolvePolicy.LAZY], j = function () { function a(a) { this._path = a, e.extend(this, { _nodeFor: function (a) { return e.find(this._path, e.propEq("state", a)) }, _pathTo: function (a) { var b = this._nodeFor(a), c = this._path.indexOf(b); if (-1 === c)throw new Error("This path does not contain the state"); return this._path.slice(0, c + 1) } }) } return a.prototype.getResolvables = function (a, b) { b = e.defaults(b, {omitOwnLocals: []}); var c = (e.find(this._path, e.propEq("")), a ? this._pathTo(a) : this._path), d = e.tail(c); return c.reduce(function (a, c) { var f = c === d ? b.omitOwnLocals : [], g = e.omit(c.resolves, f); return e.extend(a, g) }, {}) }, a.prototype.getResolvablesForFn = function (a) { var b = g.services.$injector.annotate(a); return e.pick(this.getResolvables(), b) }, a.prototype.isolateRootTo = function (b) { return new a(this._pathTo(b)) }, a.prototype.addResolvables = function (a, b) { e.extend(this._nodeFor(b).resolves, a) }, a.prototype.getOwnResolvables = function (a) { return e.extend({}, this._nodeFor(a).resolves) }, a.prototype.resolvePath = function (a) { var b = this; void 0 === a && (a = {}), f.trace.traceResolvePath(this._path, a); var c = function (c) { return b.resolvePathElement(c.state, a) }; return g.services.$q.all(e.map(this._path, c)).then(e.noop) }, a.prototype.resolvePathElement = function (a, b) { var c = this; void 0 === b && (b = {}); var j = b && b.resolvePolicy, k = h.ResolvePolicy[j || i], l = this.getOwnResolvables(a), m = function (b) { return d(a.resolvePolicy, b) >= k }, n = e.filter(l, m), o = function (d) { return d.get(c.isolateRootTo(a), b) }, p = e.map(n, o); return f.trace.traceResolvePathElement(this, n, b), g.services.$q.all(p).then(e.noop) }, a.prototype.invokeLater = function (a, b, c) { var d = this; void 0 === b && (b = {}), void 0 === c && (c = {}); var h = this.getResolvablesForFn(a); f.trace.tracePathElementInvoke(e.tail(this._path), a, Object.keys(h), e.extend({when: "Later"}, c)); var i = function (a) { return a.get(d, c) }, j = e.map(h, i); return g.services.$q.all(j).then(function () { try { return d.invokeNow(a, b, c) } catch (e) { return g.services.$q.reject(e) } }) }, a.prototype.invokeNow = function (a, b, c) { void 0 === c && (c = {}); var d = this.getResolvablesForFn(a); f.trace.tracePathElementInvoke(e.tail(this._path), a, Object.keys(d), e.extend({when: "Now "}, c)); var h = e.map(d, e.prop("data")); return g.services.$injector.invoke(a, null, e.extend({}, b, h)) }, a }(); b.ResolveContext = j }, function (a, b) { !function (a) { a[a.JIT = 0] = "JIT", a[a.LAZY = 1] = "LAZY", a[a.EAGER = 2] = "EAGER" }(b.ResolvePolicy || (b.ResolvePolicy = {})); b.ResolvePolicy }, function (a, b, c) { var d = c(3), e = function () { function a(a, b) { this._resolveContext = a, this._state = b } return a.prototype.invokeLater = function (a, b) { return this._resolveContext.invokeLater(a, b) }, a.prototype.invokeNow = function (a, b) { return this._resolveContext.invokeNow(null, a, b) }, a.prototype.getLocals = function (a) { var b = this, c = function (a) { return a.get(b._resolveContext) }; return d.map(this._resolveContext.getResolvablesForFn(a), c) }, a }(); b.ResolveInjector = e }, function (a, b, c) { "use strict"; function d(a) { void 0 === a && (a = ""); var b = a.split("@"), c = b[0] || "$default", d = f.isString(b[1]) ? b[1] : "^", e = /^(\^(?:\.\^)*)\.(.*$)/.exec(c); return e && (d = e[1], c = e[2]), "!" === c.charAt(0) && (c = c.substr(1), d = ""), { uiViewName: c, uiViewContextAnchor: d } } function e(a, b, c, d) { var e = [], h = [], i = function (a) { for (var b = [], c = 1; c < arguments.length; c++)b[c - 1] = arguments[c]; return function (c) { return b.reduce(function (b, d) { return b && a[d] === c[d] }, !0) } }; this.rootContext = function (a) { return a ? this._rootContext = a : this._rootContext }, this.load = function (a, d) { if (!a.hasTemplate())throw new Error("No template configuration specified for '" + a.uiViewName + "@" + a.uiViewContextAnchor + "'"); var e = {template: c.when(a.getTemplate(b, d)), controller: c.when(a.getController(d))}; return c.all(e).then(function (b) { return g.trace.traceViewServiceEvent("Loaded", a), f.extend(a, b) }) }, this.reset = function (a) { g.trace.traceViewServiceEvent("<- Removing", a), h.filter(i(a, "uiViewName", "context")).forEach(f.removeFrom(h)) }, this.registerStateViewConfig = function (a) { g.trace.traceViewServiceEvent("-> Registering", a), h.push(a) }, this.sync = function () { function a(a) { return a.fqn.split(".").length } function b(a) { for (var b = a.context, c = 0; ++c && b.parent;)b = b.parent; return c } var c = e.map(function (a) { return [a.fqn, a] }).reduce(f.applyPairs, {}), d = f.curry(function (a, b) { var d = b.uiViewName.split("."), e = a.fqn.split("."); if (!angular.equals(d, e.slice(0 - d.length)))return !1; var f = 1 - d.length || void 0, g = e.slice(0, f).join("."), h = c[g].creationContext; return b.uiViewContextAnchor === (h && h.name) }), g = f.curry(function (a, b, c, d) { return b * (a(c) - a(d)) }), i = function (a) { var c = h.filter(d(a)); return c.length > 1 && c.sort(g(b, -1)), [a, c[0]] }, j = function (a) { var b = a[0], c = a[1]; -1 !== e.indexOf(b) && b.configUpdated(c) }; e.sort(g(a, 1)).map(i).forEach(j) }, this.registerUiView = function (a) { g.trace.traceViewServiceUiViewEvent("-> Registering", a); var b = function (b) { return b.fqn === a.fqn }; return e.filter(b).length && g.trace.traceViewServiceUiViewEvent("!!!! duplicate uiView named:", a), e.push(a), this.sync(), function () { var b = e.indexOf(a); return 0 >= b ? void g.trace.traceViewServiceUiViewEvent("Tried removing non-registered uiView", a) : (g.trace.traceViewServiceUiViewEvent("<- Deregistering", a), void f.removeFrom(e)(a)) } }, this.available = function () { return e.map(f.prop("fqn")) }, this.active = function () { return e.filter(f.prop("$config")).map(f.prop("name")) } } var f = c(3), g = c(2), h = function () { function a(a) { var b = d(a.rawViewName), c = b.uiViewName, e = b.uiViewContextAnchor, g = /^(\^(?:\.\^)*)$/; if (g.exec(e)) { var h = e.split(".").reduce(function (a, b) { return a.parent }, a.context); e = h.name } f.extend(this, f.pick(a, "viewDeclarationObj", "params", "context", "locals"), { uiViewName: c, uiViewContextAnchor: e }), this.controllerAs = a.viewDeclarationObj.controllerAs } return a.prototype.hasTemplate = function () { var a = this.viewDeclarationObj; return !!(a.template || a.templateUrl || a.templateProvider) }, a.prototype.getTemplate = function (a, b) { return a.fromConfig(this.viewDeclarationObj, this.params, b.invokeLater.bind(b)) }, a.prototype.getController = function (a) { var b = this.viewDeclarationObj.controllerProvider; return f.isInjectable(b) ? a.invokeLater(b, {}) : this.viewDeclarationObj.controller }, a }(); b.ViewConfig = h, e.$inject = ["$rootScope", "$templateFactory", "$q", "$timeout"], angular.module("ui.router.state").service("$view", e) }, function (a, b, c) { var d = c(3), e = c(12), f = c(15), g = c(17), h = function () { function a() { } return a.makeTargetState = function (a) { var b = d.tail(a).state; return new e.TargetState(b, b, a.map(d.prop("values")).reduce(d.mergeR, {})) }, a.buildToPath = function (b, c) { var d = c.params(), e = a.makeParamsNode(d), f = c.$state().path.map(e); return c.options().inherit && (f = a.inheritParams(b, f, Object.keys(d))), f }, a.inheritParams = function (a, b, c) { function e(a, b) { var c = d.find(a, d.propEq("state", b)); return d.extend({}, c && c.values) } void 0 === c && (c = []); var g = d.curry(function (a, b, c) { var g = d.extend({}, c && c.values), h = d.pick(g, b); g = d.omit(g, b); var i = e(a, c.state) || {}, j = d.extend(g, i, h); return new f.Node(c.state, j) }); return b.map(g(a, c)) }, a.bindTransNodesToPath = function (a) { var b = new g.ResolveContext(a); return a.forEach(function (a) { a.resolveContext = b.isolateRootTo(a.state), a.resolveInjector = new g.ResolveInjector(a.resolveContext, a.state), a.resolves.$stateParams = new g.Resolvable("$stateParams", function () { return a.values }, a.values) }), a }, a.treeChanges = function (b, c, e) { function g(a, b) { return f.Node.clone(a, {values: c[b].values}) } for (var h = 0, i = Math.min(b.length, c.length), j = function (a) { return a.parameters({inherit: !1}).filter(d.not(d.prop("dynamic"))).map(d.prop("id")) }, k = function (a, b) { return a.equals(b, j(a.state)) }; i > h && b[h].state !== e && k(b[h], c[h]);)h++; var l, m, n, o, p, q, r, s; return l = b, m = l.slice(0, h), n = l.slice(h), q = m.map(g), r = c.slice(h), s = q.concat(r), p = a.bindTransNodesToPath(s), o = p.slice(h), { from: l, to: p, retained: m, exiting: n, entering: o } }, a.bindTransitionResolve = function (a, b) { var c = a.to[0]; c.resolves.$transition$ = new g.Resolvable("$transition$", function () { return b }, b) }, a.makeParamsNode = d.curry(function (a, b) { return new f.Node(b, a) }), a }(); b.PathFactory = h }, function (a, b, c) { var d = c(3), e = c(24), f = c(28), g = c(29), h = c(30), i = c(39), j = c(40), k = function () { function a(a, b, c, d, e, f, g, k, l) { this.transition = a, this.$transitions = b, this.$urlRouter = c, this.$view = d, this.$state = e, this.$stateParams = f, this.$q = g, this.activeTransQ = k, this.changeHistory = l, this.viewHooks = new h.ViewHooks(a, d), this.enterExitHooks = new i.EnterExitHooks(a), this.resolveHooks = new j.ResolveHooks(a), this.treeChanges = a.treeChanges(), this.registerUpdateGlobalState(), this.viewHooks.registerHooks(), this.enterExitHooks.registerHooks(), this.resolveHooks.registerHooks() } return a.prototype.runTransition = function () { var a = this; return this.activeTransQ.clear(), this.activeTransQ.enqueue(this.transition), this.transition.run().then(function (a) { return a.to() })["catch"](function (b) { return a.transRejected(b) })["finally"](function () { return a.activeTransQ.remove(a.transition) }) }, a.prototype.registerUpdateGlobalState = function () { this.transition.onFinish({}, this.updateGlobalState.bind(this), {priority: -1e4}) }, a.prototype.updateGlobalState = function () { var a = this, b = a.treeChanges, c = a.transition, d = a.$state, e = a.changeHistory; d.$current = c.$to(), d.current = d.$current.self, e.enqueue(b), this.updateStateParams() }, a.prototype.transRejected = function (a) { var b = this, c = b.transition, h = b.$state, i = b.$stateParams, j = b.$q; if (a instanceof f.TransitionRejection) { if (a.type === f.RejectType.IGNORED) { var k = h.$current.parameters().filter(d.prop("dynamic")); return e.Param.equals(k, i, c.params()) || this.updateStateParams(), h.current } if (a.type === f.RejectType.SUPERSEDED && a.redirected && a.detail instanceof g.TargetState)return this._redirectMgr(c.redirect(a.detail)).runTransition() } return this.$transitions.defaultErrorHandler()(a), j.reject(a) }, a.prototype.updateStateParams = function () { var a = this, b = a.transition, c = a.$urlRouter, e = a.$state, f = a.$stateParams, g = b.options(); e.params = b.params(), d.copy(e.params, f), f.$sync().$off(), g.location && e.$current.navigable && c.push(e.$current.navigable.url, f, {replace: "replace" === g.location}), c.update(!0) }, a.prototype._redirectMgr = function (b) { var c = this, d = c.$transitions, e = c.$urlRouter, f = c.$view, g = c.$state, h = c.$stateParams, i = c.$q, j = c.activeTransQ, k = c.changeHistory; return new a(b, d, e, f, g, h, i, j, k) }, a }(); b.TransitionManager = k }, function (a, b, c) { var d, e = c(3), f = c(4), g = c(25), h = c(26), i = c(27), j = Object.prototype.hasOwnProperty, k = function (a) { return 0 === ["value", "type", "squash", "array", "dynamic"].filter(j.bind(a || {})).length }; !function (a) { a[a.PATH = 0] = "PATH", a[a.SEARCH = 1] = "SEARCH", a[a.CONFIG = 2] = "CONFIG" }(d || (d = {})); var l = function () { function a(a, b, c, f) { function j(a) { return a = k(a) && {value: a} || a, e.extend(a, { $$fn: e.isInjectable(a.value) ? a.value : function () { return a.value } }) } function l(b, c, e) { if (b.type && c && "string" !== c.name)throw new Error("Param '" + a + "' has two type configurations."); return b.type && c && "string" === c.name && i.paramTypes.type(b.type) ? i.paramTypes.type(b.type) : c ? c : b.type ? b.type instanceof h.Type ? b.type : i.paramTypes.type(b.type) : e === d.CONFIG ? i.paramTypes.type("any") : i.paramTypes.type("string") } function m() { var b = {array: f === d.SEARCH ? "auto" : !1}, g = a.match(/\[\]$/) ? {array: !0} : {}; return e.extend(b, g, c).array } function n(a, b) { var c = a.squash; if (!b || c === !1)return !1; if (!e.isDefined(c) || null == c)return g.matcherConfig.defaultSquashPolicy(); if (c === !0 || e.isString(c))return c; throw new Error("Invalid squash policy: '" + c + "'. Valid policies: false, true, or arbitrary string") } function o(a, b, c, d) { var f, g, h = [{from: "", to: c || b ? void 0 : ""}, {from: null, to: c || b ? void 0 : ""}]; return f = e.isArray(a.replace) ? a.replace : [], e.isString(d) && f.push({ from: d, to: void 0 }), g = e.map(f, e.prop("from")), e.filter(h, function (a) { return -1 === g.indexOf(a.from) }).concat(f) } c = j(c), b = l(c, b, f); var p = m(); b = p ? b.$asArray(p, f === d.SEARCH) : b; var q = void 0 !== c.value, r = c.dynamic === !0, s = n(c, q), t = o(c, p, q, s); e.extend(this, { id: a, type: b, location: f, squash: s, replace: t, isOptional: q, dynamic: r, config: c, array: p }) } return a.prototype.isDefaultValue = function (a) { return this.isOptional && this.type.equals(this.value(), a) }, a.prototype.value = function (a) { var b = this, c = function () { if (!f.services.$injector)throw new Error("Injectable functions cannot be called at configuration time"); var a = f.services.$injector.invoke(b.config.$$fn); if (null !== a && void 0 !== a && !b.type.is(a))throw new Error("Default value (" + a + ") for parameter '" + b.id + "' is not an instance of Type (" + b.type.name + ")"); return a }, d = function (a) { var c = e.map(e.filter(b.replace, e.propEq("from", a)), e.prop("to")); return c.length ? c[0] : a }; return a = d(a), e.isDefined(a) ? this.type.$normalize(a) : c() }, a.prototype.isSearch = function () { return this.location === d.SEARCH }, a.prototype.validates = function (a) { if ((!e.isDefined(a) || null === a) && this.isOptional)return !0; var b = this.type.$normalize(a); if (!this.type.is(b))return !1; var c = this.type.encode(b); return e.isString(c) && !this.type.pattern.exec(c) ? !1 : !0 }, a.prototype.toString = function () { return "{Param:" + this.id + " " + this.type + " squash: '" + this.squash + "' optional: " + this.isOptional + "}" }, a.fromConfig = function (b, c, e) { return new a(b, c, e, d.CONFIG) }, a.fromPath = function (b, c, e) { return new a(b, c, e, d.PATH) }, a.fromSearch = function (b, c, e) { return new a(b, c, e, d.SEARCH) }, a.values = function (a, b) { return b = b || {}, a.map(function (a) { return [a.id, a.value(b[a.id])] }).reduce(e.applyPairs, {}) }, a.equals = function (a, b, c) { return b = b || {}, c = c || {}, -1 === a.map(function (a) { return a.type.equals(b[a.id], c[a.id]) }).indexOf(!1) }, a.validates = function (a, b) { return b = b || {}, -1 === a.map(function (a) { return a.validates(b[a.id]) }).indexOf(!1) }, a }(); b.Param = l }, function (a, b, c) { var d = c(3), e = function () { function a() { this._isCaseInsensitive = !1, this._isStrictMode = !0, this._defaultSquashPolicy = !1 } return a.prototype.caseInsensitive = function (a) { return this._isCaseInsensitive = d.isDefined(a) ? a : this._isCaseInsensitive }, a.prototype.strictMode = function (a) { return this._isStrictMode = d.isDefined(a) ? a : this._isStrictMode }, a.prototype.defaultSquashPolicy = function (a) { if (d.isDefined(a) && a !== !0 && a !== !1 && !d.isString(a))throw new Error("Invalid squash policy: " + a + ". Valid policies: false, true, arbitrary-string"); return this._defaultSquashPolicy = d.isDefined(a) ? a : this._defaultSquashPolicy }, a }(); b.matcherConfig = new e }, function (a, b, c) { function d(a, b) { function c(a) { return e.isArray(a) ? a : e.isDefined(a) ? [a] : [] } function d(a) { switch (a.length) { case 0: return void 0; case 1: return "auto" === b ? a[0] : a; default: return a } } function f(a, b) { return function (f) { var g = c(f), h = e.map(g, a); return b === !0 ? 0 === e.filter(h, function (a) { return !a }).length : d(h) } } function g(a) { return function (b, d) { var e = c(b), f = c(d); if (e.length !== f.length)return !1; for (var g = 0; g < e.length; g++)if (!a(e[g], f[g]))return !1; return !0 } } var h = this; ["encode", "decode", "equals", "$normalize"].map(function (b) { h[b] = ("equals" === b ? g : f)(a[b].bind(a)) }), e.extend(this, {name: a.name, pattern: a.pattern, is: f(a.is.bind(a), !0), $arrayMode: b}) } var e = c(3), f = function () { function a(a) { this.pattern = /.*/, e.extend(this, a) } return a.prototype.is = function (a, b) { return !0 }, a.prototype.encode = function (a, b) { return a }, a.prototype.decode = function (a, b) { return a }, a.prototype.equals = function (a, b) { return a == b }, a.prototype.$subPattern = function () { var a = this.pattern.toString(); return a.substr(1, a.length - 2) }, a.prototype.toString = function () { return "{Type:" + this.name + "}" }, a.prototype.$normalize = function (a) { return this.is(a) ? a : this.decode(a) }, a.prototype.$asArray = function (a, b) { if (!a)return this; if ("auto" === a && !b)throw new Error("'auto' array mode is for query parameters only"); return new d(this, a) }, a }(); b.Type = f }, function (a, b, c) { var d = c(3), e = c(4), f = c(26), g = function (a, b) { return function (c) { return null != c ? c.toString().replace(a, b) : c } }, h = g(/\//g, "%2F"), i = g(/%2F/g, "/"), j = function () { function a() { this.enqueue = !0, this.typeQueue = [], this.defaultTypes = { hash: { encode: h, decode: i, is: d.is(String), pattern: /.*/, equals: d.val(!0) }, string: {encode: h, decode: i, is: d.is(String), pattern: /[^\/]*/}, "int": { encode: h, decode: function (a) { return parseInt(a, 10) }, is: function (a) { return d.isDefined(a) && this.decode(a.toString()) === a }, pattern: /-?\d+/ }, bool: { encode: function (a) { return a && 1 || 0 }, decode: function (a) { return 0 !== parseInt(a, 10) }, is: d.is(Boolean), pattern: /0|1/ }, date: { encode: function (a) { return this.is(a) ? [a.getFullYear(), ("0" + (a.getMonth() + 1)).slice(-2), ("0" + a.getDate()).slice(-2)].join("-") : void 0 }, decode: function (a) { if (this.is(a))return a; var b = this.capture.exec(a); return b ? new Date(b[1], b[2] - 1, b[3]) : void 0 }, is: function (a) { return a instanceof Date && !isNaN(a.valueOf()) }, equals: function (a, b) { return this.is(a) && this.is(b) && a.toISOString() === b.toISOString() }, pattern: /[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/, capture: /([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/ }, json: {encode: d.toJson, decode: d.fromJson, is: d.is(Object), equals: d.equals, pattern: /[^\/]*/}, any: {encode: d.identity, decode: d.identity, equals: d.equals, pattern: /.*/} }; var a = function (a, b) { return new f.Type(d.extend({name: b}, a)) }; this.types = d.inherit(d.map(this.defaultTypes, a), {}) } return a.prototype.type = function (a, b, c) { if (!d.isDefined(b))return this.types[a]; if (this.types.hasOwnProperty(a))throw new Error("A type named '" + a + "' has already been defined."); return this.types[a] = new f.Type(d.extend({name: a}, b)), c && (this.typeQueue.push({ name: a, def: c }), this.enqueue || this._flushTypeQueue()), this }, a.prototype._flushTypeQueue = function () { for (; this.typeQueue.length;) { var a = this.typeQueue.shift(); if (a.pattern)throw new Error("You cannot override a type's .pattern at runtime."); d.extend(this.types[a.name], e.services.$injector.invoke(a.def)) } }, a }(); b.paramTypes = new j }, function (a, b, c) { "use strict"; var d = c(3), e = c(4); !function (a) { a[a.SUPERSEDED = 2] = "SUPERSEDED", a[a.ABORTED = 3] = "ABORTED", a[a.INVALID = 4] = "INVALID", a[a.IGNORED = 5] = "IGNORED" }(b.RejectType || (b.RejectType = {})); var f = b.RejectType, g = function () { function a(a, b, c) { d.extend(this, {type: a, message: b, detail: c}) } return a.prototype.toString = function () { var a = function (a) { return a && a.toString !== Object.prototype.toString ? a.toString() : JSON.stringify(a) }, b = this.type, c = this.message, d = a(this.detail); return "TransitionRejection(type: " + b + ", message: " + c + ", detail: " + d + ")" }, a }(); b.TransitionRejection = g; var h = function () { function a() { } return a.prototype.superseded = function (a, b) { var c = "The transition has been superseded by a different transition (see detail).", h = new g(f.SUPERSEDED, c, a); return b && b.redirected && (h.redirected = !0), d.extend(e.services.$q.reject(h), {reason: h}) }, a.prototype.redirected = function (a) { return this.superseded(a, {redirected: !0}) }, a.prototype.invalid = function (a) { var b = "This transition is invalid (see detail)", c = new g(f.INVALID, b, a); return d.extend(e.services.$q.reject(c), {reason: c}) }, a.prototype.ignored = function (a) { var b = "The transition was ignored.", c = new g(f.IGNORED, b, a); return d.extend(e.services.$q.reject(c), {reason: c}) }, a.prototype.aborted = function (a) { var b = "The transition has been aborted.", c = new g(f.ABORTED, b, a); return d.extend(e.services.$q.reject(c), {reason: c}) }, a }(); b.RejectFactory = h }, function (a, b) { var c = function () { function a(a, b, c, d) { void 0 === c && (c = {}), void 0 === d && (d = {}), this._identifier = a, this._definition = b, this._options = d, this._params = c || {} } return a.prototype.name = function () { return this._definition && this._definition.name || this._identifier }, a.prototype.identifier = function () { return this._identifier }, a.prototype.params = function () { return this._params }, a.prototype.$state = function () { return this._definition }, a.prototype.state = function () { return this._definition && this._definition.self }, a.prototype.options = function () { return this._options }, a.prototype.exists = function () { return !(!this._definition || !this._definition.self) }, a.prototype.valid = function () { return !this.error() }, a.prototype.error = function () { var a = this.options().relative; if (!this._definition && a) { var b = a.name ? a.name : a; return "Could not resolve '" + this.name() + "' from state '" + b + "'" } return this._definition ? this._definition.self ? void 0 : "State '" + this.name() + "' has an invalid definition" : "No such state '" + this.name() + "'" }, a }(); b.TargetState = c }, function (a, b, c) { var d = c(3), e = c(4), f = c(31), g = function () { function a(a, b) { this.transition = a, this.$view = b, this.treeChanges = a.treeChanges(), this.enteringViews = a.views("entering"), this.exitingViews = a.views("exiting") } return a.prototype.loadAllEnteringViews = function () { var a = this, b = function (b) { var c = d.find(a.treeChanges.to, d.propEq("state", b.context)).resolveInjector; return a.$view.load(b, c) }; return e.services.$q.all(this.enteringViews.map(b)).then(d.noop) }, a.prototype.loadAllControllerLocals = function () { var a = this, b = function (b) { function c() { } var g = f.annotateController(b.controller), h = d.find(a.treeChanges.to, d.propEq("state", b.context)).resolveInjector; return c.$inject = g, e.services.$q.all(h.getLocals(c)).then(function (a) { return b.locals = a }) }, c = this.enteringViews.filter(function (a) { return !!a.controller }).map(b); return e.services.$q.all(c).then(d.noop) }, a.prototype.updateViews = function () { var a = this.$view; this.exitingViews.forEach(function (b) { return a.reset(b) }), this.enteringViews.forEach(function (b) { return a.registerStateViewConfig(b) }), a.sync() }, a.prototype.registerHooks = function () { this.enteringViews.length && (this.transition.onStart({}, this.loadAllEnteringViews.bind(this)), this.transition.onFinish({}, this.loadAllControllerLocals.bind(this))), (this.exitingViews.length || this.enteringViews.length) && this.transition.onSuccess({}, this.updateViews.bind(this)) }, a }(); b.ViewHooks = g }, function (a, b, c) { function d(a) { var b = h.services.$injector, c = b.get("$controller"), d = b.instantiate; try { var e; return b.instantiate = function (a) { b.instantiate = d, e = b.annotate(a) }, c(a, {$scope: {}}), e } finally { b.instantiate = d } } function e(a, b) { h.services.$injector = a, h.services.$q = b } function f(a) { function b(b, c, d) { return h.services.locationConfig.html5Mode = function () { var b = a.html5Mode(); return b = i.isObject(b) ? b.enabled : b, b && d.history }, k(["replace", "url", "path", "search", "hash"], b, h.services.location), k(["port", "protocol", "host"], b, h.services.locationConfig), k(["baseHref"], c, h.services.locationConfig), l } l = new g.Router, k(["hashPrefix"], a, h.services.locationConfig), this.$get = b, b.$inject = ["$location", "$browser", "$sniffer"] } var g = c(32), h = c(4), i = c(3), j = angular.module("ui.router.angular1", []); b.annotateController = d, e.$inject = ["$injector", "$q"], j.run(e); var k = function (a, b, c) { return a.forEach(function (a) { return c[a] = b[a].bind(b) }) }, l = null; f.$inject = ["$locationProvider"], angular.module("ui.router.init", []).provider("ng1UIRouter", f), angular.module("ui.router.util").provider("$urlMatcherFactory", ["ng1UIRouterProvider", function () { return l.urlMatcherFactory }]), angular.module("ui.router.router").provider("$urlRouter", ["ng1UIRouterProvider", function () { return l.urlRouterProvider }]), angular.module("ui.router.state").provider("$state", ["ng1UIRouterProvider", function () { return l.stateProvider }]), angular.module("ui.router.init").run(["ng1UIRouter", function (a) { }]), angular.module("ui.router.state").run(["$state", function (a) { }]), angular.module("ui.router.util").run(["$urlMatcherFactory", function (a) { }]) }, function (a, b, c) { var d = c(33), e = c(38), f = c(14), g = function () { function a() { this.urlMatcherFactory = new d.UrlMatcherFactory, this.urlRouterProvider = new e.$UrlRouterProvider(this.urlMatcherFactory), this.stateProvider = new f.$StateProvider(this.urlRouterProvider, this.urlMatcherFactory) } return a }(); b.Router = g }, function (a, b, c) { function d() { return {strict: f.matcherConfig.strictMode(), caseInsensitive: f.matcherConfig.caseInsensitive()} } var e = c(3), f = c(34), g = c(36), h = function () { function a() { e.extend(this, {UrlMatcher: f.UrlMatcher, Param: g.Param}) } return a.prototype.caseInsensitive = function (a) { return f.matcherConfig.caseInsensitive(a) }, a.prototype.strictMode = function (a) { return f.matcherConfig.strictMode(a) }, a.prototype.defaultSquashPolicy = function (a) { return f.matcherConfig.defaultSquashPolicy(a) }, a.prototype.compile = function (a, b) { return new f.UrlMatcher(a, e.extend(d(), b)) }, a.prototype.isMatcher = function (a) { if (!e.isObject(a))return !1; var b = !0; return e.forEach(f.UrlMatcher.prototype, function (c, d) { e.isFunction(c) && (b = b && e.isDefined(a[d]) && e.isFunction(a[d])) }), b }, a.prototype.type = function (a, b, c) { var d = g.paramTypes.type(a, b, c); return e.isDefined(b) ? this : d }, a.prototype.$get = function () { return g.paramTypes.enqueue = !1, g.paramTypes._flushTypeQueue(), this }, a }(); b.UrlMatcherFactory = h }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(35)), d(c(25)), d(c(33)), d(c(38)) }, function (a, b, c) { function d(a, b) { var c = ["", ""], d = a.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&"); if (!b)return d; switch (b.squash) { case!1: c = ["(", ")" + (b.isOptional ? "?" : "")]; break; case!0: c = ["?(", ")?"]; break; default: c = ["(" + b.squash + "|", ")?"] } return d + c[0] + b.type.pattern.source + c[1] } var e = c(3), f = c(36), g = function (a, b, c) { return a[b] = a[b] || c() }, h = function () { function a(b, c) { var g = this; this.pattern = b, this.config = c, this._cache = { path: [], pattern: null }, this._children = [], this._params = [], this._segments = [], this._compiled = [], this.config = e.defaults(this.config, { params: {}, strict: !0, caseInsensitive: !1, paramMap: e.identity }); for (var h, i, j, k = /([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, l = /([:]?)([\w\[\]-]+)|\{([\w\[\]-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, m = 0, n = [], o = function (c) { if (!a.nameValidator.test(c))throw new Error("Invalid parameter name '" + c + "' in pattern '" + b + "'"); if (e.find(g._params, e.propEq("id", c)))throw new Error("Duplicate parameter name '" + c + "' in pattern '" + b + "'") }, p = function (a, c) { var d = a[2] || a[3], h = c ? a[4] : a[4] || ("*" === a[1] ? ".*" : null); return { id: d, regexp: h, cfg: g.config.params[d], segment: b.substring(m, a.index), type: h ? f.paramTypes.type(h || "string") || e.inherit(f.paramTypes.type("string"), {pattern: new RegExp(h, g.config.caseInsensitive ? "i" : void 0)}) : null } }; (h = k.exec(b)) && (i = p(h, !1), !(i.segment.indexOf("?") >= 0));)o(i.id), this._params.push(f.Param.fromPath(i.id, i.type, this.config.paramMap(i.cfg, !1))), this._segments.push(i.segment), n.push([i.segment, e.tail(this._params)]), m = k.lastIndex; j = b.substring(m); var q = j.indexOf("?"); if (q >= 0) { var r = j.substring(q); if (j = j.substring(0, q), r.length > 0)for (m = 0; h = l.exec(r);)i = p(h, !0), o(i.id), this._params.push(f.Param.fromSearch(i.id, i.type, this.config.paramMap(i.cfg, !0))), m = k.lastIndex } this._segments.push(j), e.extend(this, { _compiled: n.map(function (a) { return d.apply(null, a) }).concat(d(j)), prefix: this._segments[0] }), Object.freeze(this) } return a.prototype.append = function (a) { return this._children.push(a), e.forEach(a._cache, function (b, c) { return a._cache[c] = e.isArray(b) ? [] : null }), a._cache.path = this._cache.path.concat(this), a }, a.prototype.isRoot = function () { return 0 === this._cache.path.length }, a.prototype.toString = function () { return this.pattern }, a.prototype.exec = function (a, b, c, d) { function f(a) { var b = function (a) { return a.split("").reverse().join("") }, c = function (a) { return a.replace(/\\-/g, "-") }, d = b(a).split(/-(?!\\)/), f = e.map(d, b); return e.map(f, c).reverse() } var h = this; void 0 === b && (b = {}), void 0 === d && (d = {}); var i = g(this._cache, "pattern", function () { return new RegExp(["^", e.unnest(h._cache.path.concat(h).map(e.prop("_compiled"))).join(""), h.config.strict === !1 ? "/?" : "", "$"].join(""), h.config.caseInsensitive ? "i" : void 0) }).exec(a); if (!i)return null; var j = this.parameters(), k = j.filter(function (a) { return !a.isSearch() }), l = j.filter(function (a) { return a.isSearch() }), m = this._cache.path.concat(this).map(function (a) { return a._segments.length - 1 }).reduce(function (a, b) { return a + b }), n = {}; if (m !== i.length - 1)throw new Error("Unbalanced capture group in route '" + this.pattern + "'"); for (var o = 0; m > o; o++) { for (var p = k[o], q = i[o + 1], r = 0; r < p.replace; r++)p.replace[r].from === q && (q = p.replace[r].to); q && p.array === !0 && (q = f(q)), n[p.id] = p.value(q) } return e.forEach(l, function (a) { n[a.id] = a.value(b[a.id]) }), c && (n["#"] = c), n }, a.prototype.parameters = function (a) { return void 0 === a && (a = {}), a.inherit === !1 ? this._params : e.unnest(this._cache.path.concat(this).map(e.prop("_params"))) }, a.prototype.parameter = function (a, b) { void 0 === b && (b = {}); var c = e.tail(this._cache.path); return e.find(this._params, e.propEq("id", a)) || b.inherit !== !1 && c && c.parameter(a) || null }, a.prototype.validates = function (a) { var b = this, c = function (a, b) { return !a || a.validates(b) }; return e.pairs(a || {}).map(function (a) { var d = a[0], e = a[1]; return c(b.parameter(d), e) }).reduce(e.allTrueR, !0) }, a.prototype.format = function (a) { function b(a) { return encodeURIComponent(a).replace(/-/g, function (a) { return "%5C%" + a.charCodeAt(0).toString(16).toUpperCase() }) } void 0 === a && (a = {}); var c = this._segments, d = c[0], f = !1, g = this.parameters({inherit: !1}), h = e.tail(this._cache.path); if (!this.validates(a))return null; g.map(function (g, h) { var i = h < c.length - 1, j = g.value(a[g.id]), k = g.isDefaultValue(j), l = k ? g.squash : !1, m = g.type.encode(j); if (!i) { if (null == m || k && l !== !1)return; return e.isArray(m) || (m = [m]), m = e.map(m, encodeURIComponent).join("&" + g.id + "="), d += (f ? "&" : "?") + (g.id + "=" + m), void(f = !0) } d += function (a, c) { return l === !0 ? a.match(c.match(/\/$/) ? /\/?(.*)/ : /(.*)/)[1] : e.isString(l) ? l + a : l !== !1 ? "" : null == m ? a : e.isArray(m) ? e.map(m, b).join("-") + a : g.type.raw ? m + a : encodeURIComponent(m) + a }(c[h + 1], d) }), a["#"] && (d += "#" + a["#"]); var i = ["#"].concat(g.map(e.prop("id"))); return (h && h.format(e.omit(a, i)) || "") + d }, a.nameValidator = /^\w+(-+\w+)*(?:\[\])?$/, a }(); b.UrlMatcher = h }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(24)), d(c(27)), d(c(37)), d(c(26)) }, function (a, b, c) { function d() { function a() { function a(a, b) { return function () { e.forEach(a.split(" "), function (a) { return c[a].splice(c[a].indexOf(b), 1) }) } } function b(a, b) { c[a] && c[a].length && e.forEach(c[a], function (a) { return a(b) }) } var c = {}, d = {}; return f.prototype.$digest = function () { var a = this; e.forEach(this, function (c, e) { c !== d[e] && a.hasOwnProperty(e) && (d[e] = c, b(e, c)) }) }, f.prototype.$inherit = function (a, b, c) { var d, f = e.ancestors(b, c), g = {}, h = []; for (var i in f)if (f[i].params && (d = Object.keys(f[i].params), d.length))for (var j in d)h.indexOf(d[j]) >= 0 || (h.push(d[j]), g[d[j]] = this[d[j]]); return e.extend({}, g, a) }, f.prototype.$set = function (a, c) { var d = this, f = !1, g = !1; return c && e.forEach(a, function (a, b) { (c.parameter(b) || {}).dynamic !== !0 && (g = !0) }), g ? !1 : (e.forEach(a, function (a, c) { a !== d[c] && (d[c] = a, b(c), f = !0) }), this.$sync(), f) }, f.prototype.$sync = function () { return e.copy(this, d), this }, f.prototype.$off = function () { return c = {}, this }, f.prototype.$raw = function () { return e.omit(this, Object.keys(this).filter(f.prototype.hasOwnProperty.bind(f.prototype))) }, f.prototype.$localize = function (a, b) { return new f(e.pick(b || this, Object.keys(a.params))) }, f.prototype.$observe = function (b, d) { return e.forEach(b.split(" "), function (a) { return (c[a] || (c[a] = [])).push(d) }), a(b, d) }, new f } function b(a) { return a.$watch(function () { c.$digest() }), c } var c = a(); this.$get = b, b.$inject = ["$rootScope"] } var e = c(3), f = function () { function a(a) { void 0 === a && (a = {}), e.extend(this, a) } return a.prototype.$digest = function () { }, a.prototype.$inherit = function (a, b, c) { }, a.prototype.$set = function (a, b) { }, a.prototype.$sync = function () { }, a.prototype.$off = function () { }, a.prototype.$raw = function () { }, a.prototype.$localize = function (a, b) { }, a.prototype.$observe = function (a, b) { }, a }(); b.StateParams = f, d.$inject = [], angular.module("ui.router.state").provider("$stateParams", d) }, function (a, b, c) { function d(a) { function b(a) { var b = /^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source); return null != b ? b[1].replace(/\\(.)/g, "$1") : "" } function c(a, b) { return a.replace(/\$(\$|\d{1,2})/, function (a, c) { return b["$" === c ? 0 : Number(c)] }) } function d(a, b, c) { if (!c)return !1; var d = a.invoke(b, b, {$match: c}); return e.isDefined(d) ? d : !0 } function h(a) { function b(a, b, c) { var d = f.services.locationConfig.baseHref(); return "/" === d ? a : b ? d.slice(0, -1) + a : c ? d.slice(1) + a : a } function c(a) { function b(a) { var b = a(f.services.$injector, g); return b ? (e.isString(b) && (g.replace(), g.url(b)), !0) : !1 } if (!a || !a.defaultPrevented) { var c, d = j.length; for (c = 0; d > c; c++)if (b(j[c]))return; k && b(k) } } function d() { return i = i || a.$on("$locationChangeSuccess", c) } var h = g.url(); return l || d(), { sync: function () { c() }, listen: function () { return d() }, update: function (a) { return a ? void(h = g.url()) : void(g.url() !== h && (g.url(h), g.replace())) }, push: function (a, b, c) { g.url(a.format(b || {})), c && c.replace && g.replace() }, href: function (a, c, d) { if (!a.validates(c))return null; var e = a.format(c); d = d || {}; var g = f.services.locationConfig, h = g.html5Mode(); if (h || null === e || (e = "#" + g.hashPrefix() + e), e = b(e, h, d.absolute), !d.absolute || !e)return e; var i = !h && e ? "/" : "", j = g.port(); return j = 80 === j || 443 === j ? "" : ":" + j, [g.protocol(), "://", g.host(), j, i, e].join("") } } } var i, j = [], k = null, l = !1; this.rule = function (a) { if (!e.isFunction(a))throw new Error("'rule' must be a function"); return j.push(a), this }, this.otherwise = function (a) { if (!e.isFunction(a) && !e.isString(a))throw new Error("'rule' must be a string or function"); return k = e.isString(a) ? function () { return a } : a, this }, this.when = function (h, i) { var j, k = e.isString(i); if (e.isString(h) && (h = a.compile(h)), !k && !e.isFunction(i) && !e.isArray(i))throw new Error("invalid 'handler' in when()"); var l = { matcher: function (b, c) { return k && (j = a.compile(c), c = ["$match", j.format.bind(j)]), e.extend(function () { return d(f.services.$injector, c, b.exec(g.path(), g.search(), g.hash())) }, {prefix: e.isString(b.prefix) ? b.prefix : ""}) }, regex: function (a, h) { if (a.global || a.sticky)throw new Error("when() RegExp must not be global or sticky"); return k && (j = h, h = ["$match", function (a) { return c(j, a) }]), e.extend(function () { return d(f.services.$injector, h, a.exec(g.path())) }, {prefix: b(a)}) } }, m = {matcher: a.isMatcher(h), regex: h instanceof RegExp}; for (var n in m)if (m[n])return this.rule(l[n](h, i)); throw new Error("invalid 'what' in when()") }, this.deferIntercept = function (a) { void 0 === a && (a = !0), l = a }, this.$get = h, h.$inject = ["$rootScope"] } var e = c(3), f = c(4), g = f.services.location; b.$UrlRouterProvider = d }, function (a, b) { var c = function () { function a(a) { this.transition = a } return a.prototype.registerHooks = function () { this.registerOnEnterHooks(), this.registerOnRetainHooks(), this.registerOnExitHooks() }, a.prototype.registerOnEnterHooks = function () { var a = this, b = function (b) { return a.transition.onEnter({to: b.name}, b.onEnter) }; this.transition.entering().filter(function (a) { return !!a.onEnter }).forEach(b) }, a.prototype.registerOnRetainHooks = function () { var a = this, b = function (b) { return a.transition.onRetain({}, b.onRetain) }; this.transition.retained().filter(function (a) { return !!a.onRetain }).forEach(b) }, a.prototype.registerOnExitHooks = function () { var a = this, b = function (b) { return a.transition.onExit({from: b.name}, b.onExit) }; this.transition.exiting().filter(function (a) { return !!a.onExit }).forEach(b) }, a }(); b.EnterExitHooks = c }, function (a, b, c) { var d = c(3), e = c(19), f = e.ResolvePolicy[e.ResolvePolicy.LAZY], g = e.ResolvePolicy[e.ResolvePolicy.EAGER], h = function () { function a(a) { this.transition = a } return a.prototype.registerHooks = function () { function a(a) { return d.tail(c.to).resolveContext.resolvePath(d.extend({transition: a}, {resolvePolicy: g})) } function b(a, b) { var e = d.find(c.entering, d.propEq("state", a)); return e.resolveContext.resolvePathElement(e.state, d.extend({transition: b}, {resolvePolicy: f})) } var c = this.transition.treeChanges(); a.$inject = ["$transition$"], b.$inject = ["$state$", "$transition$"], this.transition.onStart({}, a, {priority: 1e3}), this.transition.onEnter({}, b, {priority: 1e3}) }, a }(); b.ResolveHooks = h }, function (a, b, c) { var d = c(3), e = c(36), f = function (a) { if (!d.isString(a))return !1; var b = "^" === a.charAt(0); return {val: b ? a.substring(1) : a, root: b} }, g = function () { function a(a, b, c) { this.matcher = b; var g = this; this.builders = { parent: [function (c) { return c === a() ? null : b.find(g.parentName(c)) || a() }], data: [function (a) { return a.parent && a.parent.data && (a.data = a.self.data = d.extend({}, a.parent.data, a.data)), a.data }], url: [function (b) { var e = b, g = f(e.url), h = b.parent, i = g ? c.compile(g.val, { params: b.params || {}, paramMap: function (a, b) { return e.reloadOnSearch === !1 && b && (a = d.extend(a || {}, {dynamic: !0})), a } }) : e.url; if (!i)return null; if (!c.isMatcher(i))throw new Error("Invalid url '" + i + "' in state '" + b + "'"); return g && g.root ? i : (h && h.navigable || a()).url.append(i) }], navigable: [function (b) { return b !== a() && b.url ? b : b.parent ? b.parent.navigable : null }], params: [function (a) { var b = function (a, b) { return e.Param.fromConfig(b, null, a) }, c = a.url && a.url.parameters({inherit: !1}) || [], f = d.values(d.map(d.omit(a.params || {}, c.map(d.prop("id"))), b)); return c.concat(f).map(function (a) { return [a.id, a] }).reduce(d.applyPairs, {}) }], views: [function (a) { var b = {}, c = ["templateProvider", "templateUrl", "template", "notify", "async"], e = ["controller", "controllerProvider", "controllerAs"], f = c.concat(e); return d.forEach(a.views || {$default: d.pick(a, f)}, function (c, f) { f = f || "$default", d.forEach(e, function (b) { a[b] && !c[b] && (c[b] = a[b]) }), Object.keys(c).length > 0 && (b[f] = c) }), b }], path: [function (a) { return a.parent ? a.parent.path.concat(a) : [a] }], includes: [function (a) { var b = a.parent ? d.extend({}, a.parent.includes) : {}; return b[a.name] = !0, b }] } } return a.prototype.builder = function (a, b) { var c = this.builders, e = c[a] || []; return d.isString(a) && !d.isDefined(b) ? e.length > 1 ? e : e[0] : d.isString(a) && d.isFunction(b) ? (c[a] = e, c[a].push(b), function () { return c[a].splice(c[a].indexOf(b, 1)) && null }) : void 0 }, a.prototype.build = function (a) { var b = this, c = b.matcher, e = b.builders, f = this.parentName(a); if (f && !c.find(f))return null; for (var g in e)if (e.hasOwnProperty(g)) { var h = e[g].reduce(function (a, b) { return function (c) { return b(c, a) } }, d.noop); a[g] = h(a) } return a }, a.prototype.parentName = function (a) { var b = a.name || ""; return -1 !== b.indexOf(".") ? b.substring(0, b.lastIndexOf(".")) : a.parent ? d.isString(a.parent) ? a.parent : a.parent.name : "" }, a.prototype.name = function (a) { var b = a.name; if (-1 !== b.indexOf(".") || !a.parent)return b; var c = d.isString(a.parent) ? a.parent : a.parent.name; return c ? c + "." + b : b }, a }(); b.StateBuilder = g }, function (a, b, c) { function d(a, b) { var c, d = a.match(/^\s*({[^}]*})\s*$/); if (d && (a = b + "(" + d[1] + ")"), c = a.replace(/\n/g, " ").match(/^([^(]+?)\s*(\((.*)\))?$/), !c || 4 !== c.length)throw new Error("Invalid state ref '" + a + "'"); return {state: c[1], paramExpr: c[3] || null} } function e(a) { var b = a.parent().inheritedData("$uiView"); return b && b.context && b.context.name ? b.context : void 0 } function f(a, b) { return { restrict: "A", require: ["?^uiSrefActive", "?^uiSrefActiveEq"], link: function (c, f, g, j) { var k = d(g.uiSref, a.current.name), l = null, m = e(f) || a.$current, n = null, o = "A" === f.prop("tagName"), p = "FORM" === f[0].nodeName, q = p ? "action" : "href", r = !0, s = c.$eval(g.uiSrefOpts), t = { relative: m, inherit: !0 }, u = h.defaults(s, t, i.defaultTransOpts), v = function (b) { if (b && (l = h.copy(b)), r) { n = a.href(k.state, l, u); var c = j[1] || j[0]; return c && c.$$addStateInfo(k.state, l), null === n ? (r = !1, !1) : void g.$set(q, n) } }; k.paramExpr && (c.$watch(k.paramExpr, function (a) { a !== l && v(a) }, !0), l = h.copy(c.$eval(k.paramExpr))), v(), p || f.bind("click", function (c) { var d = c.which || c.button; if (!(d > 1 || c.ctrlKey || c.metaKey || c.shiftKey || f.attr("target"))) { var e = b(function () { a.go(k.state, l, u) }); c.preventDefault(); var g = o && !n ? 1 : 0; c.preventDefault = function () { g-- <= 0 && b.cancel(e) } } }) } } } function g(a, b, c) { return { restrict: "A", controller: ["$scope", "$element", "$attrs", "$timeout", "$transitions", function (b, f, g, i, j) { function k(b, c, d) { var g = a.get(b, e(f)), h = m(b, c); t.push({state: g || {name: b}, params: c, hash: h}), u[h] = d } function l(a) { a.promise.then(n) } function m(a, c) { if (!h.isString(a))throw new Error("state should be a string"); return h.isObject(c) ? a + h.toJson(c) : (c = b.$eval(c), h.isObject(c) ? a + h.toJson(c) : a) } function n() { for (var a = 0; a < t.length; a++)q(t[a].state, t[a].params) ? o(f, u[t[a].hash]) : p(f, u[t[a].hash]), r(t[a].state, t[a].params) ? o(f, s) : p(f, s) } function o(a, b) { i(function () { a.addClass(b) }) } function p(a, b) { a.removeClass(b) } function q(b, c) { return a.includes(b.name, c) } function r(b, c) { return a.is(b.name, c) } var s, t = [], u = {}; s = c(g.uiSrefActiveEq || "", !1)(b); var v = b.$eval(g.uiSrefActive) || c(g.uiSrefActive || "", !1)(b); h.isObject(v) && h.forEach(v, function (c, e) { if (h.isString(c)) { var f = d(c, a.current.name); k(f.state, b.$eval(f.paramExpr), e) } }), this.$$addStateInfo = function (a, b) { h.isObject(v) && t.length > 0 || (k(a, b, v), n()) }, b.$on("$stateChangeSuccess", n), l.$inject = ["$transition$"]; var w = j.onStart({}, l); b.$on("$destroy", w) }] } } var h = c(3), i = c(9); f.$inject = ["$state", "$timeout"], g.$inject = ["$state", "$stateParams", "$interpolate"], angular.module("ui.router.state").directive("uiSref", f).directive("uiSrefActive", g).directive("uiSrefActiveEq", g) }, function (a, b) { function c(a) { return function (b) { return a.is(b) } } function d(a) { return function (b, c, d) { return a.includes(b, c, d) } } c.$inject = ["$state"], b.$IsStateFilter = c, d.$inject = ["$state"], b.$IncludedByStateFilter = d, angular.module("ui.router.state").filter("isState", c).filter("includedByState", d) }, function (a, b, c) { var d = c(2), e = function () { function a(a) { d.extend(this, a) } return a.prototype.is = function (a) { return this === a || this.self === a || this.fqn() === a }, a.prototype.fqn = function () { if (!(this.parent && this.parent instanceof this.constructor))return this.name; var a = this.parent.fqn(); return a ? a + "." + this.name : this.name }, a.prototype.root = function () { return this.parent && this.parent.root() || this }, a.prototype.parameters = function (a) { a = d.defaults(a, {inherit: !0}); var b = a.inherit && this.parent && this.parent.parameters() || []; return b.concat(d.values(this.params)) }, a.prototype.parameter = function (a, b) { return void 0 === b && (b = {}), this.url && this.url.parameter(a, b) || d.find(d.values(this.params), d.propEq("id", a)) || b.inherit && this.parent && this.parent.parameter(a) }, a.prototype.toString = function () { return this.fqn() }, a }(); b.State = e }, function (a, b, c) { var d = c(3), e = function () { function a(a) { this._states = a } return a.prototype.isRelative = function (a) { return a = a || "", 0 === a.indexOf(".") || 0 === a.indexOf("^") }, a.prototype.find = function (a, b) { if (!a && "" !== a)return void 0; var c = d.isString(a), e = c ? a : a.name; this.isRelative(e) && (e = this.resolvePath(e, b)); var f = this._states[e]; return !f || !c && (c || f !== a && f.self !== a) ? void 0 : f }, a.prototype.resolvePath = function (a, b) { if (!b)throw new Error("No reference point given for path '" + a + "'"); for (var c = this.find(b), d = a.split("."), e = 0, f = d.length, g = c; f > e; e++)if ("" !== d[e] || 0 !== e) { if ("^" !== d[e])break; if (!g.parent)throw new Error("Path '" + a + "' not valid for state '" + c.name + "'"); g = g.parent } else g = c; var h = d.slice(e).join("."); return g.name + (g.name && h ? "." : "") + h }, a }(); b.StateMatcher = e }, function (a, b, c) { var d = c(3), e = c(12), f = function () { function a(a, b, c, d) { this.states = a, this.builder = b, this.$urlRouterProvider = c, this.$state = d, this.autoFlush = !1, this.queue = [] } return a.prototype.register = function (a, b) { var c = this, f = c.states, g = c.queue, h = c.$state, i = d.inherit(new e.State, d.extend({}, a, { self: a, resolve: a.resolve || {}, toString: function () { return a.name } })); if (!d.isString(i.name))throw new Error("State must have a valid name"); if (f.hasOwnProperty(i.name) || -1 !== d.pluck(g, "name").indexOf(i.name))throw new Error("State '" + i.name + "' is already defined"); return g[b ? "unshift" : "push"](i), this.autoFlush && this.flush(h), i }, a.prototype.flush = function (a) { for (var b, c, d, e = this, f = e.queue, g = e.states, h = e.builder, i = [], j = {}; f.length > 0;)if (c = f.shift(), b = h.build(c), d = i.indexOf(c), b) { if (g.hasOwnProperty(c.name))throw new Error("State '" + name + "' is already defined"); g[c.name] = c, this.attachRoute(a, c), d >= 0 && i.splice(d, 1) } else { var k = j[c.name]; if (j[c.name] = f.length, d >= 0 && k === f.length)throw new Error("Cannot register orphaned state '" + c.name + "'"); 0 > d && i.push(c), f.push(c) } return g }, a.prototype.attachRoute = function (a, b) { var c = this.$urlRouterProvider; !b[d.abstractKey] && b.url && c.when(b.url, ["$match", "$stateParams", function (c, e) { a.$current.navigable === b && d.equalForKeys(c, e) || a.transitionTo(b, c, { inherit: !0, location: !1 }) }]) }, a }(); b.StateQueueManager = f }, function (a, b, c) { var d = c(3), e = c(6), f = c(4), g = c(28), h = c(12), i = new g.RejectFactory, j = { async: !0, rejectIfSuperseded: !0, current: d.noop, transition: null, traceData: {} }, k = function () { function a(a, b, c, f) { var g = this; this.fn = a, this.locals = b, this.resolveContext = c, this.options = f, this.isSuperseded = function () { return g.options.current() !== g.options.transition }, this.mapHookResult = d.pattern([[this.isSuperseded, function () { return i.superseded(g.options.current()) }], [d.eq(!1), d.val(i.aborted("Hook aborted transition"))], [d.is(h.TargetState), function (a) { return i.redirected(a) }], [d.isPromise, function (a) { return a.then(g.handleHookResult.bind(g)) }]]), this.invokeStep = function (a) { var b = g, c = b.options, f = b.fn, h = b.resolveContext, j = d.extend({}, g.locals, a); if (e.trace.traceHookInvocation(g, c), c.rejectIfSuperseded && g.isSuperseded())return i.superseded(c.current()); if (!c.async) { var k = h.invokeNow(f, j, c); return g.handleHookResult(k) } return h.invokeLater(f, j, c).then(g.handleHookResult.bind(g)) }, this.options = d.defaults(f, j) } return a.prototype.handleHookResult = function (a) { if (!d.isDefined(a))return void 0; e.trace.traceHookResult(a, void 0, this.options); var b = this.mapHookResult(a); return b && e.trace.traceHookResult(a, b, this.options), b }, a.prototype.toString = function () { var a = this, b = a.options, c = a.fn, e = d.parse("traceData.hookType")(b) || "internal", f = d.parse("traceData.context.state.name")(b) || d.parse("traceData.context")(b) || "unknown", g = d.fnToString(c); return e + " context: " + f + ", " + d.maxLength(200, g) }, a.runSynchronousHooks = function (b, c, e) { void 0 === c && (c = {}), void 0 === e && (e = !1); for (var g = [], h = 0; h < b.length; h++)try { g.push(b[h].invokeStep(c)) } catch (i) { if (!e)throw i; console.log("Swallowed exception during synchronous hook handler: " + i) } var j = g.filter(a.isRejection); return j.length ? j[0] : g.filter(d.not(a.isRejection)).filter(d.isPromise).reduce(function (a, b) { return a.then(d.val(b)) }, f.services.$q.when()) }, a.isRejection = function (a) { return a && a.reason instanceof g.TransitionRejection && a }, a }(); b.TransitionHook = k }, function (a, b, c) { function d() { this._reinit.bind(b.$transitions)(), this.$get = function () { return b.$transitions } } var e = c(8), f = c(11); b.defaultTransOpts = { location: !0, relative: null, inherit: !1, notify: !0, reload: !1, custom: {}, current: function () { return null } }; var g = function () { function a() { this._defaultErrorHandler = function (a) { a instanceof Error && console.log(a) }, this._reinit() } return a.prototype.defaultErrorHandler = function (a) { return this._defaultErrorHandler = a || this._defaultErrorHandler }, a.prototype._reinit = function () { f.HookRegistry.mixin(new f.HookRegistry, this) }, a.prototype.create = function (a, b) { return new e.Transition(a, b) }, a }(); b.$transitions = new g, d.prototype = b.$transitions, b.$transitionsProvider = d, angular.module("ui.router.state").provider("$transitions", b.$transitionsProvider) }, function (a, b, c) { function d(a) { for (var c in a)b.hasOwnProperty(c) || (b[c] = a[c]) } d(c(50)), d(c(21)), d(c(51)), d(c(52)) }, function (a, b, c) { function d(a, b) { this.fromConfig = function (a, b, c) { return e.isDefined(a.template) ? this.fromString(a.template, b) : e.isDefined(a.templateUrl) ? this.fromUrl(a.templateUrl, b) : e.isDefined(a.templateProvider) ? this.fromProvider(a.templateProvider, b, c) : null }, this.fromString = function (a, b) { return e.isFunction(a) ? a(b) : a }, this.fromUrl = function (c, d) { return e.isFunction(c) && (c = c(d)), null == c ? null : a.get(c, { cache: b, headers: {Accept: "text/html"} }).then(e.prop("data")) }, this.fromProvider = function (a, b, c) { return c(a) } } var e = c(3); d.$inject = ["$http", "$templateCache"], angular.module("ui.router.util").service("$templateFactory", d) }, function (a, b, c) { function d(a, b, c, d, e) { function h(a, c) { return { enter: function (a, c, d) { angular.version.minor > 2 ? b.enter(a, null, c).then(d) : b.enter(a, null, c, d) }, leave: function (a, c) { angular.version.minor > 2 ? b.leave(a).then(c) : b.leave(a, c) } } } function i(a, b) { return a === b } var j = {context: a.rootContext()}, k = { count: 0, restrict: "ECA", terminal: !0, priority: 400, transclude: "element", compile: function (b, e, l) { return function (b, e, m) { function n(a) { i(x, a) || (g.trace.traceUiViewConfigUpdated(A, a && a.context), x = a, p(a)) } function o() { q && (g.trace.traceUiViewEvent("Removing (previous) el", A), q.remove(), q = null), s && (g.trace.traceUiViewEvent("Destroying (previous) scope", A), s.$destroy(), s = null), r && (g.trace.traceUiViewEvent("Animate out (previous)", A), w.leave(r, function () { q = null }), q = r, r = null) } function p(a) { a = a || {}; var d = b.$new(); g.trace.traceUiViewScopeCreated(A, d), f.extend(A, { context: a.context, $template: a.template, $controller: a.controller, $controllerAs: a.controllerAs, $locals: a.locals }); var h = l(d, function (a) { w.enter(a.data("$uiView", A), e, function () { s && s.$emit("$viewContentAnimationEnded"), (f.isDefined(v) && !v || b.$eval(v)) && c(a) }), o() }); r = h, s = d, s.$emit("$viewContentLoaded", a || x), s.$eval(u) } var q, r, s, t, u = m.onload || "", v = m.autoscroll, w = h(m, b), x = void 0, y = e.inheritedData("$uiView") || j, z = d(m.uiView || m.name || "")(b) || "$default", A = { id: k.count++, name: z, fqn: y.name ? y.fqn + "." + z : z, config: null, configUpdated: n, get creationContext() { return y.context } }; g.trace.traceUiViewEvent("Linking", A), e.data("$uiView", A), p(), t = a.registerUiView(A), b.$on("$destroy", function () { g.trace.traceUiViewEvent("Destroying/Unregistering", A), t() }) } } }; return k } function e(a, b, c, d, e) { return { restrict: "ECA", priority: -400, compile: function (c) { var d = c.html(); return function (c, e) { var h = e.data("$uiView"); if (h) { e.html(h.$template || d), g.trace.traceUiViewFill(h, e.html()); var i = a(e.contents()), j = h.$controller, k = h.$controllerAs; if (j) { var l = h.$locals, m = b(j, f.extend(l, {$scope: c})); k && (c[k] = m), e.data("$ngControllerController", m), e.children().data("$ngControllerController", m) } i(c) } } } } } var f = c(3), g = c(6); d.$inject = ["$view", "$animate", "$uiViewScroll", "$interpolate", "$q"], e.$inject = ["$compile", "$controller", "$interpolate", "$injector", "$q"], angular.module("ui.router.state").directive("uiView", d), angular.module("ui.router.state").directive("uiView", e) }, function (a, b) { function c() { var a = !1; this.useAnchorScroll = function () { a = !0 }, this.$get = ["$anchorScroll", "$timeout", function (b, c) { return a ? b : function (a) { return c(function () { a[0].scrollIntoView() }, 0, !1) } }] } angular.module("ui.router.state").provider("$uiViewScroll", c) }]) });
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/DefaultConfigService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.service.config; import com.ctrip.framework.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.service.ReleaseService; import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages; import org.springframework.beans.factory.annotation.Autowired; /** * config service with no cache * * @author Jason Song(song_s@ctrip.com) */ public class DefaultConfigService extends AbstractConfigService { @Autowired private ReleaseService releaseService; @Override protected Release findActiveOne(long id, ApolloNotificationMessages clientMessages) { return releaseService.findActiveOne(id); } @Override protected Release findLatestActiveRelease(String configAppId, String configClusterName, String configNamespace, ApolloNotificationMessages clientMessages) { return releaseService.findLatestActiveRelease(configAppId, configClusterName, configNamespace); } @Override public void handleMessage(ReleaseMessage message, String channel) { // since there is no cache, so do nothing } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.service.config; import com.ctrip.framework.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.service.ReleaseService; import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages; import org.springframework.beans.factory.annotation.Autowired; /** * config service with no cache * * @author Jason Song(song_s@ctrip.com) */ public class DefaultConfigService extends AbstractConfigService { @Autowired private ReleaseService releaseService; @Override protected Release findActiveOne(long id, ApolloNotificationMessages clientMessages) { return releaseService.findActiveOne(id); } @Override protected Release findLatestActiveRelease(String configAppId, String configClusterName, String configNamespace, ApolloNotificationMessages clientMessages) { return releaseService.findLatestActiveRelease(configAppId, configClusterName, configNamespace); } @Override public void handleMessage(ReleaseMessage message, String channel) { // since there is no cache, so do nothing } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ItemController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.v1.controller; import com.ctrip.framework.apollo.common.dto.ItemDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.RequestPrecondition; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO; import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; import com.ctrip.framework.apollo.portal.service.ItemService; import com.ctrip.framework.apollo.portal.spi.UserService; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpStatusCodeException; import javax.servlet.http.HttpServletRequest; @RestController("openapiItemController") @RequestMapping("/openapi/v1/envs/{env}") public class ItemController { private final ItemService itemService; private final UserService userService; public ItemController(final ItemService itemService, final UserService userService) { this.itemService = itemService; this.userService = userService; } @GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}") public OpenItemDTO getItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @PathVariable String key) { ItemDTO itemDTO = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key); return itemDTO == null ? null : OpenApiBeanUtils.transformFromItemDTO(itemDTO); } @PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)") @PostMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items") public OpenItemDTO createItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @RequestBody OpenItemDTO item, HttpServletRequest request) { RequestPrecondition.checkArguments( !StringUtils.isContainEmpty(item.getKey(), item.getDataChangeCreatedBy()), "key and dataChangeCreatedBy should not be null or empty"); if (userService.findByUserId(item.getDataChangeCreatedBy()) == null) { throw new BadRequestException("User " + item.getDataChangeCreatedBy() + " doesn't exist!"); } if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 256){ throw new BadRequestException("Comment length should not exceed 256 characters"); } ItemDTO toCreate = OpenApiBeanUtils.transformToItemDTO(item); //protect toCreate.setLineNum(0); toCreate.setId(0); toCreate.setDataChangeLastModifiedBy(toCreate.getDataChangeCreatedBy()); toCreate.setDataChangeLastModifiedTime(null); toCreate.setDataChangeCreatedTime(null); ItemDTO createdItem = itemService.createItem(appId, Env.valueOf(env), clusterName, namespaceName, toCreate); return OpenApiBeanUtils.transformFromItemDTO(createdItem); } @PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)") @PutMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}") public void updateItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @PathVariable String key, @RequestBody OpenItemDTO item, @RequestParam(defaultValue = "false") boolean createIfNotExists, HttpServletRequest request) { RequestPrecondition.checkArguments(item != null, "item payload can not be empty"); RequestPrecondition.checkArguments( !StringUtils.isContainEmpty(item.getKey(), item.getDataChangeLastModifiedBy()), "key and dataChangeLastModifiedBy can not be empty"); RequestPrecondition.checkArguments(item.getKey().equals(key), "Key in path and payload is not consistent"); if (userService.findByUserId(item.getDataChangeLastModifiedBy()) == null) { throw new BadRequestException("user(dataChangeLastModifiedBy) not exists"); } if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 256){ throw new BadRequestException("Comment length should not exceed 256 characters"); } try { ItemDTO toUpdateItem = itemService .loadItem(Env.valueOf(env), appId, clusterName, namespaceName, item.getKey()); //protect. only value,comment,lastModifiedBy can be modified toUpdateItem.setComment(item.getComment()); toUpdateItem.setValue(item.getValue()); toUpdateItem.setDataChangeLastModifiedBy(item.getDataChangeLastModifiedBy()); itemService.updateItem(appId, Env.valueOf(env), clusterName, namespaceName, toUpdateItem); } catch (Throwable ex) { if (ex instanceof HttpStatusCodeException) { // check createIfNotExists if (((HttpStatusCodeException) ex).getStatusCode().equals(HttpStatus.NOT_FOUND) && createIfNotExists) { createItem(appId, env, clusterName, namespaceName, item, request); return; } } throw ex; } } @PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)") @DeleteMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}") public void deleteItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @PathVariable String key, @RequestParam String operator, HttpServletRequest request) { if (userService.findByUserId(operator) == null) { throw new BadRequestException("user(operator) not exists"); } ItemDTO toDeleteItem = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key); if (toDeleteItem == null){ throw new BadRequestException("item not exists"); } itemService.deleteItem(Env.valueOf(env), toDeleteItem.getId(), operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.v1.controller; import com.ctrip.framework.apollo.common.dto.ItemDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.RequestPrecondition; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO; import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; import com.ctrip.framework.apollo.portal.service.ItemService; import com.ctrip.framework.apollo.portal.spi.UserService; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpStatusCodeException; import javax.servlet.http.HttpServletRequest; @RestController("openapiItemController") @RequestMapping("/openapi/v1/envs/{env}") public class ItemController { private final ItemService itemService; private final UserService userService; public ItemController(final ItemService itemService, final UserService userService) { this.itemService = itemService; this.userService = userService; } @GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}") public OpenItemDTO getItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @PathVariable String key) { ItemDTO itemDTO = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key); return itemDTO == null ? null : OpenApiBeanUtils.transformFromItemDTO(itemDTO); } @PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)") @PostMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items") public OpenItemDTO createItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @RequestBody OpenItemDTO item, HttpServletRequest request) { RequestPrecondition.checkArguments( !StringUtils.isContainEmpty(item.getKey(), item.getDataChangeCreatedBy()), "key and dataChangeCreatedBy should not be null or empty"); if (userService.findByUserId(item.getDataChangeCreatedBy()) == null) { throw new BadRequestException("User " + item.getDataChangeCreatedBy() + " doesn't exist!"); } if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 256){ throw new BadRequestException("Comment length should not exceed 256 characters"); } ItemDTO toCreate = OpenApiBeanUtils.transformToItemDTO(item); //protect toCreate.setLineNum(0); toCreate.setId(0); toCreate.setDataChangeLastModifiedBy(toCreate.getDataChangeCreatedBy()); toCreate.setDataChangeLastModifiedTime(null); toCreate.setDataChangeCreatedTime(null); ItemDTO createdItem = itemService.createItem(appId, Env.valueOf(env), clusterName, namespaceName, toCreate); return OpenApiBeanUtils.transformFromItemDTO(createdItem); } @PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)") @PutMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}") public void updateItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @PathVariable String key, @RequestBody OpenItemDTO item, @RequestParam(defaultValue = "false") boolean createIfNotExists, HttpServletRequest request) { RequestPrecondition.checkArguments(item != null, "item payload can not be empty"); RequestPrecondition.checkArguments( !StringUtils.isContainEmpty(item.getKey(), item.getDataChangeLastModifiedBy()), "key and dataChangeLastModifiedBy can not be empty"); RequestPrecondition.checkArguments(item.getKey().equals(key), "Key in path and payload is not consistent"); if (userService.findByUserId(item.getDataChangeLastModifiedBy()) == null) { throw new BadRequestException("user(dataChangeLastModifiedBy) not exists"); } if(!StringUtils.isEmpty(item.getComment()) && item.getComment().length() > 256){ throw new BadRequestException("Comment length should not exceed 256 characters"); } try { ItemDTO toUpdateItem = itemService .loadItem(Env.valueOf(env), appId, clusterName, namespaceName, item.getKey()); //protect. only value,comment,lastModifiedBy can be modified toUpdateItem.setComment(item.getComment()); toUpdateItem.setValue(item.getValue()); toUpdateItem.setDataChangeLastModifiedBy(item.getDataChangeLastModifiedBy()); itemService.updateItem(appId, Env.valueOf(env), clusterName, namespaceName, toUpdateItem); } catch (Throwable ex) { if (ex instanceof HttpStatusCodeException) { // check createIfNotExists if (((HttpStatusCodeException) ex).getStatusCode().equals(HttpStatus.NOT_FOUND) && createIfNotExists) { createItem(appId, env, clusterName, namespaceName, item, request); return; } } throw ex; } } @PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)") @DeleteMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key:.+}") public void deleteItem(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable String namespaceName, @PathVariable String key, @RequestParam String operator, HttpServletRequest request) { if (userService.findByUserId(operator) == null) { throw new BadRequestException("user(operator) not exists"); } ItemDTO toDeleteItem = itemService.loadItem(Env.valueOf(env), appId, clusterName, namespaceName, key); if (toDeleteItem == null){ throw new BadRequestException("item not exists"); } itemService.deleteItem(Env.valueOf(env), toDeleteItem.getId(), operator); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySource.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring.config; import com.ctrip.framework.apollo.ConfigChangeListener; import java.util.Set; import org.springframework.core.env.EnumerablePropertySource; import com.ctrip.framework.apollo.Config; /** * Property source wrapper for Config * * @author Jason Song(song_s@ctrip.com) */ public class ConfigPropertySource extends EnumerablePropertySource<Config> { private static final String[] EMPTY_ARRAY = new String[0]; ConfigPropertySource(String name, Config source) { super(name, source); } @Override public boolean containsProperty(String name) { return this.source.getProperty(name, null) != null; } @Override public String[] getPropertyNames() { Set<String> propertyNames = this.source.getPropertyNames(); if (propertyNames.isEmpty()) { return EMPTY_ARRAY; } return propertyNames.toArray(new String[propertyNames.size()]); } @Override public Object getProperty(String name) { return this.source.getProperty(name, null); } public void addChangeListener(ConfigChangeListener listener) { this.source.addChangeListener(listener); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring.config; import com.ctrip.framework.apollo.ConfigChangeListener; import java.util.Set; import org.springframework.core.env.EnumerablePropertySource; import com.ctrip.framework.apollo.Config; /** * Property source wrapper for Config * * @author Jason Song(song_s@ctrip.com) */ public class ConfigPropertySource extends EnumerablePropertySource<Config> { private static final String[] EMPTY_ARRAY = new String[0]; ConfigPropertySource(String name, Config source) { super(name, source); } @Override public boolean containsProperty(String name) { return this.source.getProperty(name, null) != null; } @Override public String[] getPropertyNames() { Set<String> propertyNames = this.source.getPropertyNames(); if (propertyNames.isEmpty()) { return EMPTY_ARRAY; } return propertyNames.toArray(new String[propertyNames.size()]); } @Override public Object getProperty(String name) { return this.source.getProperty(name, null); } public void addChangeListener(ConfigChangeListener listener) { this.source.addChangeListener(listener); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageListener.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.message; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; /** * @author Jason Song(song_s@ctrip.com) */ public interface ReleaseMessageListener { void handleMessage(ReleaseMessage message, String channel); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.message; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; /** * @author Jason Song(song_s@ctrip.com) */ public interface ReleaseMessageListener { void handleMessage(ReleaseMessage message, String channel); }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerApiTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.mockserver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.ConfigService; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.google.common.util.concurrent.SettableFuture; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import org.junit.ClassRule; import org.junit.Test; public class ApolloMockServerApiTest { private static final String anotherNamespace = "anotherNamespace"; @ClassRule public static EmbeddedApollo embeddedApollo = new EmbeddedApollo(); @Test public void testGetProperty() throws Exception { Config applicationConfig = ConfigService.getAppConfig(); assertEquals("value1", applicationConfig.getProperty("key1", null)); assertEquals("value2", applicationConfig.getProperty("key2", null)); } @Test public void testUpdateProperties() throws Exception { String someNewValue = "someNewValue"; Config otherConfig = ConfigService.getConfig(anotherNamespace); final SettableFuture<ConfigChangeEvent> future = SettableFuture.create(); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { future.set(changeEvent); } }); assertEquals("otherValue1", otherConfig.getProperty("key1", null)); assertEquals("otherValue2", otherConfig.getProperty("key2", null)); embeddedApollo.addOrModifyProperty(anotherNamespace, "key1", someNewValue); ConfigChangeEvent changeEvent = future.get(5, TimeUnit.SECONDS); assertEquals(someNewValue, otherConfig.getProperty("key1", null)); assertEquals("otherValue2", otherConfig.getProperty("key2", null)); assertTrue(changeEvent.isChanged("key1")); } @Test public void testUpdateSamePropertyTwice() throws Exception { String someNewValue = "someNewValue"; Config otherConfig = ConfigService.getConfig(anotherNamespace); final Semaphore changes = new Semaphore(0); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { changes.release(); } }); assertEquals("otherValue3", otherConfig.getProperty("key3", null)); embeddedApollo.addOrModifyProperty(anotherNamespace, "key3", someNewValue); embeddedApollo.addOrModifyProperty(anotherNamespace, "key3", someNewValue); assertTrue(changes.tryAcquire(5, TimeUnit.SECONDS)); assertEquals(someNewValue, otherConfig.getProperty("key3", null)); assertEquals(0, changes.availablePermits()); } @Test public void testDeleteProperties() throws Exception { Config otherConfig = ConfigService.getConfig(anotherNamespace); final SettableFuture<ConfigChangeEvent> future = SettableFuture.create(); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { future.set(changeEvent); } }); assertEquals("otherValue4", otherConfig.getProperty("key4", null)); assertEquals("otherValue5", otherConfig.getProperty("key5", null)); embeddedApollo.deleteProperty(anotherNamespace, "key4"); ConfigChangeEvent changeEvent = future.get(5, TimeUnit.SECONDS); assertNull(otherConfig.getProperty("key4", null)); assertEquals("otherValue5", otherConfig.getProperty("key5", null)); assertTrue(changeEvent.isChanged("key4")); } @Test public void testDeleteSamePropertyTwice() throws Exception { Config otherConfig = ConfigService.getConfig(anotherNamespace); final Semaphore changes = new Semaphore(0); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { changes.release(); } }); assertEquals("otherValue6", otherConfig.getProperty("key6", null)); embeddedApollo.deleteProperty(anotherNamespace, "key6"); embeddedApollo.deleteProperty(anotherNamespace, "key6"); assertTrue(changes.tryAcquire(5, TimeUnit.SECONDS)); assertNull(otherConfig.getProperty("key6", null)); assertEquals(0, changes.availablePermits()); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.mockserver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.ConfigService; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.google.common.util.concurrent.SettableFuture; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import org.junit.ClassRule; import org.junit.Test; public class ApolloMockServerApiTest { private static final String anotherNamespace = "anotherNamespace"; @ClassRule public static EmbeddedApollo embeddedApollo = new EmbeddedApollo(); @Test public void testGetProperty() throws Exception { Config applicationConfig = ConfigService.getAppConfig(); assertEquals("value1", applicationConfig.getProperty("key1", null)); assertEquals("value2", applicationConfig.getProperty("key2", null)); } @Test public void testUpdateProperties() throws Exception { String someNewValue = "someNewValue"; Config otherConfig = ConfigService.getConfig(anotherNamespace); final SettableFuture<ConfigChangeEvent> future = SettableFuture.create(); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { future.set(changeEvent); } }); assertEquals("otherValue1", otherConfig.getProperty("key1", null)); assertEquals("otherValue2", otherConfig.getProperty("key2", null)); embeddedApollo.addOrModifyProperty(anotherNamespace, "key1", someNewValue); ConfigChangeEvent changeEvent = future.get(5, TimeUnit.SECONDS); assertEquals(someNewValue, otherConfig.getProperty("key1", null)); assertEquals("otherValue2", otherConfig.getProperty("key2", null)); assertTrue(changeEvent.isChanged("key1")); } @Test public void testUpdateSamePropertyTwice() throws Exception { String someNewValue = "someNewValue"; Config otherConfig = ConfigService.getConfig(anotherNamespace); final Semaphore changes = new Semaphore(0); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { changes.release(); } }); assertEquals("otherValue3", otherConfig.getProperty("key3", null)); embeddedApollo.addOrModifyProperty(anotherNamespace, "key3", someNewValue); embeddedApollo.addOrModifyProperty(anotherNamespace, "key3", someNewValue); assertTrue(changes.tryAcquire(5, TimeUnit.SECONDS)); assertEquals(someNewValue, otherConfig.getProperty("key3", null)); assertEquals(0, changes.availablePermits()); } @Test public void testDeleteProperties() throws Exception { Config otherConfig = ConfigService.getConfig(anotherNamespace); final SettableFuture<ConfigChangeEvent> future = SettableFuture.create(); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { future.set(changeEvent); } }); assertEquals("otherValue4", otherConfig.getProperty("key4", null)); assertEquals("otherValue5", otherConfig.getProperty("key5", null)); embeddedApollo.deleteProperty(anotherNamespace, "key4"); ConfigChangeEvent changeEvent = future.get(5, TimeUnit.SECONDS); assertNull(otherConfig.getProperty("key4", null)); assertEquals("otherValue5", otherConfig.getProperty("key5", null)); assertTrue(changeEvent.isChanged("key4")); } @Test public void testDeleteSamePropertyTwice() throws Exception { Config otherConfig = ConfigService.getConfig(anotherNamespace); final Semaphore changes = new Semaphore(0); otherConfig.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { changes.release(); } }); assertEquals("otherValue6", otherConfig.getProperty("key6", null)); embeddedApollo.deleteProperty(anotherNamespace, "key6"); embeddedApollo.deleteProperty(anotherNamespace, "key6"); assertTrue(changes.tryAcquire(5, TimeUnit.SECONDS)); assertNull(otherConfig.getProperty("key6", null)); assertEquals(0, changes.availablePermits()); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/java/com/ctrip/framework/foundation/internals/provider/DefaultServerProviderTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals.provider; import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX; import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import com.ctrip.framework.foundation.internals.Utils; import java.io.File; import java.io.FileInputStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import com.ctrip.framework.foundation.internals.provider.DefaultServerProvider; public class DefaultServerProviderTest { private DefaultServerProvider defaultServerProvider; @Before public void setUp() throws Exception { cleanUp(); defaultServerProvider = new DefaultServerProvider(); } @After public void tearDown() throws Exception { cleanUp(); } private void cleanUp() { System.clearProperty("env"); System.clearProperty("idc"); System.clearProperty("apollo.path.server.properties"); } @Test public void testGetServerPropertiesPathDefault() { assertEquals(Utils.isOSWindows() ? DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS : DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX, defaultServerProvider.getServerPropertiesPath()); } @Test public void testGetServerPropertiesPathCustom() { final String customPath = "/simple/custom/path"; System.setProperty("apollo.path.server.properties", customPath); assertEquals(customPath, defaultServerProvider.getServerPropertiesPath()); } @Test public void testEnvWithSystemProperty() throws Exception { String someEnv = "someEnv"; String someDc = "someDc"; System.setProperty("env", someEnv); System.setProperty("idc", someDc); defaultServerProvider.initialize(null); assertEquals(someEnv, defaultServerProvider.getEnvType()); assertEquals(someDc, defaultServerProvider.getDataCenter()); } @Test public void testWithPropertiesStream() throws Exception { File baseDir = new File("src/test/resources/properties"); File serverProperties = new File(baseDir, "server.properties"); defaultServerProvider.initialize(new FileInputStream(serverProperties)); assertEquals("SHAJQ", defaultServerProvider.getDataCenter()); assertTrue(defaultServerProvider.isEnvTypeSet()); assertEquals("DEV", defaultServerProvider.getEnvType()); } @Test public void testWithUTF8BomPropertiesStream() throws Exception { File baseDir = new File("src/test/resources/properties"); File serverProperties = new File(baseDir, "server-with-utf8bom.properties"); defaultServerProvider.initialize(new FileInputStream(serverProperties)); assertEquals("SHAJQ", defaultServerProvider.getDataCenter()); assertTrue(defaultServerProvider.isEnvTypeSet()); assertEquals("DEV", defaultServerProvider.getEnvType()); } @Test public void testWithPropertiesStreamAndEnvFromSystemProperty() throws Exception { String prodEnv = "pro"; System.setProperty("env", prodEnv); File baseDir = new File("src/test/resources/properties"); File serverProperties = new File(baseDir, "server.properties"); defaultServerProvider.initialize(new FileInputStream(serverProperties)); String predefinedDataCenter = "SHAJQ"; assertEquals(predefinedDataCenter, defaultServerProvider.getDataCenter()); assertTrue(defaultServerProvider.isEnvTypeSet()); assertEquals(prodEnv, defaultServerProvider.getEnvType()); } @Test public void testWithNoPropertiesStream() throws Exception { defaultServerProvider.initialize(null); assertNull(defaultServerProvider.getDataCenter()); assertFalse(defaultServerProvider.isEnvTypeSet()); assertNull(defaultServerProvider.getEnvType()); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals.provider; import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX; import static com.ctrip.framework.foundation.internals.provider.DefaultServerProvider.DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import com.ctrip.framework.foundation.internals.Utils; import java.io.File; import java.io.FileInputStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import com.ctrip.framework.foundation.internals.provider.DefaultServerProvider; public class DefaultServerProviderTest { private DefaultServerProvider defaultServerProvider; @Before public void setUp() throws Exception { cleanUp(); defaultServerProvider = new DefaultServerProvider(); } @After public void tearDown() throws Exception { cleanUp(); } private void cleanUp() { System.clearProperty("env"); System.clearProperty("idc"); System.clearProperty("apollo.path.server.properties"); } @Test public void testGetServerPropertiesPathDefault() { assertEquals(Utils.isOSWindows() ? DEFAULT_SERVER_PROPERTIES_PATH_ON_WINDOWS : DEFAULT_SERVER_PROPERTIES_PATH_ON_LINUX, defaultServerProvider.getServerPropertiesPath()); } @Test public void testGetServerPropertiesPathCustom() { final String customPath = "/simple/custom/path"; System.setProperty("apollo.path.server.properties", customPath); assertEquals(customPath, defaultServerProvider.getServerPropertiesPath()); } @Test public void testEnvWithSystemProperty() throws Exception { String someEnv = "someEnv"; String someDc = "someDc"; System.setProperty("env", someEnv); System.setProperty("idc", someDc); defaultServerProvider.initialize(null); assertEquals(someEnv, defaultServerProvider.getEnvType()); assertEquals(someDc, defaultServerProvider.getDataCenter()); } @Test public void testWithPropertiesStream() throws Exception { File baseDir = new File("src/test/resources/properties"); File serverProperties = new File(baseDir, "server.properties"); defaultServerProvider.initialize(new FileInputStream(serverProperties)); assertEquals("SHAJQ", defaultServerProvider.getDataCenter()); assertTrue(defaultServerProvider.isEnvTypeSet()); assertEquals("DEV", defaultServerProvider.getEnvType()); } @Test public void testWithUTF8BomPropertiesStream() throws Exception { File baseDir = new File("src/test/resources/properties"); File serverProperties = new File(baseDir, "server-with-utf8bom.properties"); defaultServerProvider.initialize(new FileInputStream(serverProperties)); assertEquals("SHAJQ", defaultServerProvider.getDataCenter()); assertTrue(defaultServerProvider.isEnvTypeSet()); assertEquals("DEV", defaultServerProvider.getEnvType()); } @Test public void testWithPropertiesStreamAndEnvFromSystemProperty() throws Exception { String prodEnv = "pro"; System.setProperty("env", prodEnv); File baseDir = new File("src/test/resources/properties"); File serverProperties = new File(baseDir, "server.properties"); defaultServerProvider.initialize(new FileInputStream(serverProperties)); String predefinedDataCenter = "SHAJQ"; assertEquals(predefinedDataCenter, defaultServerProvider.getDataCenter()); assertTrue(defaultServerProvider.isEnvTypeSet()); assertEquals(prodEnv, defaultServerProvider.getEnvType()); } @Test public void testWithNoPropertiesStream() throws Exception { defaultServerProvider.initialize(null); assertNull(defaultServerProvider.getDataCenter()); assertFalse(defaultServerProvider.isEnvTypeSet()); assertNull(defaultServerProvider.getEnvType()); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/package-info.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ /** * 携程内部的dal,第三方公司可替换实现 */ package com.ctrip.framework.apollo.common.datasource;
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ /** * 携程内部的dal,第三方公司可替换实现 */ package com.ctrip.framework.apollo.common.datasource;
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.internals.ConfigManager; import com.ctrip.framework.apollo.spi.ConfigFactory; import com.ctrip.framework.apollo.spi.ConfigRegistry; /** * Entry point for client config use * * @author Jason Song(song_s@ctrip.com) */ public class ConfigService { private static final ConfigService s_instance = new ConfigService(); private volatile ConfigManager m_configManager; private volatile ConfigRegistry m_configRegistry; private ConfigManager getManager() { if (m_configManager == null) { synchronized (this) { if (m_configManager == null) { m_configManager = ApolloInjector.getInstance(ConfigManager.class); } } } return m_configManager; } private ConfigRegistry getRegistry() { if (m_configRegistry == null) { synchronized (this) { if (m_configRegistry == null) { m_configRegistry = ApolloInjector.getInstance(ConfigRegistry.class); } } } return m_configRegistry; } /** * Get Application's config instance. * * @return config instance */ public static Config getAppConfig() { return getConfig(ConfigConsts.NAMESPACE_APPLICATION); } /** * Get the config instance for the namespace. * * @param namespace the namespace of the config * @return config instance */ public static Config getConfig(String namespace) { return s_instance.getManager().getConfig(namespace); } public static ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) { return s_instance.getManager().getConfigFile(namespace, configFileFormat); } static void setConfig(Config config) { setConfig(ConfigConsts.NAMESPACE_APPLICATION, config); } /** * Manually set the config for the namespace specified, use with caution. * * @param namespace the namespace * @param config the config instance */ static void setConfig(String namespace, final Config config) { s_instance.getRegistry().register(namespace, new ConfigFactory() { @Override public Config create(String namespace) { return config; } @Override public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) { return null; } }); } static void setConfigFactory(ConfigFactory factory) { setConfigFactory(ConfigConsts.NAMESPACE_APPLICATION, factory); } /** * Manually set the config factory for the namespace specified, use with caution. * * @param namespace the namespace * @param factory the factory instance */ static void setConfigFactory(String namespace, ConfigFactory factory) { s_instance.getRegistry().register(namespace, factory); } // for test only static void reset() { synchronized (s_instance) { s_instance.m_configManager = null; s_instance.m_configRegistry = null; } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.internals.ConfigManager; import com.ctrip.framework.apollo.spi.ConfigFactory; import com.ctrip.framework.apollo.spi.ConfigRegistry; /** * Entry point for client config use * * @author Jason Song(song_s@ctrip.com) */ public class ConfigService { private static final ConfigService s_instance = new ConfigService(); private volatile ConfigManager m_configManager; private volatile ConfigRegistry m_configRegistry; private ConfigManager getManager() { if (m_configManager == null) { synchronized (this) { if (m_configManager == null) { m_configManager = ApolloInjector.getInstance(ConfigManager.class); } } } return m_configManager; } private ConfigRegistry getRegistry() { if (m_configRegistry == null) { synchronized (this) { if (m_configRegistry == null) { m_configRegistry = ApolloInjector.getInstance(ConfigRegistry.class); } } } return m_configRegistry; } /** * Get Application's config instance. * * @return config instance */ public static Config getAppConfig() { return getConfig(ConfigConsts.NAMESPACE_APPLICATION); } /** * Get the config instance for the namespace. * * @param namespace the namespace of the config * @return config instance */ public static Config getConfig(String namespace) { return s_instance.getManager().getConfig(namespace); } public static ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) { return s_instance.getManager().getConfigFile(namespace, configFileFormat); } static void setConfig(Config config) { setConfig(ConfigConsts.NAMESPACE_APPLICATION, config); } /** * Manually set the config for the namespace specified, use with caution. * * @param namespace the namespace * @param config the config instance */ static void setConfig(String namespace, final Config config) { s_instance.getRegistry().register(namespace, new ConfigFactory() { @Override public Config create(String namespace) { return config; } @Override public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) { return null; } }); } static void setConfigFactory(ConfigFactory factory) { setConfigFactory(ConfigConsts.NAMESPACE_APPLICATION, factory); } /** * Manually set the config factory for the namespace specified, use with caution. * * @param namespace the namespace * @param factory the factory instance */ static void setConfigFactory(String namespace, ConfigFactory factory) { s_instance.getRegistry().register(namespace, factory); } // for test only static void reset() { synchronized (s_instance) { s_instance.m_configManager = null; s_instance.m_configRegistry = null; } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/FavoriteService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.Favorite; import com.ctrip.framework.apollo.portal.repository.FavoriteRepository; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.ctrip.framework.apollo.portal.spi.UserService; import java.util.Collections; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; import java.util.Objects; @Service public class FavoriteService { public static final long POSITION_DEFAULT = 10000; private final UserInfoHolder userInfoHolder; private final FavoriteRepository favoriteRepository; private final UserService userService; public FavoriteService( final UserInfoHolder userInfoHolder, final FavoriteRepository favoriteRepository, final UserService userService) { this.userInfoHolder = userInfoHolder; this.favoriteRepository = favoriteRepository; this.userService = userService; } public Favorite addFavorite(Favorite favorite) { UserInfo user = userService.findByUserId(favorite.getUserId()); if (user == null) { throw new BadRequestException("user not exist"); } UserInfo loginUser = userInfoHolder.getUser(); //user can only add himself favorite app if (!loginUser.equals(user)) { throw new BadRequestException("add favorite fail. " + "because favorite's user is not current login user."); } Favorite checkedFavorite = favoriteRepository.findByUserIdAndAppId(loginUser.getUserId(), favorite.getAppId()); if (checkedFavorite != null) { return checkedFavorite; } favorite.setPosition(POSITION_DEFAULT); favorite.setDataChangeCreatedBy(user.getUserId()); favorite.setDataChangeLastModifiedBy(user.getUserId()); return favoriteRepository.save(favorite); } public List<Favorite> search(String userId, String appId, Pageable page) { boolean isUserIdEmpty = StringUtils.isEmpty(userId); boolean isAppIdEmpty = StringUtils.isEmpty(appId); if (isAppIdEmpty && isUserIdEmpty) { throw new BadRequestException("user id and app id can't be empty at the same time"); } if (!isUserIdEmpty) { UserInfo loginUser = userInfoHolder.getUser(); //user can only search his own favorite app if (!Objects.equals(loginUser.getUserId(), userId)) { userId = loginUser.getUserId(); } } //search by userId if (isAppIdEmpty && !isUserIdEmpty) { return favoriteRepository.findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId, page); } //search by appId if (!isAppIdEmpty && isUserIdEmpty) { return favoriteRepository.findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(appId, page); } //search by userId and appId return Collections.singletonList(favoriteRepository.findByUserIdAndAppId(userId, appId)); } public void deleteFavorite(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); favoriteRepository.delete(favorite); } public void adjustFavoriteToFirst(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); String userId = favorite.getUserId(); Favorite firstFavorite = favoriteRepository.findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId); long minPosition = firstFavorite.getPosition(); favorite.setPosition(minPosition - 1); favoriteRepository.save(favorite); } private void checkUserOperatePermission(Favorite favorite) { if (favorite == null) { throw new BadRequestException("favorite not exist"); } if (!Objects.equals(userInfoHolder.getUser().getUserId(), favorite.getUserId())) { throw new BadRequestException("can not operate other person's favorite"); } } public void batchDeleteByAppId(String appId, String operator) { favoriteRepository.batchDeleteByAppId(appId, operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.Favorite; import com.ctrip.framework.apollo.portal.repository.FavoriteRepository; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.ctrip.framework.apollo.portal.spi.UserService; import java.util.Collections; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; import java.util.Objects; @Service public class FavoriteService { public static final long POSITION_DEFAULT = 10000; private final UserInfoHolder userInfoHolder; private final FavoriteRepository favoriteRepository; private final UserService userService; public FavoriteService( final UserInfoHolder userInfoHolder, final FavoriteRepository favoriteRepository, final UserService userService) { this.userInfoHolder = userInfoHolder; this.favoriteRepository = favoriteRepository; this.userService = userService; } public Favorite addFavorite(Favorite favorite) { UserInfo user = userService.findByUserId(favorite.getUserId()); if (user == null) { throw new BadRequestException("user not exist"); } UserInfo loginUser = userInfoHolder.getUser(); //user can only add himself favorite app if (!loginUser.equals(user)) { throw new BadRequestException("add favorite fail. " + "because favorite's user is not current login user."); } Favorite checkedFavorite = favoriteRepository.findByUserIdAndAppId(loginUser.getUserId(), favorite.getAppId()); if (checkedFavorite != null) { return checkedFavorite; } favorite.setPosition(POSITION_DEFAULT); favorite.setDataChangeCreatedBy(user.getUserId()); favorite.setDataChangeLastModifiedBy(user.getUserId()); return favoriteRepository.save(favorite); } public List<Favorite> search(String userId, String appId, Pageable page) { boolean isUserIdEmpty = StringUtils.isEmpty(userId); boolean isAppIdEmpty = StringUtils.isEmpty(appId); if (isAppIdEmpty && isUserIdEmpty) { throw new BadRequestException("user id and app id can't be empty at the same time"); } if (!isUserIdEmpty) { UserInfo loginUser = userInfoHolder.getUser(); //user can only search his own favorite app if (!Objects.equals(loginUser.getUserId(), userId)) { userId = loginUser.getUserId(); } } //search by userId if (isAppIdEmpty && !isUserIdEmpty) { return favoriteRepository.findByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId, page); } //search by appId if (!isAppIdEmpty && isUserIdEmpty) { return favoriteRepository.findByAppIdOrderByPositionAscDataChangeCreatedTimeAsc(appId, page); } //search by userId and appId return Collections.singletonList(favoriteRepository.findByUserIdAndAppId(userId, appId)); } public void deleteFavorite(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); favoriteRepository.delete(favorite); } public void adjustFavoriteToFirst(long favoriteId) { Favorite favorite = favoriteRepository.findById(favoriteId).orElse(null); checkUserOperatePermission(favorite); String userId = favorite.getUserId(); Favorite firstFavorite = favoriteRepository.findFirstByUserIdOrderByPositionAscDataChangeCreatedTimeAsc(userId); long minPosition = firstFavorite.getPosition(); favorite.setPosition(minPosition - 1); favoriteRepository.save(favorite); } private void checkUserOperatePermission(Favorite favorite) { if (favorite == null) { throw new BadRequestException("favorite not exist"); } if (!Objects.equals(userInfoHolder.getUser().getUserId(), favorite.getUserId())) { throw new BadRequestException("can not operate other person's favorite"); } } public void batchDeleteByAppId(String appId, String operator) { favoriteRepository.batchDeleteByAppId(appId, operator); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/util/yaml/YamlParser.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.util.yaml; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.util.factory.PropertiesFactory; import java.util.AbstractMap; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.parser.ParserException; import com.ctrip.framework.apollo.core.utils.StringUtils; /** * Transplanted from org.springframework.beans.factory.config.YamlProcessor since apollo can't depend on Spring directly * * @since 1.3.0 */ public class YamlParser { private static final Logger logger = LoggerFactory.getLogger(YamlParser.class); private PropertiesFactory propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class); /** * Transform yaml content to properties */ public Properties yamlToProperties(String yamlContent) { Yaml yaml = createYaml(); final Properties result = propertiesFactory.getPropertiesInstance(); process(new MatchCallback() { @Override public void process(Properties properties, Map<String, Object> map) { result.putAll(properties); } }, yaml, yamlContent); return result; } /** * Create the {@link Yaml} instance to use. */ private Yaml createYaml() { return new Yaml(new StrictMapAppenderConstructor()); } private boolean process(MatchCallback callback, Yaml yaml, String content) { int count = 0; if (logger.isDebugEnabled()) { logger.debug("Loading from YAML: " + content); } for (Object object : yaml.loadAll(content)) { if (object != null && process(asMap(object), callback)) { count++; } } if (logger.isDebugEnabled()) { logger.debug("Loaded " + count + " document" + (count > 1 ? "s" : "") + " from YAML resource: " + content); } return (count > 0); } @SuppressWarnings("unchecked") private Map<String, Object> asMap(Object object) { // YAML can have numbers as keys Map<String, Object> result = new LinkedHashMap<>(); if (!(object instanceof Map)) { // A document can be a text literal result.put("document", object); return result; } Map<Object, Object> map = (Map<Object, Object>) object; for (Map.Entry<Object, Object> entry : map.entrySet()) { Object value = entry.getValue(); if (value instanceof Map) { value = asMap(value); } Object key = entry.getKey(); if (key instanceof CharSequence) { result.put(key.toString(), value); } else { // It has to be a map key in this case result.put("[" + key.toString() + "]", value); } } return result; } private boolean process(Map<String, Object> map, MatchCallback callback) { Properties properties = propertiesFactory.getPropertiesInstance(); properties.putAll(getFlattenedMap(map)); if (logger.isDebugEnabled()) { logger.debug("Merging document (no matchers set): " + map); } callback.process(properties, map); return true; } private Map<String, Object> getFlattenedMap(Map<String, Object> source) { Map<String, Object> result = new LinkedHashMap<>(); buildFlattenedMap(result, source, null); return result; } private void buildFlattenedMap(Map<String, Object> result, Map<String, Object> source, String path) { for (Map.Entry<String, Object> entry : source.entrySet()) { String key = entry.getKey(); if (!StringUtils.isBlank(path)) { if (key.startsWith("[")) { key = path + key; } else { key = path + '.' + key; } } Object value = entry.getValue(); if (value instanceof String) { result.put(key, value); } else if (value instanceof Map) { // Need a compound key @SuppressWarnings("unchecked") Map<String, Object> map = (Map<String, Object>) value; buildFlattenedMap(result, map, key); } else if (value instanceof Collection) { // Need a compound key @SuppressWarnings("unchecked") Collection<Object> collection = (Collection<Object>) value; int count = 0; for (Object object : collection) { buildFlattenedMap(result, Collections.singletonMap("[" + (count++) + "]", object), key); } } else { result.put(key, (value != null ? value.toString() : "")); } } } private interface MatchCallback { void process(Properties properties, Map<String, Object> map); } /** * A specialized {@link SafeConstructor} that checks for duplicate keys. */ private static class StrictMapAppenderConstructor extends SafeConstructor { // Declared as public for use in subclasses StrictMapAppenderConstructor() { super(); } @Override protected Map<Object, Object> constructMapping(MappingNode node) { try { return super.constructMapping(node); } catch (IllegalStateException ex) { throw new ParserException("while parsing MappingNode", node.getStartMark(), ex.getMessage(), node.getEndMark()); } } @Override protected Map<Object, Object> createDefaultMap() { final Map<Object, Object> delegate = super.createDefaultMap(); return new AbstractMap<Object, Object>() { @Override public Object put(Object key, Object value) { if (delegate.containsKey(key)) { throw new IllegalStateException("Duplicate key: " + key); } return delegate.put(key, value); } @Override public Set<Entry<Object, Object>> entrySet() { return delegate.entrySet(); } }; } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.util.yaml; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.util.factory.PropertiesFactory; import java.util.AbstractMap; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.parser.ParserException; import com.ctrip.framework.apollo.core.utils.StringUtils; /** * Transplanted from org.springframework.beans.factory.config.YamlProcessor since apollo can't depend on Spring directly * * @since 1.3.0 */ public class YamlParser { private static final Logger logger = LoggerFactory.getLogger(YamlParser.class); private PropertiesFactory propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class); /** * Transform yaml content to properties */ public Properties yamlToProperties(String yamlContent) { Yaml yaml = createYaml(); final Properties result = propertiesFactory.getPropertiesInstance(); process(new MatchCallback() { @Override public void process(Properties properties, Map<String, Object> map) { result.putAll(properties); } }, yaml, yamlContent); return result; } /** * Create the {@link Yaml} instance to use. */ private Yaml createYaml() { return new Yaml(new StrictMapAppenderConstructor()); } private boolean process(MatchCallback callback, Yaml yaml, String content) { int count = 0; if (logger.isDebugEnabled()) { logger.debug("Loading from YAML: " + content); } for (Object object : yaml.loadAll(content)) { if (object != null && process(asMap(object), callback)) { count++; } } if (logger.isDebugEnabled()) { logger.debug("Loaded " + count + " document" + (count > 1 ? "s" : "") + " from YAML resource: " + content); } return (count > 0); } @SuppressWarnings("unchecked") private Map<String, Object> asMap(Object object) { // YAML can have numbers as keys Map<String, Object> result = new LinkedHashMap<>(); if (!(object instanceof Map)) { // A document can be a text literal result.put("document", object); return result; } Map<Object, Object> map = (Map<Object, Object>) object; for (Map.Entry<Object, Object> entry : map.entrySet()) { Object value = entry.getValue(); if (value instanceof Map) { value = asMap(value); } Object key = entry.getKey(); if (key instanceof CharSequence) { result.put(key.toString(), value); } else { // It has to be a map key in this case result.put("[" + key.toString() + "]", value); } } return result; } private boolean process(Map<String, Object> map, MatchCallback callback) { Properties properties = propertiesFactory.getPropertiesInstance(); properties.putAll(getFlattenedMap(map)); if (logger.isDebugEnabled()) { logger.debug("Merging document (no matchers set): " + map); } callback.process(properties, map); return true; } private Map<String, Object> getFlattenedMap(Map<String, Object> source) { Map<String, Object> result = new LinkedHashMap<>(); buildFlattenedMap(result, source, null); return result; } private void buildFlattenedMap(Map<String, Object> result, Map<String, Object> source, String path) { for (Map.Entry<String, Object> entry : source.entrySet()) { String key = entry.getKey(); if (!StringUtils.isBlank(path)) { if (key.startsWith("[")) { key = path + key; } else { key = path + '.' + key; } } Object value = entry.getValue(); if (value instanceof String) { result.put(key, value); } else if (value instanceof Map) { // Need a compound key @SuppressWarnings("unchecked") Map<String, Object> map = (Map<String, Object>) value; buildFlattenedMap(result, map, key); } else if (value instanceof Collection) { // Need a compound key @SuppressWarnings("unchecked") Collection<Object> collection = (Collection<Object>) value; int count = 0; for (Object object : collection) { buildFlattenedMap(result, Collections.singletonMap("[" + (count++) + "]", object), key); } } else { result.put(key, (value != null ? value.toString() : "")); } } } private interface MatchCallback { void process(Properties properties, Map<String, Object> map); } /** * A specialized {@link SafeConstructor} that checks for duplicate keys. */ private static class StrictMapAppenderConstructor extends SafeConstructor { // Declared as public for use in subclasses StrictMapAppenderConstructor() { super(); } @Override protected Map<Object, Object> constructMapping(MappingNode node) { try { return super.constructMapping(node); } catch (IllegalStateException ex) { throw new ParserException("while parsing MappingNode", node.getStartMark(), ex.getMessage(), node.getEndMark()); } } @Override protected Map<Object, Object> createDefaultMap() { final Map<Object, Object> delegate = super.createDefaultMap(); return new AbstractMap<Object, Object>() { @Override public Object put(Object key, Object value) { if (delegate.containsKey(key)) { throw new IllegalStateException("Duplicate key: " + key); } return delegate.put(key, value); } @Override public Set<Entry<Object, Object>> entrySet() { return delegate.entrySet(); } }; } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/aop/PreAcquireNamespaceLock.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.aop; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * 标识方法需要获取到namespace的lock才能执行 */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface PreAcquireNamespaceLock { }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.aop; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** * 标识方法需要获取到namespace的lock才能执行 */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface PreAcquireNamespaceLock { }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripUserServiceTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.ctrip; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.portal.AbstractUnitTest; import com.ctrip.framework.apollo.portal.component.config.PortalConfig; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import java.util.List; import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ public class CtripUserServiceTest extends AbstractUnitTest{ private CtripUserService ctripUserService; private String someUserServiceUrl; private String someUserServiceToken; private ParameterizedTypeReference<Map<String, List<CtripUserService.UserServiceResponse>>> someResponseType; @Mock private PortalConfig portalConfig; @Mock private RestTemplate restTemplate; @Before public void setUp() throws Exception { when(portalConfig.connectTimeout()).thenReturn(3000); when(portalConfig.readTimeout()).thenReturn(3000); ctripUserService = new CtripUserService(portalConfig); ReflectionTestUtils.setField(ctripUserService, "restTemplate", restTemplate); someResponseType = (ParameterizedTypeReference<Map<String, List<CtripUserService.UserServiceResponse>>>) ReflectionTestUtils .getField(ctripUserService, "responseType"); someUserServiceUrl = "http://someurl"; someUserServiceToken = "someToken"; when(portalConfig.userServiceUrl()).thenReturn(someUserServiceUrl); when(portalConfig.userServiceAccessToken()).thenReturn(someUserServiceToken); } @Test public void testAssembleSearchUserRequest() throws Exception { String someKeyword = "someKeyword"; int someOffset = 0; int someLimit = 10; CtripUserService.UserServiceRequest request = ctripUserService.assembleSearchUserRequest(someKeyword, someOffset, someLimit); assertEquals(someUserServiceToken, request.getAccess_token()); CtripUserService.UserServiceRequestBody requestBody = request.getRequest_body(); assertEquals("itdb_emloyee", requestBody.getIndexAlias()); Map<String, Object> queryJson = requestBody.getQueryJson(); assertEquals(someOffset, queryJson.get("from")); assertEquals(someLimit, queryJson.get("size")); Map<String, Object> query = (Map<String, Object>) queryJson.get("query"); Map<String, Object> multiMatchMap = (Map<String, Object>) query.get("multi_match"); assertEquals(someKeyword, multiMatchMap.get("query")); } @Test public void testAssembleFindUserRequest() throws Exception { String someUserId = "someUser"; String anotherUserId = "anotherUser"; List<String> userIds = Lists.newArrayList(someUserId, anotherUserId); CtripUserService.UserServiceRequest request = ctripUserService.assembleFindUserRequest(userIds); assertEquals(someUserServiceToken, request.getAccess_token()); CtripUserService.UserServiceRequestBody requestBody = request.getRequest_body(); assertEquals("itdb_emloyee", requestBody.getIndexAlias()); Map<String, Object> queryJson = requestBody.getQueryJson(); assertEquals(0, queryJson.get("from")); assertEquals(2, queryJson.get("size")); Map<String, Object> query = (Map<String, Object>) queryJson.get("query"); Map<String, Object> terms = getMapFromMap(getMapFromMap(getMapFromMap(query, "filtered"), "filter"), "terms"); List<String> userIdTerms = (List<String>) terms.get("empaccount"); assertTrue(userIdTerms.containsAll(userIds)); } private Map<String, Object> getMapFromMap(Map<String, Object> map, String key) { return (Map<String, Object>) map.get(key); } @Test public void testSearchUsers() throws Exception { String someUserId = "someUserId"; String someName = "someName"; String someEmail = "someEmail"; String anotherUserId = "anotherUserId"; String anotherName = "anotherName"; String anotherEmail = "anotherEmail"; String someKeyword = "someKeyword"; int someOffset = 0; int someLimit = 10; CtripUserService.UserServiceResponse someUserResponse = assembleUserServiceResponse(someUserId, someName, someEmail); CtripUserService.UserServiceResponse anotherUserResponse = assembleUserServiceResponse(anotherUserId, anotherName, anotherEmail); Map<String, List<CtripUserService.UserServiceResponse>> resultMap = ImmutableMap.of("result", Lists.newArrayList(someUserResponse, anotherUserResponse)); ResponseEntity<Map<String, List<CtripUserService.UserServiceResponse>>> someResponse = new ResponseEntity<>(resultMap, HttpStatus.OK); when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))).thenReturn(someResponse); List<UserInfo> users = ctripUserService.searchUsers(someKeyword, someOffset, someLimit); assertEquals(2, users.size()); compareUserInfoAndUserServiceResponse(someUserResponse, users.get(0)); compareUserInfoAndUserServiceResponse(anotherUserResponse, users.get(1)); } @Test(expected = HttpClientErrorException.class) public void testSearchUsersWithError() throws Exception { when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))) .thenThrow(new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR)); String someKeyword = "someKeyword"; int someOffset = 0; int someLimit = 10; ctripUserService.searchUsers(someKeyword, someOffset, someLimit); } @Test public void testFindByUserId() throws Exception { String someUserId = "someUserId"; String someName = "someName"; String someEmail = "someEmail"; CtripUserService.UserServiceResponse someUserResponse = assembleUserServiceResponse(someUserId, someName, someEmail); Map<String, List<CtripUserService.UserServiceResponse>> resultMap = ImmutableMap.of("result", Lists.newArrayList(someUserResponse)); ResponseEntity<Map<String, List<CtripUserService.UserServiceResponse>>> someResponse = new ResponseEntity<>(resultMap, HttpStatus.OK); when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))).thenReturn(someResponse); UserInfo user = ctripUserService.findByUserId(someUserId); compareUserInfoAndUserServiceResponse(someUserResponse, user); } @Test public void testFindByUserIds() throws Exception { String someUserId = "someUserId"; String someName = "someName"; String someEmail = "someEmail"; String anotherUserId = "anotherUserId"; String anotherName = "anotherName"; String anotherEmail = "anotherEmail"; String someKeyword = "someKeyword"; CtripUserService.UserServiceResponse someUserResponse = assembleUserServiceResponse(someUserId, someName, someEmail); CtripUserService.UserServiceResponse anotherUserResponse = assembleUserServiceResponse(anotherUserId, anotherName, anotherEmail); Map<String, List<CtripUserService.UserServiceResponse>> resultMap = ImmutableMap.of("result", Lists.newArrayList(someUserResponse, anotherUserResponse)); ResponseEntity<Map<String, List<CtripUserService.UserServiceResponse>>> someResponse = new ResponseEntity<>(resultMap, HttpStatus.OK); when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))).thenReturn(someResponse); List<UserInfo> users = ctripUserService.findByUserIds(Lists.newArrayList(someUserId, anotherUserId)); assertEquals(2, users.size()); compareUserInfoAndUserServiceResponse(someUserResponse, users.get(0)); compareUserInfoAndUserServiceResponse(anotherUserResponse, users.get(1)); } private void compareUserInfoAndUserServiceResponse( CtripUserService.UserServiceResponse userServiceReponse, UserInfo userInfo) { assertEquals(userServiceReponse.getEmpaccount(), userInfo.getUserId()); assertEquals(userServiceReponse.getDisplayname(), userInfo.getName()); assertEquals(userServiceReponse.getEmail(), userInfo.getEmail()); } private CtripUserService.UserServiceResponse assembleUserServiceResponse(String userId, String name, String email) { CtripUserService.UserServiceResponse response = new CtripUserService.UserServiceResponse(); response.setEmpaccount(userId); response.setDisplayname(name); response.setEmail(email); return response; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.ctrip; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.portal.AbstractUnitTest; import com.ctrip.framework.apollo.portal.component.config.PortalConfig; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import java.util.List; import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ public class CtripUserServiceTest extends AbstractUnitTest{ private CtripUserService ctripUserService; private String someUserServiceUrl; private String someUserServiceToken; private ParameterizedTypeReference<Map<String, List<CtripUserService.UserServiceResponse>>> someResponseType; @Mock private PortalConfig portalConfig; @Mock private RestTemplate restTemplate; @Before public void setUp() throws Exception { when(portalConfig.connectTimeout()).thenReturn(3000); when(portalConfig.readTimeout()).thenReturn(3000); ctripUserService = new CtripUserService(portalConfig); ReflectionTestUtils.setField(ctripUserService, "restTemplate", restTemplate); someResponseType = (ParameterizedTypeReference<Map<String, List<CtripUserService.UserServiceResponse>>>) ReflectionTestUtils .getField(ctripUserService, "responseType"); someUserServiceUrl = "http://someurl"; someUserServiceToken = "someToken"; when(portalConfig.userServiceUrl()).thenReturn(someUserServiceUrl); when(portalConfig.userServiceAccessToken()).thenReturn(someUserServiceToken); } @Test public void testAssembleSearchUserRequest() throws Exception { String someKeyword = "someKeyword"; int someOffset = 0; int someLimit = 10; CtripUserService.UserServiceRequest request = ctripUserService.assembleSearchUserRequest(someKeyword, someOffset, someLimit); assertEquals(someUserServiceToken, request.getAccess_token()); CtripUserService.UserServiceRequestBody requestBody = request.getRequest_body(); assertEquals("itdb_emloyee", requestBody.getIndexAlias()); Map<String, Object> queryJson = requestBody.getQueryJson(); assertEquals(someOffset, queryJson.get("from")); assertEquals(someLimit, queryJson.get("size")); Map<String, Object> query = (Map<String, Object>) queryJson.get("query"); Map<String, Object> multiMatchMap = (Map<String, Object>) query.get("multi_match"); assertEquals(someKeyword, multiMatchMap.get("query")); } @Test public void testAssembleFindUserRequest() throws Exception { String someUserId = "someUser"; String anotherUserId = "anotherUser"; List<String> userIds = Lists.newArrayList(someUserId, anotherUserId); CtripUserService.UserServiceRequest request = ctripUserService.assembleFindUserRequest(userIds); assertEquals(someUserServiceToken, request.getAccess_token()); CtripUserService.UserServiceRequestBody requestBody = request.getRequest_body(); assertEquals("itdb_emloyee", requestBody.getIndexAlias()); Map<String, Object> queryJson = requestBody.getQueryJson(); assertEquals(0, queryJson.get("from")); assertEquals(2, queryJson.get("size")); Map<String, Object> query = (Map<String, Object>) queryJson.get("query"); Map<String, Object> terms = getMapFromMap(getMapFromMap(getMapFromMap(query, "filtered"), "filter"), "terms"); List<String> userIdTerms = (List<String>) terms.get("empaccount"); assertTrue(userIdTerms.containsAll(userIds)); } private Map<String, Object> getMapFromMap(Map<String, Object> map, String key) { return (Map<String, Object>) map.get(key); } @Test public void testSearchUsers() throws Exception { String someUserId = "someUserId"; String someName = "someName"; String someEmail = "someEmail"; String anotherUserId = "anotherUserId"; String anotherName = "anotherName"; String anotherEmail = "anotherEmail"; String someKeyword = "someKeyword"; int someOffset = 0; int someLimit = 10; CtripUserService.UserServiceResponse someUserResponse = assembleUserServiceResponse(someUserId, someName, someEmail); CtripUserService.UserServiceResponse anotherUserResponse = assembleUserServiceResponse(anotherUserId, anotherName, anotherEmail); Map<String, List<CtripUserService.UserServiceResponse>> resultMap = ImmutableMap.of("result", Lists.newArrayList(someUserResponse, anotherUserResponse)); ResponseEntity<Map<String, List<CtripUserService.UserServiceResponse>>> someResponse = new ResponseEntity<>(resultMap, HttpStatus.OK); when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))).thenReturn(someResponse); List<UserInfo> users = ctripUserService.searchUsers(someKeyword, someOffset, someLimit); assertEquals(2, users.size()); compareUserInfoAndUserServiceResponse(someUserResponse, users.get(0)); compareUserInfoAndUserServiceResponse(anotherUserResponse, users.get(1)); } @Test(expected = HttpClientErrorException.class) public void testSearchUsersWithError() throws Exception { when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))) .thenThrow(new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR)); String someKeyword = "someKeyword"; int someOffset = 0; int someLimit = 10; ctripUserService.searchUsers(someKeyword, someOffset, someLimit); } @Test public void testFindByUserId() throws Exception { String someUserId = "someUserId"; String someName = "someName"; String someEmail = "someEmail"; CtripUserService.UserServiceResponse someUserResponse = assembleUserServiceResponse(someUserId, someName, someEmail); Map<String, List<CtripUserService.UserServiceResponse>> resultMap = ImmutableMap.of("result", Lists.newArrayList(someUserResponse)); ResponseEntity<Map<String, List<CtripUserService.UserServiceResponse>>> someResponse = new ResponseEntity<>(resultMap, HttpStatus.OK); when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))).thenReturn(someResponse); UserInfo user = ctripUserService.findByUserId(someUserId); compareUserInfoAndUserServiceResponse(someUserResponse, user); } @Test public void testFindByUserIds() throws Exception { String someUserId = "someUserId"; String someName = "someName"; String someEmail = "someEmail"; String anotherUserId = "anotherUserId"; String anotherName = "anotherName"; String anotherEmail = "anotherEmail"; String someKeyword = "someKeyword"; CtripUserService.UserServiceResponse someUserResponse = assembleUserServiceResponse(someUserId, someName, someEmail); CtripUserService.UserServiceResponse anotherUserResponse = assembleUserServiceResponse(anotherUserId, anotherName, anotherEmail); Map<String, List<CtripUserService.UserServiceResponse>> resultMap = ImmutableMap.of("result", Lists.newArrayList(someUserResponse, anotherUserResponse)); ResponseEntity<Map<String, List<CtripUserService.UserServiceResponse>>> someResponse = new ResponseEntity<>(resultMap, HttpStatus.OK); when(restTemplate.exchange(eq(someUserServiceUrl), eq(HttpMethod.POST), any(HttpEntity.class), eq(someResponseType))).thenReturn(someResponse); List<UserInfo> users = ctripUserService.findByUserIds(Lists.newArrayList(someUserId, anotherUserId)); assertEquals(2, users.size()); compareUserInfoAndUserServiceResponse(someUserResponse, users.get(0)); compareUserInfoAndUserServiceResponse(anotherUserResponse, users.get(1)); } private void compareUserInfoAndUserServiceResponse( CtripUserService.UserServiceResponse userServiceReponse, UserInfo userInfo) { assertEquals(userServiceReponse.getEmpaccount(), userInfo.getUserId()); assertEquals(userServiceReponse.getDisplayname(), userInfo.getName()); assertEquals(userServiceReponse.getEmail(), userInfo.getEmail()); } private CtripUserService.UserServiceResponse assembleUserServiceResponse(String userId, String name, String email) { CtripUserService.UserServiceResponse response = new CtripUserService.UserServiceResponse(); response.setEmpaccount(userId); response.setDisplayname(name); response.setEmail(email); return response; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.entity; import com.ctrip.framework.apollo.common.entity.BaseEntity; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; /** * @author Jason Song(song_s@ctrip.com) */ @Entity @Table(name = "Cluster") @SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?") @Where(clause = "isDeleted = 0") public class Cluster extends BaseEntity implements Comparable<Cluster> { @Column(name = "Name", nullable = false) private String name; @Column(name = "AppId", nullable = false) private String appId; @Column(name = "ParentClusterId", nullable = false) private long parentClusterId; public String getAppId() { return appId; } public String getName() { return name; } public void setAppId(String appId) { this.appId = appId; } public void setName(String name) { this.name = name; } public long getParentClusterId() { return parentClusterId; } public void setParentClusterId(long parentClusterId) { this.parentClusterId = parentClusterId; } public String toString() { return toStringHelper().add("name", name).add("appId", appId) .add("parentClusterId", parentClusterId).toString(); } @Override public int compareTo(Cluster o) { if (o == null || getId() > o.getId()) { return 1; } if (getId() == o.getId()) { return 0; } return -1; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.entity; import com.ctrip.framework.apollo.common.entity.BaseEntity; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; /** * @author Jason Song(song_s@ctrip.com) */ @Entity @Table(name = "Cluster") @SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?") @Where(clause = "isDeleted = 0") public class Cluster extends BaseEntity implements Comparable<Cluster> { @Column(name = "Name", nullable = false) private String name; @Column(name = "AppId", nullable = false) private String appId; @Column(name = "ParentClusterId", nullable = false) private long parentClusterId; public String getAppId() { return appId; } public String getName() { return name; } public void setAppId(String appId) { this.appId = appId; } public void setName(String name) { this.name = name; } public long getParentClusterId() { return parentClusterId; } public void setParentClusterId(long parentClusterId) { this.parentClusterId = parentClusterId; } public String toString() { return toStringHelper().add("name", name).add("appId", appId) .add("parentClusterId", parentClusterId).toString(); } @Override public int compareTo(Cluster o) { if (o == null || getId() > o.getId()) { return 1; } if (getId() == o.getId()) { return 0; } return -1; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/controller/ItemControllerTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.portal.component.PermissionValidator; import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel; import com.ctrip.framework.apollo.portal.service.ItemService; import com.ctrip.framework.apollo.portal.service.NamespaceService; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.google.common.base.Charsets; import com.google.common.io.Files; import java.io.File; import java.io.IOException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.yaml.snakeyaml.constructor.ConstructorException; import org.yaml.snakeyaml.constructor.DuplicateKeyException; @RunWith(MockitoJUnitRunner.class) public class ItemControllerTest { @Mock private ItemService configService; @Mock private NamespaceService namespaceService; @Mock private UserInfoHolder userInfoHolder; @Mock private PermissionValidator permissionValidator; @InjectMocks private ItemController itemController; @Before public void setUp() throws Exception { itemController = new ItemController(configService, userInfoHolder, permissionValidator, namespaceService); } @Test public void yamlSyntaxCheckOK() throws Exception { String yaml = loadYaml("case1.yaml"); itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml)); } @Test(expected = DuplicateKeyException.class) public void yamlSyntaxCheckWithDuplicatedValue() throws Exception { String yaml = loadYaml("case2.yaml"); itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml)); } @Test(expected = ConstructorException.class) public void yamlSyntaxCheckWithUnsupportedType() throws Exception { String yaml = loadYaml("case3.yaml"); itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml)); } private NamespaceTextModel assemble(String format, String content) { NamespaceTextModel model = new NamespaceTextModel(); model.setFormat(format); model.setConfigText(content); return model; } private String loadYaml(String caseName) throws IOException { File file = new File("src/test/resources/yaml/" + caseName); return Files.toString(file, Charsets.UTF_8); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.controller; import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.portal.component.PermissionValidator; import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel; import com.ctrip.framework.apollo.portal.service.ItemService; import com.ctrip.framework.apollo.portal.service.NamespaceService; import com.ctrip.framework.apollo.portal.spi.UserInfoHolder; import com.google.common.base.Charsets; import com.google.common.io.Files; import java.io.File; import java.io.IOException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.yaml.snakeyaml.constructor.ConstructorException; import org.yaml.snakeyaml.constructor.DuplicateKeyException; @RunWith(MockitoJUnitRunner.class) public class ItemControllerTest { @Mock private ItemService configService; @Mock private NamespaceService namespaceService; @Mock private UserInfoHolder userInfoHolder; @Mock private PermissionValidator permissionValidator; @InjectMocks private ItemController itemController; @Before public void setUp() throws Exception { itemController = new ItemController(configService, userInfoHolder, permissionValidator, namespaceService); } @Test public void yamlSyntaxCheckOK() throws Exception { String yaml = loadYaml("case1.yaml"); itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml)); } @Test(expected = DuplicateKeyException.class) public void yamlSyntaxCheckWithDuplicatedValue() throws Exception { String yaml = loadYaml("case2.yaml"); itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml)); } @Test(expected = ConstructorException.class) public void yamlSyntaxCheckWithUnsupportedType() throws Exception { String yaml = loadYaml("case3.yaml"); itemController.doSyntaxCheck(assemble(ConfigFileFormat.YAML.getValue(), yaml)); } private NamespaceTextModel assemble(String format, String content) { NamespaceTextModel model = new NamespaceTextModel(); model.setFormat(format); model.setConfigText(content); return model; } private String loadYaml(String caseName) throws IOException { File file = new File("src/test/resources/yaml/" + caseName); return Files.toString(file, Charsets.UTF_8); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/usage/apollo-user-practices.md
TODO
TODO
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/services/SystemInfoService.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('SystemInfoService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var system_info_resource = $resource('', {}, { load_system_info: { method: 'GET', url: AppUtil.prefixPath() + '/system-info' }, check_health: { method: 'GET', url: AppUtil.prefixPath() + '/system-info/health' } }); return { load_system_info: function () { var d = $q.defer(); system_info_resource.load_system_info({}, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, check_health: function (instanceId, host) { var d = $q.defer(); system_info_resource.check_health({ instanceId: instanceId }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('SystemInfoService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var system_info_resource = $resource('', {}, { load_system_info: { method: 'GET', url: AppUtil.prefixPath() + '/system-info' }, check_health: { method: 'GET', url: AppUtil.prefixPath() + '/system-info/health' } }); return { load_system_info: function () { var d = $q.defer(); system_info_resource.load_system_info({}, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, check_health: function (instanceId, host) { var d = $q.defer(); system_info_resource.check_health({ instanceId: instanceId }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/config_export.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="config_export"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css"> <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <title>{{'ConfigExport.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid"> <div class="col-md-8 col-md-offset-2 panel"> <section class="panel-body"> <div class="row"> <header class="panel-heading"> {{'ConfigExport.Title' | translate }} <small> {{'ConfigExport.TitleTips' | translate}} </small> </header> <div class="col-sm-offset-2 col-sm-9"> <a href="export" target="_blank"> <button class="btn btn-block btn-lg btn-primary"> {{'ConfigExport.Download' | translate }} </button> </a> </div> </div> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-route.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!--valdr--> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/lodash.min.js"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/ClusterService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/services/SystemInfoService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/PageCommon.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/valdr.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/services/OrganizationService.js"></script> </body> </html>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="config_export"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css"> <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <title>{{'ConfigExport.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid"> <div class="col-md-8 col-md-offset-2 panel"> <section class="panel-body"> <div class="row"> <header class="panel-heading"> {{'ConfigExport.Title' | translate }} <small> {{'ConfigExport.TitleTips' | translate}} </small> </header> <div class="col-sm-offset-2 col-sm-9"> <a href="export" target="_blank"> <button class="btn btn-block btn-lg btn-primary"> {{'ConfigExport.Download' | translate }} </button> </a> </div> </div> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-route.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!--valdr--> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/lodash.min.js"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/ClusterService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/services/SystemInfoService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/PageCommon.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/valdr.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/services/OrganizationService.js"></script> </body> </html>
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AccessKeyService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.AccessKey; import com.ctrip.framework.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.repository.AccessKeyRepository; import com.ctrip.framework.apollo.common.exception.BadRequestException; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** * @author nisiyong */ @Service public class AccessKeyService { private static final int ACCESSKEY_COUNT_LIMIT = 5; private final AccessKeyRepository accessKeyRepository; private final AuditService auditService; public AccessKeyService( AccessKeyRepository accessKeyRepository, AuditService auditService) { this.accessKeyRepository = accessKeyRepository; this.auditService = auditService; } public List<AccessKey> findByAppId(String appId) { return accessKeyRepository.findByAppId(appId); } @Transactional public AccessKey create(String appId, AccessKey entity) { long count = accessKeyRepository.countByAppId(appId); if (count >= ACCESSKEY_COUNT_LIMIT) { throw new BadRequestException("AccessKeys count limit exceeded"); } entity.setId(0L); entity.setAppId(appId); entity.setDataChangeLastModifiedBy(entity.getDataChangeCreatedBy()); AccessKey accessKey = accessKeyRepository.save(entity); auditService.audit(AccessKey.class.getSimpleName(), accessKey.getId(), Audit.OP.INSERT, accessKey.getDataChangeCreatedBy()); return accessKey; } @Transactional public AccessKey update(String appId, AccessKey entity) { long id = entity.getId(); String operator = entity.getDataChangeLastModifiedBy(); AccessKey accessKey = accessKeyRepository.findOneByAppIdAndId(appId, id); if (accessKey == null) { throw new BadRequestException("AccessKey not exist"); } accessKey.setEnabled(entity.isEnabled()); accessKey.setDataChangeLastModifiedBy(operator); accessKeyRepository.save(accessKey); auditService.audit(AccessKey.class.getSimpleName(), id, Audit.OP.UPDATE, operator); return accessKey; } @Transactional public void delete(String appId, long id, String operator) { AccessKey accessKey = accessKeyRepository.findOneByAppIdAndId(appId, id); if (accessKey == null) { throw new BadRequestException("AccessKey not exist"); } if (accessKey.isEnabled()) { throw new BadRequestException("AccessKey should disable first"); } accessKey.setDeleted(Boolean.TRUE); accessKey.setDataChangeLastModifiedBy(operator); accessKeyRepository.save(accessKey); auditService.audit(AccessKey.class.getSimpleName(), id, Audit.OP.DELETE, operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.AccessKey; import com.ctrip.framework.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.repository.AccessKeyRepository; import com.ctrip.framework.apollo.common.exception.BadRequestException; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** * @author nisiyong */ @Service public class AccessKeyService { private static final int ACCESSKEY_COUNT_LIMIT = 5; private final AccessKeyRepository accessKeyRepository; private final AuditService auditService; public AccessKeyService( AccessKeyRepository accessKeyRepository, AuditService auditService) { this.accessKeyRepository = accessKeyRepository; this.auditService = auditService; } public List<AccessKey> findByAppId(String appId) { return accessKeyRepository.findByAppId(appId); } @Transactional public AccessKey create(String appId, AccessKey entity) { long count = accessKeyRepository.countByAppId(appId); if (count >= ACCESSKEY_COUNT_LIMIT) { throw new BadRequestException("AccessKeys count limit exceeded"); } entity.setId(0L); entity.setAppId(appId); entity.setDataChangeLastModifiedBy(entity.getDataChangeCreatedBy()); AccessKey accessKey = accessKeyRepository.save(entity); auditService.audit(AccessKey.class.getSimpleName(), accessKey.getId(), Audit.OP.INSERT, accessKey.getDataChangeCreatedBy()); return accessKey; } @Transactional public AccessKey update(String appId, AccessKey entity) { long id = entity.getId(); String operator = entity.getDataChangeLastModifiedBy(); AccessKey accessKey = accessKeyRepository.findOneByAppIdAndId(appId, id); if (accessKey == null) { throw new BadRequestException("AccessKey not exist"); } accessKey.setEnabled(entity.isEnabled()); accessKey.setDataChangeLastModifiedBy(operator); accessKeyRepository.save(accessKey); auditService.audit(AccessKey.class.getSimpleName(), id, Audit.OP.UPDATE, operator); return accessKey; } @Transactional public void delete(String appId, long id, String operator) { AccessKey accessKey = accessKeyRepository.findOneByAppIdAndId(appId, id); if (accessKey == null) { throw new BadRequestException("AccessKey not exist"); } if (accessKey.isEnabled()) { throw new BadRequestException("AccessKey should disable first"); } accessKey.setDeleted(Boolean.TRUE); accessKey.setDataChangeLastModifiedBy(operator); accessKeyRepository.save(accessKey); auditService.audit(AccessKey.class.getSimpleName(), id, Audit.OP.DELETE, operator); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AccessKeyService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.dto.AccessKeyDTO; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.AccessKeyAPI; import com.ctrip.framework.apollo.portal.constant.TracerEventType; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.tracer.Tracer; import org.springframework.stereotype.Service; import java.util.List; @Service public class AccessKeyService { private final AdminServiceAPI.AccessKeyAPI accessKeyAPI; public AccessKeyService(AccessKeyAPI accessKeyAPI) { this.accessKeyAPI = accessKeyAPI; } public List<AccessKeyDTO> findByAppId(Env env, String appId) { return accessKeyAPI.findByAppId(env, appId); } public AccessKeyDTO createAccessKey(Env env, AccessKeyDTO accessKey) { AccessKeyDTO accessKeyDTO = accessKeyAPI.create(env, accessKey); Tracer.logEvent(TracerEventType.CREATE_ACCESS_KEY, accessKey.getAppId()); return accessKeyDTO; } public void deleteAccessKey(Env env, String appId, long id, String operator) { accessKeyAPI.delete(env, appId, id, operator); } public void enable(Env env, String appId, long id, String operator) { accessKeyAPI.enable(env, appId, id, operator); } public void disable(Env env, String appId, long id, String operator) { accessKeyAPI.disable(env, appId, id, operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.dto.AccessKeyDTO; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.AccessKeyAPI; import com.ctrip.framework.apollo.portal.constant.TracerEventType; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.tracer.Tracer; import org.springframework.stereotype.Service; import java.util.List; @Service public class AccessKeyService { private final AdminServiceAPI.AccessKeyAPI accessKeyAPI; public AccessKeyService(AccessKeyAPI accessKeyAPI) { this.accessKeyAPI = accessKeyAPI; } public List<AccessKeyDTO> findByAppId(Env env, String appId) { return accessKeyAPI.findByAppId(env, appId); } public AccessKeyDTO createAccessKey(Env env, AccessKeyDTO accessKey) { AccessKeyDTO accessKeyDTO = accessKeyAPI.create(env, accessKey); Tracer.logEvent(TracerEventType.CREATE_ACCESS_KEY, accessKey.getAppId()); return accessKeyDTO; } public void deleteAccessKey(Env env, String appId, long id, String operator) { accessKeyAPI.delete(env, appId, id, operator); } public void enable(Env env, String appId, long id, String operator) { accessKeyAPI.enable(env, appId, id, operator); } public void disable(Env env, String appId, long id, String operator) { accessKeyAPI.disable(env, appId, id, operator); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/message/DatabaseMessageSenderTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.message; import com.ctrip.framework.apollo.biz.AbstractUnitTest; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** * @author Jason Song(song_s@ctrip.com) */ public class DatabaseMessageSenderTest extends AbstractUnitTest{ private DatabaseMessageSender messageSender; @Mock private ReleaseMessageRepository releaseMessageRepository; @Before public void setUp() throws Exception { messageSender = new DatabaseMessageSender(releaseMessageRepository); } @Test public void testSendMessage() throws Exception { String someMessage = "some-message"; long someId = 1; ReleaseMessage someReleaseMessage = mock(ReleaseMessage.class); when(someReleaseMessage.getId()).thenReturn(someId); when(releaseMessageRepository.save(any(ReleaseMessage.class))).thenReturn(someReleaseMessage); ArgumentCaptor<ReleaseMessage> captor = ArgumentCaptor.forClass(ReleaseMessage.class); messageSender.sendMessage(someMessage, Topics.APOLLO_RELEASE_TOPIC); verify(releaseMessageRepository, times(1)).save(captor.capture()); assertEquals(someMessage, captor.getValue().getMessage()); } @Test public void testSendUnsupportedMessage() throws Exception { String someMessage = "some-message"; String someUnsupportedTopic = "some-invalid-topic"; messageSender.sendMessage(someMessage, someUnsupportedTopic); verify(releaseMessageRepository, never()).save(any(ReleaseMessage.class)); } @Test(expected = RuntimeException.class) public void testSendMessageFailed() throws Exception { String someMessage = "some-message"; when(releaseMessageRepository.save(any(ReleaseMessage.class))).thenThrow(new RuntimeException()); messageSender.sendMessage(someMessage, Topics.APOLLO_RELEASE_TOPIC); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.message; import com.ctrip.framework.apollo.biz.AbstractUnitTest; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** * @author Jason Song(song_s@ctrip.com) */ public class DatabaseMessageSenderTest extends AbstractUnitTest{ private DatabaseMessageSender messageSender; @Mock private ReleaseMessageRepository releaseMessageRepository; @Before public void setUp() throws Exception { messageSender = new DatabaseMessageSender(releaseMessageRepository); } @Test public void testSendMessage() throws Exception { String someMessage = "some-message"; long someId = 1; ReleaseMessage someReleaseMessage = mock(ReleaseMessage.class); when(someReleaseMessage.getId()).thenReturn(someId); when(releaseMessageRepository.save(any(ReleaseMessage.class))).thenReturn(someReleaseMessage); ArgumentCaptor<ReleaseMessage> captor = ArgumentCaptor.forClass(ReleaseMessage.class); messageSender.sendMessage(someMessage, Topics.APOLLO_RELEASE_TOPIC); verify(releaseMessageRepository, times(1)).save(captor.capture()); assertEquals(someMessage, captor.getValue().getMessage()); } @Test public void testSendUnsupportedMessage() throws Exception { String someMessage = "some-message"; String someUnsupportedTopic = "some-invalid-topic"; messageSender.sendMessage(someMessage, someUnsupportedTopic); verify(releaseMessageRepository, never()).save(any(ReleaseMessage.class)); } @Test(expected = RuntimeException.class) public void testSendMessageFailed() throws Exception { String someMessage = "some-message"; when(releaseMessageRepository.save(any(ReleaseMessage.class))).thenThrow(new RuntimeException()); messageSender.sendMessage(someMessage, Topics.APOLLO_RELEASE_TOPIC); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/SystemInfo.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.entity.vo; import com.google.common.collect.Lists; import java.util.List; public class SystemInfo { private String version; private List<EnvironmentInfo> environments = Lists.newLinkedList(); public String getVersion() { return version; } public void setVersion(String version) { this.version = version; } public List<EnvironmentInfo> getEnvironments() { return environments; } public void addEnvironment(EnvironmentInfo environment) { this.environments.add(environment); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.entity.vo; import com.google.common.collect.Lists; import java.util.List; public class SystemInfo { private String version; private List<EnvironmentInfo> environments = Lists.newLinkedList(); public String getVersion() { return version; } public void setVersion(String version) { this.version = version; } public List<EnvironmentInfo> getEnvironments() { return environments; } public void addEnvironment(EnvironmentInfo environment) { this.environments.add(environment); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/DeferredLoggerFactory.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author kl (http://kailing.pub) * @since 2021/5/19 */ public class DeferredLoggerFactory { private DeferredLoggerFactory() { } public static Logger getLogger(Class<?> clazz) { Logger logger = LoggerFactory.getLogger(clazz); return new DeferredLogger(logger); } public static Logger getLogger(String name) { Logger logger = LoggerFactory.getLogger(name); return new DeferredLogger(logger); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.core.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author kl (http://kailing.pub) * @since 2021/5/19 */ public class DeferredLoggerFactory { private DeferredLoggerFactory() { } public static Logger getLogger(Class<?> clazz) { Logger logger = LoggerFactory.getLogger(clazz); return new DeferredLogger(logger); } public static Logger getLogger(String name) { Logger logger = LoggerFactory.getLogger(name); return new DeferredLogger(logger); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring.boot; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigService; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.ApolloClientSystemConsts; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.utils.DeferredLogger; import com.ctrip.framework.apollo.spring.config.CachedCompositePropertySource; import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory; import com.ctrip.framework.apollo.spring.config.PropertySourcesConstants; import com.ctrip.framework.apollo.spring.util.SpringInjector; import com.ctrip.framework.apollo.util.ConfigUtil; import com.google.common.base.Splitter; import com.google.common.base.Strings; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; /** * Initialize apollo system properties and inject the Apollo config in Spring Boot bootstrap phase * * <p>Configuration example:</p> * <pre class="code"> * # set app.id * app.id = 100004458 * # enable apollo bootstrap config and inject 'application' namespace in bootstrap phase * apollo.bootstrap.enabled = true * </pre> * * or * * <pre class="code"> * # set app.id * app.id = 100004458 * # enable apollo bootstrap config * apollo.bootstrap.enabled = true * # will inject 'application' and 'FX.apollo' namespaces in bootstrap phase * apollo.bootstrap.namespaces = application,FX.apollo * </pre> * * * If you want to load Apollo configurations even before Logging System Initialization Phase, * add * <pre class="code"> * # set apollo.bootstrap.eagerLoad.enabled * apollo.bootstrap.eagerLoad.enabled = true * </pre> * * This would be very helpful when your logging configurations is set by Apollo. * * for example, you have defined logback-spring.xml in your project, and you want to inject some attributes into logback-spring.xml. * */ public class ApolloApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> , EnvironmentPostProcessor, Ordered { public static final int DEFAULT_ORDER = 0; private static final Logger logger = LoggerFactory.getLogger(ApolloApplicationContextInitializer.class); private static final Splitter NAMESPACE_SPLITTER = Splitter.on(",").omitEmptyStrings() .trimResults(); public static final String[] APOLLO_SYSTEM_PROPERTIES = {ApolloClientSystemConsts.APP_ID, ApolloClientSystemConsts.APOLLO_CLUSTER, ApolloClientSystemConsts.APOLLO_CACHE_DIR, ApolloClientSystemConsts.APOLLO_ACCESS_KEY_SECRET, ApolloClientSystemConsts.APOLLO_META, ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE, ApolloClientSystemConsts.APOLLO_PROPERTY_ORDER_ENABLE, ApolloClientSystemConsts.APOLLO_PROPERTY_NAMES_CACHE_ENABLE}; private final ConfigPropertySourceFactory configPropertySourceFactory = SpringInjector .getInstance(ConfigPropertySourceFactory.class); private int order = DEFAULT_ORDER; @Override public void initialize(ConfigurableApplicationContext context) { ConfigurableEnvironment environment = context.getEnvironment(); if (!environment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, Boolean.class, false)) { logger.debug("Apollo bootstrap config is not enabled for context {}, see property: ${{}}", context, PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED); return; } logger.debug("Apollo bootstrap config is enabled for context {}", context); initialize(environment); } /** * Initialize Apollo Configurations Just after environment is ready. * * @param environment */ protected void initialize(ConfigurableEnvironment environment) { if (environment.getPropertySources().contains(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME)) { //already initialized, replay the logs that were printed before the logging system was initialized DeferredLogger.replayTo(); return; } String namespaces = environment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES, ConfigConsts.NAMESPACE_APPLICATION); logger.debug("Apollo bootstrap namespaces: {}", namespaces); List<String> namespaceList = NAMESPACE_SPLITTER.splitToList(namespaces); CompositePropertySource composite; final ConfigUtil configUtil = ApolloInjector.getInstance(ConfigUtil.class); if (configUtil.isPropertyNamesCacheEnabled()) { composite = new CachedCompositePropertySource(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME); } else { composite = new CompositePropertySource(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME); } for (String namespace : namespaceList) { Config config = ConfigService.getConfig(namespace); composite.addPropertySource(configPropertySourceFactory.getConfigPropertySource(namespace, config)); } environment.getPropertySources().addFirst(composite); } /** * To fill system properties from environment config */ void initializeSystemProperty(ConfigurableEnvironment environment) { for (String propertyName : APOLLO_SYSTEM_PROPERTIES) { fillSystemPropertyFromEnvironment(environment, propertyName); } } private void fillSystemPropertyFromEnvironment(ConfigurableEnvironment environment, String propertyName) { if (System.getProperty(propertyName) != null) { return; } String propertyValue = environment.getProperty(propertyName); if (Strings.isNullOrEmpty(propertyValue)) { return; } System.setProperty(propertyName, propertyValue); } /** * * In order to load Apollo configurations as early as even before Spring loading logging system phase, * this EnvironmentPostProcessor can be called Just After ConfigFileApplicationListener has succeeded. * * <br /> * The processing sequence would be like this: <br /> * Load Bootstrap properties and application properties -----> load Apollo configuration properties ----> Initialize Logging systems * * @param configurableEnvironment * @param springApplication */ @Override public void postProcessEnvironment(ConfigurableEnvironment configurableEnvironment, SpringApplication springApplication) { // should always initialize system properties like app.id in the first place initializeSystemProperty(configurableEnvironment); Boolean eagerLoadEnabled = configurableEnvironment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED, Boolean.class, false); //EnvironmentPostProcessor should not be triggered if you don't want Apollo Loading before Logging System Initialization if (!eagerLoadEnabled) { return; } Boolean bootstrapEnabled = configurableEnvironment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, Boolean.class, false); if (bootstrapEnabled) { DeferredLogger.enable(); initialize(configurableEnvironment); } } /** * @since 1.3.0 */ @Override public int getOrder() { return order; } /** * @since 1.3.0 */ public void setOrder(int order) { this.order = order; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring.boot; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigService; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.ApolloClientSystemConsts; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.core.utils.DeferredLogger; import com.ctrip.framework.apollo.spring.config.CachedCompositePropertySource; import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory; import com.ctrip.framework.apollo.spring.config.PropertySourcesConstants; import com.ctrip.framework.apollo.spring.util.SpringInjector; import com.ctrip.framework.apollo.util.ConfigUtil; import com.google.common.base.Splitter; import com.google.common.base.Strings; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; /** * Initialize apollo system properties and inject the Apollo config in Spring Boot bootstrap phase * * <p>Configuration example:</p> * <pre class="code"> * # set app.id * app.id = 100004458 * # enable apollo bootstrap config and inject 'application' namespace in bootstrap phase * apollo.bootstrap.enabled = true * </pre> * * or * * <pre class="code"> * # set app.id * app.id = 100004458 * # enable apollo bootstrap config * apollo.bootstrap.enabled = true * # will inject 'application' and 'FX.apollo' namespaces in bootstrap phase * apollo.bootstrap.namespaces = application,FX.apollo * </pre> * * * If you want to load Apollo configurations even before Logging System Initialization Phase, * add * <pre class="code"> * # set apollo.bootstrap.eagerLoad.enabled * apollo.bootstrap.eagerLoad.enabled = true * </pre> * * This would be very helpful when your logging configurations is set by Apollo. * * for example, you have defined logback-spring.xml in your project, and you want to inject some attributes into logback-spring.xml. * */ public class ApolloApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> , EnvironmentPostProcessor, Ordered { public static final int DEFAULT_ORDER = 0; private static final Logger logger = LoggerFactory.getLogger(ApolloApplicationContextInitializer.class); private static final Splitter NAMESPACE_SPLITTER = Splitter.on(",").omitEmptyStrings() .trimResults(); public static final String[] APOLLO_SYSTEM_PROPERTIES = {ApolloClientSystemConsts.APP_ID, ApolloClientSystemConsts.APOLLO_CLUSTER, ApolloClientSystemConsts.APOLLO_CACHE_DIR, ApolloClientSystemConsts.APOLLO_ACCESS_KEY_SECRET, ApolloClientSystemConsts.APOLLO_META, ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE, ApolloClientSystemConsts.APOLLO_PROPERTY_ORDER_ENABLE, ApolloClientSystemConsts.APOLLO_PROPERTY_NAMES_CACHE_ENABLE}; private final ConfigPropertySourceFactory configPropertySourceFactory = SpringInjector .getInstance(ConfigPropertySourceFactory.class); private int order = DEFAULT_ORDER; @Override public void initialize(ConfigurableApplicationContext context) { ConfigurableEnvironment environment = context.getEnvironment(); if (!environment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, Boolean.class, false)) { logger.debug("Apollo bootstrap config is not enabled for context {}, see property: ${{}}", context, PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED); return; } logger.debug("Apollo bootstrap config is enabled for context {}", context); initialize(environment); } /** * Initialize Apollo Configurations Just after environment is ready. * * @param environment */ protected void initialize(ConfigurableEnvironment environment) { if (environment.getPropertySources().contains(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME)) { //already initialized, replay the logs that were printed before the logging system was initialized DeferredLogger.replayTo(); return; } String namespaces = environment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES, ConfigConsts.NAMESPACE_APPLICATION); logger.debug("Apollo bootstrap namespaces: {}", namespaces); List<String> namespaceList = NAMESPACE_SPLITTER.splitToList(namespaces); CompositePropertySource composite; final ConfigUtil configUtil = ApolloInjector.getInstance(ConfigUtil.class); if (configUtil.isPropertyNamesCacheEnabled()) { composite = new CachedCompositePropertySource(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME); } else { composite = new CompositePropertySource(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME); } for (String namespace : namespaceList) { Config config = ConfigService.getConfig(namespace); composite.addPropertySource(configPropertySourceFactory.getConfigPropertySource(namespace, config)); } environment.getPropertySources().addFirst(composite); } /** * To fill system properties from environment config */ void initializeSystemProperty(ConfigurableEnvironment environment) { for (String propertyName : APOLLO_SYSTEM_PROPERTIES) { fillSystemPropertyFromEnvironment(environment, propertyName); } } private void fillSystemPropertyFromEnvironment(ConfigurableEnvironment environment, String propertyName) { if (System.getProperty(propertyName) != null) { return; } String propertyValue = environment.getProperty(propertyName); if (Strings.isNullOrEmpty(propertyValue)) { return; } System.setProperty(propertyName, propertyValue); } /** * * In order to load Apollo configurations as early as even before Spring loading logging system phase, * this EnvironmentPostProcessor can be called Just After ConfigFileApplicationListener has succeeded. * * <br /> * The processing sequence would be like this: <br /> * Load Bootstrap properties and application properties -----> load Apollo configuration properties ----> Initialize Logging systems * * @param configurableEnvironment * @param springApplication */ @Override public void postProcessEnvironment(ConfigurableEnvironment configurableEnvironment, SpringApplication springApplication) { // should always initialize system properties like app.id in the first place initializeSystemProperty(configurableEnvironment); Boolean eagerLoadEnabled = configurableEnvironment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED, Boolean.class, false); //EnvironmentPostProcessor should not be triggered if you don't want Apollo Loading before Logging System Initialization if (!eagerLoadEnabled) { return; } Boolean bootstrapEnabled = configurableEnvironment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, Boolean.class, false); if (bootstrapEnabled) { DeferredLogger.enable(); initialize(configurableEnvironment); } } /** * @since 1.3.0 */ @Override public int getOrder() { return order; } /** * @since 1.3.0 */ public void setOrder(int order) { this.order = order; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceLockController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.NamespaceLock; import com.ctrip.framework.apollo.biz.service.NamespaceLockService; import com.ctrip.framework.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @RestController public class NamespaceLockController { private final NamespaceLockService namespaceLockService; private final NamespaceService namespaceService; private final BizConfig bizConfig; public NamespaceLockController( final NamespaceLockService namespaceLockService, final NamespaceService namespaceService, final BizConfig bizConfig) { this.namespaceLockService = namespaceLockService; this.namespaceService = namespaceService; this.bizConfig = bizConfig; } @GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public NamespaceLockDTO getNamespaceLockOwner(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespaceName) { Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName); if (namespace == null) { throw new BadRequestException("namespace not exist."); } if (bizConfig.isNamespaceLockSwitchOff()) { return null; } NamespaceLock lock = namespaceLockService.findLock(namespace.getId()); if (lock == null) { return null; } return BeanUtils.transform(NamespaceLockDTO.class, lock); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.NamespaceLock; import com.ctrip.framework.apollo.biz.service.NamespaceLockService; import com.ctrip.framework.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @RestController public class NamespaceLockController { private final NamespaceLockService namespaceLockService; private final NamespaceService namespaceService; private final BizConfig bizConfig; public NamespaceLockController( final NamespaceLockService namespaceLockService, final NamespaceService namespaceService, final BizConfig bizConfig) { this.namespaceLockService = namespaceLockService; this.namespaceService = namespaceService; this.bizConfig = bizConfig; } @GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public NamespaceLockDTO getNamespaceLockOwner(@PathVariable String appId, @PathVariable String clusterName, @PathVariable String namespaceName) { Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName); if (namespace == null) { throw new BadRequestException("namespace not exist."); } if (bizConfig.isNamespaceLockSwitchOff()) { return null; } NamespaceLock lock = namespaceLockService.findLock(namespace.getId()); if (lock == null) { return null; } return BeanUtils.transform(NamespaceLockDTO.class, lock); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/constant/RoleType.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.constant; public class RoleType { public static final String MASTER = "Master"; public static final String MODIFY_NAMESPACE = "ModifyNamespace"; public static final String RELEASE_NAMESPACE = "ReleaseNamespace"; public static boolean isValidRoleType(String roleType) { return MASTER.equals(roleType) || MODIFY_NAMESPACE.equals(roleType) || RELEASE_NAMESPACE.equals(roleType); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.constant; public class RoleType { public static final String MASTER = "Master"; public static final String MODIFY_NAMESPACE = "ModifyNamespace"; public static final String RELEASE_NAMESPACE = "ReleaseNamespace"; public static boolean isValidRoleType(String roleType) { return MASTER.equals(roleType) || MODIFY_NAMESPACE.equals(roleType) || RELEASE_NAMESPACE.equals(roleType); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-common/src/main/java/com/ctrip/framework/apollo/common/http/MultiResponseEntity.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.http; import org.springframework.http.HttpStatus; import java.util.LinkedList; import java.util.List; /** * 一个Response中包含多个ResponseEntity */ public class MultiResponseEntity<T> { private int code; private List<RichResponseEntity<T>> entities = new LinkedList<>(); private MultiResponseEntity(HttpStatus httpCode) { this.code = httpCode.value(); } public static <T> MultiResponseEntity<T> instance(HttpStatus statusCode) { return new MultiResponseEntity<>(statusCode); } public static <T> MultiResponseEntity<T> ok() { return new MultiResponseEntity<>(HttpStatus.OK); } public void addResponseEntity(RichResponseEntity<T> responseEntity) { if (responseEntity == null){ throw new IllegalArgumentException("sub response entity can not be null"); } entities.add(responseEntity); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.common.http; import org.springframework.http.HttpStatus; import java.util.LinkedList; import java.util.List; /** * 一个Response中包含多个ResponseEntity */ public class MultiResponseEntity<T> { private int code; private List<RichResponseEntity<T>> entities = new LinkedList<>(); private MultiResponseEntity(HttpStatus httpCode) { this.code = httpCode.value(); } public static <T> MultiResponseEntity<T> instance(HttpStatus statusCode) { return new MultiResponseEntity<>(statusCode); } public static <T> MultiResponseEntity<T> ok() { return new MultiResponseEntity<>(HttpStatus.OK); } public void addResponseEntity(RichResponseEntity<T> responseEntity) { if (responseEntity == null){ throw new IllegalArgumentException("sub response entity can not be null"); } entities.add(responseEntity); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/OpenAppDTO.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.dto; public class OpenAppDTO extends BaseDTO { private String name; private String appId; private String orgId; private String orgName; private String ownerName; private String ownerEmail; public String getAppId() { return appId; } public String getName() { return name; } public String getOrgId() { return orgId; } public String getOrgName() { return orgName; } public String getOwnerEmail() { return ownerEmail; } public String getOwnerName() { return ownerName; } public void setAppId(String appId) { this.appId = appId; } public void setName(String name) { this.name = name; } public void setOrgId(String orgId) { this.orgId = orgId; } public void setOrgName(String orgName) { this.orgName = orgName; } public void setOwnerEmail(String ownerEmail) { this.ownerEmail = ownerEmail; } public void setOwnerName(String ownerName) { this.ownerName = ownerName; } @Override public String toString() { final StringBuilder sb = new StringBuilder("OpenAppDTO{"); sb.append("name='").append(name).append('\''); sb.append(", appId='").append(appId).append('\''); sb.append(", orgId='").append(orgId).append('\''); sb.append(", orgName='").append(orgName).append('\''); sb.append(", ownerName='").append(ownerName).append('\''); sb.append(", ownerEmail='").append(ownerEmail).append('\''); sb.append(", dataChangeCreatedBy='").append(dataChangeCreatedBy).append('\''); sb.append(", dataChangeLastModifiedBy='").append(dataChangeLastModifiedBy).append('\''); sb.append(", dataChangeCreatedTime=").append(dataChangeCreatedTime); sb.append(", dataChangeLastModifiedTime=").append(dataChangeLastModifiedTime); sb.append('}'); return sb.toString(); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.dto; public class OpenAppDTO extends BaseDTO { private String name; private String appId; private String orgId; private String orgName; private String ownerName; private String ownerEmail; public String getAppId() { return appId; } public String getName() { return name; } public String getOrgId() { return orgId; } public String getOrgName() { return orgName; } public String getOwnerEmail() { return ownerEmail; } public String getOwnerName() { return ownerName; } public void setAppId(String appId) { this.appId = appId; } public void setName(String name) { this.name = name; } public void setOrgId(String orgId) { this.orgId = orgId; } public void setOrgName(String orgName) { this.orgName = orgName; } public void setOwnerEmail(String ownerEmail) { this.ownerEmail = ownerEmail; } public void setOwnerName(String ownerName) { this.ownerName = ownerName; } @Override public String toString() { final StringBuilder sb = new StringBuilder("OpenAppDTO{"); sb.append("name='").append(name).append('\''); sb.append(", appId='").append(appId).append('\''); sb.append(", orgId='").append(orgId).append('\''); sb.append(", orgName='").append(orgName).append('\''); sb.append(", ownerName='").append(ownerName).append('\''); sb.append(", ownerEmail='").append(ownerEmail).append('\''); sb.append(", dataChangeCreatedBy='").append(dataChangeCreatedBy).append('\''); sb.append(", dataChangeLastModifiedBy='").append(dataChangeLastModifiedBy).append('\''); sb.append(", dataChangeCreatedTime=").append(dataChangeCreatedTime); sb.append(", dataChangeLastModifiedTime=").append(dataChangeLastModifiedTime); sb.append('}'); return sb.toString(); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultLogoutHandler.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.defaultimpl; import com.ctrip.framework.apollo.portal.spi.LogoutHandler; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class DefaultLogoutHandler implements LogoutHandler { @Override public void logout(HttpServletRequest request, HttpServletResponse response) { try { response.sendRedirect("/"); } catch (IOException e) { throw new RuntimeException(e); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.defaultimpl; import com.ctrip.framework.apollo.portal.spi.LogoutHandler; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class DefaultLogoutHandler implements LogoutHandler { @Override public void logout(HttpServletRequest request, HttpServletResponse response) { try { response.sendRedirect("/"); } catch (IOException e) { throw new RuntimeException(e); } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/java/com/ctrip/framework/apollo/build/MockInjector.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.build; import com.ctrip.framework.apollo.internals.DefaultInjector; import com.ctrip.framework.apollo.internals.Injector; import com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; import java.util.Map; /** * @author Jason Song(song_s@ctrip.com) */ public class MockInjector implements Injector { private static Map<Class, Object> classMap = Maps.newHashMap(); private static Table<Class, String, Object> classTable = HashBasedTable.create(); private static Injector delegate = new DefaultInjector(); @Override public <T> T getInstance(Class<T> clazz) { if (delegate != null) { return delegate.getInstance(clazz); } return null; } @Override public <T> T getInstance(Class<T> clazz, String name) { if (delegate != null) { return delegate.getInstance(clazz, name); } return null; } public static void setInstance(Class clazz, Object o) { classMap.put(clazz, o); } public static void setInstance(Class clazz, String name, Object o) { classTable.put(clazz, name, o); } public static void setDelegate(Injector delegateInjector) { delegate = delegateInjector; } public static void reset() { classMap.clear(); classTable.clear(); delegate = new DefaultInjector(); } public static class InjectCustomizer implements ApolloInjectorCustomizer { @Override public <T> T getInstance(Class<T> clazz) { return (T) classMap.get(clazz); } @Override public <T> T getInstance(Class<T> clazz, String name) { return (T) classTable.get(clazz, name); } @Override public int getOrder() { return 0; } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.build; import com.ctrip.framework.apollo.internals.DefaultInjector; import com.ctrip.framework.apollo.internals.Injector; import com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; import java.util.Map; /** * @author Jason Song(song_s@ctrip.com) */ public class MockInjector implements Injector { private static Map<Class, Object> classMap = Maps.newHashMap(); private static Table<Class, String, Object> classTable = HashBasedTable.create(); private static Injector delegate = new DefaultInjector(); @Override public <T> T getInstance(Class<T> clazz) { if (delegate != null) { return delegate.getInstance(clazz); } return null; } @Override public <T> T getInstance(Class<T> clazz, String name) { if (delegate != null) { return delegate.getInstance(clazz, name); } return null; } public static void setInstance(Class clazz, Object o) { classMap.put(clazz, o); } public static void setInstance(Class clazz, String name, Object o) { classTable.put(clazz, name, o); } public static void setDelegate(Injector delegateInjector) { delegate = delegateInjector; } public static void reset() { classMap.clear(); classTable.clear(); delegate = new DefaultInjector(); } public static class InjectCustomizer implements ApolloInjectorCustomizer { @Override public <T> T getInstance(Class<T> clazz) { return (T) classMap.get(clazz); } @Override public <T> T getInstance(Class<T> clazz, String name) { return (T) classTable.get(clazz, name); } @Override public int getOrder() { return 0; } } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/DefaultPortalMetaServerProvider.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.environment; import static com.ctrip.framework.apollo.portal.environment.Env.transformToEnvMap; import com.ctrip.framework.apollo.core.utils.ResourceUtils; import com.ctrip.framework.apollo.portal.util.KeyValueUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; /** * Only use in apollo-portal * load all meta server address from * - System Property [key ends with "_meta" (case insensitive)] * - OS environment variable [key ends with "_meta" (case insensitive)] * - user's configuration file [key ends with ".meta" (case insensitive)] * when apollo-portal start up. * @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider * @author wxq */ class DefaultPortalMetaServerProvider implements PortalMetaServerProvider { private static final Logger logger = LoggerFactory.getLogger(DefaultPortalMetaServerProvider.class); /** * environments and their meta server address * properties file path */ private static final String APOLLO_ENV_PROPERTIES_FILE_PATH = "apollo-env.properties"; private volatile Map<Env, String> domains; DefaultPortalMetaServerProvider() { reload(); } @Override public String getMetaServerAddress(Env targetEnv) { String metaServerAddress = domains.get(targetEnv); return metaServerAddress == null ? null : metaServerAddress.trim(); } @Override public boolean exists(Env targetEnv) { return domains.containsKey(targetEnv); } @Override public void reload() { domains = initializeDomains(); logger.info("Loaded meta server addresses from system property, os environment and properties file: {}", domains); } /** * load all environment's meta address dynamically when this class loaded by JVM */ private Map<Env, String> initializeDomains() { // add to domain Map<Env, String> map = new ConcurrentHashMap<>(); // lower priority add first map.putAll(getDomainsFromPropertiesFile()); map.putAll(getDomainsFromOSEnvironment()); map.putAll(getDomainsFromSystemProperty()); // log all return map; } private Map<Env, String> getDomainsFromSystemProperty() { // find key-value from System Property which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromSystemProperty = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getProperties(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromSystemProperty = KeyValueUtils.removeKeySuffix(metaServerAddressesFromSystemProperty, "_meta".length()); return transformToEnvMap(metaServerAddressesFromSystemProperty); } private Map<Env, String> getDomainsFromOSEnvironment() { // find key-value from OS environment variable which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromOSEnvironment = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getenv(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromOSEnvironment = KeyValueUtils.removeKeySuffix(metaServerAddressesFromOSEnvironment, "_meta".length()); return transformToEnvMap(metaServerAddressesFromOSEnvironment); } private Map<Env, String> getDomainsFromPropertiesFile() { // find key-value from properties file which key ends with ".meta" (case insensitive) Properties properties = new Properties(); properties = ResourceUtils.readConfigFile(APOLLO_ENV_PROPERTIES_FILE_PATH, properties); Map<String, String> metaServerAddressesFromPropertiesFile = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(properties, ".meta"); // remove key's suffix ".meta" (case insensitive) metaServerAddressesFromPropertiesFile = KeyValueUtils.removeKeySuffix(metaServerAddressesFromPropertiesFile, ".meta".length()); return transformToEnvMap(metaServerAddressesFromPropertiesFile); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.environment; import static com.ctrip.framework.apollo.portal.environment.Env.transformToEnvMap; import com.ctrip.framework.apollo.core.utils.ResourceUtils; import com.ctrip.framework.apollo.portal.util.KeyValueUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; /** * Only use in apollo-portal * load all meta server address from * - System Property [key ends with "_meta" (case insensitive)] * - OS environment variable [key ends with "_meta" (case insensitive)] * - user's configuration file [key ends with ".meta" (case insensitive)] * when apollo-portal start up. * @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider * @author wxq */ class DefaultPortalMetaServerProvider implements PortalMetaServerProvider { private static final Logger logger = LoggerFactory.getLogger(DefaultPortalMetaServerProvider.class); /** * environments and their meta server address * properties file path */ private static final String APOLLO_ENV_PROPERTIES_FILE_PATH = "apollo-env.properties"; private volatile Map<Env, String> domains; DefaultPortalMetaServerProvider() { reload(); } @Override public String getMetaServerAddress(Env targetEnv) { String metaServerAddress = domains.get(targetEnv); return metaServerAddress == null ? null : metaServerAddress.trim(); } @Override public boolean exists(Env targetEnv) { return domains.containsKey(targetEnv); } @Override public void reload() { domains = initializeDomains(); logger.info("Loaded meta server addresses from system property, os environment and properties file: {}", domains); } /** * load all environment's meta address dynamically when this class loaded by JVM */ private Map<Env, String> initializeDomains() { // add to domain Map<Env, String> map = new ConcurrentHashMap<>(); // lower priority add first map.putAll(getDomainsFromPropertiesFile()); map.putAll(getDomainsFromOSEnvironment()); map.putAll(getDomainsFromSystemProperty()); // log all return map; } private Map<Env, String> getDomainsFromSystemProperty() { // find key-value from System Property which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromSystemProperty = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getProperties(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromSystemProperty = KeyValueUtils.removeKeySuffix(metaServerAddressesFromSystemProperty, "_meta".length()); return transformToEnvMap(metaServerAddressesFromSystemProperty); } private Map<Env, String> getDomainsFromOSEnvironment() { // find key-value from OS environment variable which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromOSEnvironment = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getenv(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromOSEnvironment = KeyValueUtils.removeKeySuffix(metaServerAddressesFromOSEnvironment, "_meta".length()); return transformToEnvMap(metaServerAddressesFromOSEnvironment); } private Map<Env, String> getDomainsFromPropertiesFile() { // find key-value from properties file which key ends with ".meta" (case insensitive) Properties properties = new Properties(); properties = ResourceUtils.readConfigFile(APOLLO_ENV_PROPERTIES_FILE_PATH, properties); Map<String, String> metaServerAddressesFromPropertiesFile = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(properties, ".meta"); // remove key's suffix ".meta" (case insensitive) metaServerAddressesFromPropertiesFile = KeyValueUtils.removeKeySuffix(metaServerAddressesFromPropertiesFile, ".meta".length()); return transformToEnvMap(metaServerAddressesFromPropertiesFile); } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2
wOF2Fl\F M?FFTM `r $e6$t 0 "Q?webfe5옏@? t,3+2q FYO&>bm5ZH$Y{H jd Չ %٧y"+@]e{vNc)n?~?萤h_&iѝ?>^K v-cۍ12Ky,'n(3EwiB& Tlh0M҆dYrﲬnti]yurVXsjgMnәHW r2>iT`V7R(+o6'cB4ι㿚T ]a[Qd<3wq8,rTI80>E?*E痦#7'S ocʷ_7&#*+)+4aA6cy٣f(bF$;{ YA1vP-tG"Cf- WԙuKְK#*K< (Z`٫ [%YT{%Ɋ$s{oջvt"p4`ߩϤ}o `'ne> G5sz_N PKӦvmU ɾ{z"3`l W#Ԑ^@+,ckoAOpnuzzJ)Υ1}O=xR`J`qUs/+kv1xljlEl\nDƶVjg{Zdz7 5!xm5o[u&1ڂHBkAqrR (\gh7Ҋy=HZUPh$8RgzgͭN:1u$܅>R]"f7 K^'3+E/^YU5]NB.ʋ8+͏8,|{M|Aua|a˅՝% lKGP,Nukc8mX@d̘?Y&{?P(G]Or-\LF9,&y8r3ܟ?p>~sDz1?\U5q=tzԒ&Znj%mM"}tkDwh-=mB76&:һqt" 1:Еu;"K_/Jdc0l0'^B8VCzg[ ;d Ybȃuu;@*}y| .'C>\g=9VŐ[o|g^ >d 9 *E|A*M[[*mOQz?Pn?R)YoT&[U*5S MB [ oYDh{,}1<f&6h'ʥU#VED"TީAD9eB:%O Fun 7?%RG4"fgF꺁 a=-Qy+B,2օ5𙄌xnΪf*!l|GXQ ރUp Eu @-Do.6YZ-&a>f?NN ]O/^;\J BEsJrĚ'g/B%o Cn7:|yKt&$s|wP\i]$Z@+ Հ90x]r%+RUEm+ܰ;wu9/I77զQlu\yWN)8ܰvY*umm( fEG8 j#IRz #q߷ )Y$ Лc_%m-{!0-` ;公hyV]Hv! ta\K[1{"j 6@3T0%Θ"ԙZIGS.ΣpӬS1eٓ؛ Yv8d\BlSR)ӆ {Iӆ%>0Ўڦ\'cg2%4QD 0͒3B"MՎ&ۊhIڧRgME I(5UD] }b8$8>X h"l΀j.%ۀHH- Iݸ#1C4Y7YݖV o>P]6O47f ~AJdYF€.oy) 8l 22e1H[t@!ȅ 2\@5ٓ%Zkޒa@.`n3OFR(󅥶ZkLkF HWjY I5*6eSbk.5F,.N0ԙ|V||~N( 4],Jp|~xeA5/ڻSvy?'_v|rXHQēB@= XB94TBBcHP+_YH#$`FB;+BPR4̼ t:t"ZEJ^!XǓq4_dTW(5܀IUŇAz@U6n.WGXHRK&'swMjʎ<3)`#F@  F Ԣvob$x +u&}|X&[٪8F-E&/>/G.az^/})'x$O=<zoA9M؝&~3r3g'8ң\-MDzk5A G9|1-! 87[,mRu|57 =X,aJ^tN4\fЄ]AzH^7F&k"LU>}>rBX(ۂT% JdhKPKTFaA3HHC[r;ad54 lLkjG{8h~ fR@9wB0 zS'a7@@Nƹlbj3hNXF/es'DsQ<k^׼ZASOidSJxN4DK! !٫vhA`EX- P :ѤC:WzSsdO :_`:taηБ س IY4 # *+<qnou Ucwwx$dƿ}ρ949p*T:%GQ^a'ebl-*XL%*ź.ڊ\@pR$T*Khpm-/oS3Eto}жVoeJ `<$t ]g*Z6ql~E S/iTtkǮWþ =?jGUUAJ`bˑGˆQAϫÖcWWSmgF&^ؘԡ6;C1:=ۈP`ڜVVE5"hOX~N3_5Ӂ]z-CWtԥӈe]\Vc#m[kuޗ_ʱ"sH<}xm0bxHqba3tfMT*]I }(,M= @JAd?§6PV[ dVv4jߛlH\{MȘ\Y܁`9M`Db<;a#z<x",dgCi`c:I>jw}Jz^:V.:ڋ{ͼ(ȲBɦx<Db#"S{PHuN/{r6;wUsPО<XYsMxu\bs$x(/^|^*0j~m;#%JM4pQM׬::b\C2gf]zP8T UQbtCT> p8+6g_2lΡ6H džH: d<C6ؤ/6E:K"`kJ<Ƣ=v7N5`Jt\j6ͅ%˞7*'U4:X+ \bE afx}1+pB063rA$N~#d}פP7hH7bF§8 P>BtGNmx@j |{s9=wR/oDJs5z>;'xEq^r^=G?9AA_K%Dɮ:uikjkIeG՝#*)jm|t}`JZ؈H=4{g߁)qXMA,H71V"o,Y#hݨS_;a_ԗZ^cn4HE?} ȝ٤=}BWvުUehGF;@2S@f n2#fY:]JyH]-G׌wgv'|0e _7Ґn+fٸY<( ?y%wm+j&&!c^u'b&hm6¤*2 ?AIƲ5FWؙ[ƜBUzIE!m:xheǮnz|]% mrUFگ1 };!n F&gP;&$$F).tBQ3(C=Xes;iي@~NΡE SRh\BeobTnΒju g@'qQ딎nx.u6bVU& ];!C_  5*zɺmRQuqPZ0}mn^nOrT:U'h0nZp^R|DF_b\@mDE8{oGM᠜q}Sd C,iܚE/Ë[d8],MCI_u,]Vc"pg@`"y),;B^el2'.(Ęy>-|hw;jՍiԽ_o|!@)ɢ=̌SPz*!z})|ƧT}jEtCZný*՞4ۆ׽[ 9Юݓz`Wmeo|j8j59@.EV/ZW@|f_\"${v/;a:Sei3TG*]ơ/h2C32$1}DNXt?Fϝ~n,Pj9.>ף{ 9EN-v|3hCиE XT;P$=J-gݕigz~q(A<:h193N̽Q}CLWߧ׎~ b"|4u}cy62[ \d,ҎճbkD%0Tx{=;Է(i LS13Nh/6?'E^~P{sZZKĞB{Dt&z)Uoa5Q3ȗr~ F]$<tm(} MB@[GxFh8#},#u Laz(Qh4%xm`Uչ.Ev1a4_'/[d{FxI59 D<&8VEFg 芘#I䟍2S_]QqAn_Q>bޘ4g-0&E#ci8 vR/4rP7KsOWN3ՏvE\bqQ5ZڽVy5]h/ i)-/kNю#e)"P {KSQx>a&<a,릌HEH ]%,eDU~Wlڛ;cᘓ`? pM l.PW7٣./W#;Wd*:z;E2j9yASS8u;fY8m KѯԄԶ͡>, _g-mc<n]Ч-52cz 7d PzVOPvfR Rఓ9Z -dC`,at=k?v4#P Bإ/[s.<a0e{&va~e8)fnyfBPLuIyH=S2"[(¼O@z*I@0#,I$Qy cўF aߞv"|Rܘ 'WF x?+aNMK`D/nf:XI8:H IRm]K6i @UH*NoF;ᇏ"Wqd\Ѝ*C=#26x7<T 7yrU>-bH)ɺz '}׶w!rXZ .:Vn;->: 6rUcs4kVW{#5ߑ0B`ܝ0u".QdB0Cr]#Q9lqN^ֳh~NU\ 16 ~SnTl\THҲڛ-~G~)$oQ7-C}q%/avO|[q4~Bc-$N7<VHEi-RF GNM{"3 49[j<Wӭ hln QҨډGcq@w/e qg<: a钷u_P` b{EI(OWGfEyABa_;O^DQ's `D#њi:Ѵ+Y{{p&\RagϞ0gTLi<'7?X1C an0or1 /U o/?♯a_pHֱ G촠8ݣ?3F0`%ϑ< G]Խ8bl͏%-,)}%J:YjT;Ыȶ5Œ>6w{V餃.&(o*n<n9J "a Д+ a/;7zDZη{tM Mp iؚkNPwؑͺH`T $23f0z;"]*Y,QWlSOrW$5]KVٻBܚIk|=&[58ER0ދGksSnnnuExKr}~m`G4u{=]6fר Bo&< ñc;2P$ǃ{mW_cª'B6Њ?$^z[CYݭjN~ ۮ0t6/)-1:p$Dꥅȗ  ,'yv nFTс['aMbJ]%&îlc6&IpF oi5'rr(qz6(5Eɢ՟l\Lk71Y4^)bٗ¦8yƏ N=9zT^[T$dk QiK%6qfO|c8$ji^vr.QQR"YrĊ krK<QI"@R9 /\&7Y}mgҊ7z6-Mu=,N3O\6aDAޮLd^r/.> NeRi4!3R"4nbm-y[X."!QKE\N4gՠםaNp >k)90BZBs yrer)vDtrv\v[>rJm a̼~uՏ>rMZcB<`)\yt|ۍr'<>[Îh7Z8caI! p⢟̮,G k5@`iw nО8pv *'O A[.rhT pR?+;\*HsLqUf:ql-ć *6!h+ˬ{h- jgkMMP#:}{/VŶC]옙&[W$ګ^#4fWa\ 5躺M[6)T3~ :. Z`si(RQ|/` il^L#f-;-C;_*{@EMCooÂ_7TrqzF%ׯ|U<Zo[TA='DPJ];,U9Qpk4~_C^qEŮb SGsY2NAu%SD hj y;9$ߴIAhEO} g/+ Ճ5JY @Gf2Y/߼e߷|v/"p~刋T8OKr** 4hi@Q3g"j:$;:f,dzȚԌ꺳u%ˣ}O&i2U, @kj%u?4NKmd?5ݓ;0Ye}sZ>EƫUs^ݜv{fQ<ĐVPTfͦ?mpP*&QG{cJEPe2)xP0AMɪZHj"׻"AC+zqmVzᖞU%C:@1W [y)J@ob% jA>)Nǀi$At`>?f0gH36p6D|M 4N 4JJڃ jƇ\ p38Я6pV?:$sDNƹ2n,HO\[ոK-)W~im?T:޺UeY-#dJe)Z5?$\dW<,Ɇ;ط5SոTT̄f(PYv=Q ~DX*8辩s- ˨΀55 XRl QC l|5{ӦT\t꼕+en۸Psl3UO[ZS3*,:ÛZLS'̵**@ı~xgno2- WV;pZ9?~$6<QrbQ8&seEbQ,^|B碘VdV-(] .ˎ8/qhVnRQD*U(*1h1`؝QL{Uj `"o3ܻVl: jaFaE̞Zg1z2֠:AuZIf62tw+fDCL-}gZ0>҄xJ>\QA_Cihbl] 64*A˯ɰqX7YX.-ոaɇVhiKgqNRĆN(r']%٘@3̀jZJ.;nm,S0xͻOF33ҧ<$'GE+}'1f3y5/&Z\RB7dm]8\3߂Ȫ@oT3eu^W@e7l!B,s1$Z&?dC (YЦSm>J"&pt܈P㇄BF4G5 t^Ć$j-a㠍g^ʐCAsT=kTS,|r9IBϘЬ'vGA@thQNj&T=xt;2]P|T- LÞe1ݽWZŚ*MrH5?=o"9K5='k-*AE| qҔ_?\7%|M6f++S*}W_]3fmܮ˳m w!.R#鬪;qq71$•ݙկ_iK&JάMemV5P0> Q5WHIh&4ҍIlE7}sm[cȾ|d^ %Uv1D>.T7*=tZ_㟾1Х:=0pZ6ҋNt(uƝ; B]$kڌ.{F*/UZN砦|oqKG;^侞9NexK \wh~ZpHb䉸 [k8k.bX.QXpxYa^"#Bwnbum5F~>8bN:p4 [gv^ BFUz)?60F8/2C8>N8G%l%5FH{46h4%# 7x oN t\'Ȩ E0#jNãVӹd?WlcW žֵu-}22EN}#䵵2H^a3rqs-S3&f퇣fwl.=W8,cHjcTWנs90ZDMC2ZMdjt"8:g{.Ʊ1Fb618"yԦ> W9 V `jT򔔑<IMԱW'%f&\yZdkʹRyjw}Ѐ[8ԍbB 'd'mo'<|E5:ڋo>r,ni <TS>d qN .g+ S Q KaB?_QE rjh>Eӛ;C׭7^q `Ue#-;oJċԝ>) ;Jg׭9R;OgiI7}8Kہqjeؓ+ٗ'nϷk3eFρ0V#pMAzb^PVu~1uғwn ^.II_vdW[Q,+Lbćq 9V} ΏVw4qU3&jıHYb ttT7ρarBwP9?)uT/aA19kM \Ps<Ta@<?M (.,'%?,%a~eU0/zQ(Ѹap:.6jdF@\V4{Ri 8ɪnuFM_=Z8Hlsy5k%|(i9 "6}ԋ~WK۟hYk\lRm& 0b]g"ހD^ތjJ*)6-Ybh Z=ޑA,(K# OfJ:;I!6Yi&d%m86#QW_Av}?+G cc*mg`>q+=[5͔?9W+^o^E8s)f 2aQxi& NE>"^Naa;f9]NE& t^CLz'e8ZRs&67_ãcyJ1 @TZ?SD2 |POӌ\dR7zH9iQ#zrc.4GR4qx<2~Xhnੳ2auBNC+kX0 aj5n>މe3vާ<>_ uH:XR%~9!4oѼ38? 1d#A&{A!i6 /Xa㇤=W;|) g~ ?*悽 }ڧKt>5|E.A Q6 (6 6є7<9_C f1Ўi8, V4$uti,.`v6r P gFBɎ t C3; ,oÂx| /KMp1S_X.fV#U>Ȓ#B] AIVoІϵGTV1nr+OXS% ³fOZ[_9P߰ {Gln%#hdwH= ye/W>,IP,*MV~ºK&eċM콣=)qFS"GTF*LX,h[wweWQEx ?{^چExhiׂJH|^͓e*^Я.uxEb#;ԝ<]z]\wNhochqE=4Q17W̓lÕ6᧿HE_̣qy YR۫<x=cSXy!=08Ǘx ?{}F_Ǡzktɱ7ڂ|t+am<xe$eɍ<[TX[ sV̋ާU*hSK=Fesw uYoٯnQ=NE:[(t] k|@ٿuZ\9{hvܕӆ.ڡsa$u+qw:#?eT3=л!pPL`:R; gʮ Fhaΐ;5Ie+ bt06AW40ThJcc<&mJcc  OCnW?Nio](XЄ{Lz;g|Ǐ>9~l4sVy`Uߛ,#_u+DeM~hq벇#Yz$; 5ͯ9$ z> *jO$$O/xRtf-}*oɦ|3M;xިUl/.~XǎY4x3&x";$KI5dڭ ~w[M9O%4Q}S^t@w[Y;-s;bwH-* imI-1e/~TNN.p)H$W~ƦO (9, ]gM6r+#%/swA$q4O> d9}+$s?0a,>yڈs<=,c_*\D}2MT8/4g'ڦ8'}"C*\9#Y>z$7c[s|"$} ymzQx 5%o$jkp)x-:И|?ofgFr2SZq}q o,wyOgCF1l'L5T33yM92"s5uD6-JUbs O)wR -2/5f<BQ4kꐭG )%߼<dĪĞ32 `a]S{K%\]3&pڸCո 놶, ^T7h5ulDxڷL'Dr6v շfc\gA@? GFVAl,:i#~NUDV~7kK`!PMXR$#Tiihom՘<.8Um<3ES4 ܫV9'bv{?VV3;U'֬1RV{Bi4C Rhr6~ӖJP͎M 7G-,NLo<ѣz2H&|$<{ ڜK_mmS)>rϛf@=BFCB&'F}@&yubC?'S49+ÓCIî+f/RU C Fu:C*} T:}{ݽⲷue[!>? ڸ"M 8gz0\HkZ:h~@+#N fjyio!B R'5>`[!T`mC Iѝ}n >W!M}Uav43)!kcȂm? dwv!ה;Xϡۨ}8vt"Ӽ# kvXJ[l[ZݙMÀXC3l[ TaVjʻѬ"œ t:(<cZveQTqHi{銀Q埓'ÖiP￭mKAIBF =Tᅽ(&TS?/؁A:ַОV(@wFa^]o]*99Ri_2vM`Pf{QYH#V7v7Ұq>@~uɘ׆Ax/xB3Ġtyb0nG` EDٍA: PwI7nW2ED<hD&Z Π73&)LD4;7Ѵ?$k@""L&~1ʺf14ʱ|7Os}L1;?{1$w)1}0~7# E5`q&o ow _鴊8Q1GɊ08hWe+\ԉRU?weOSxAU̞3| =WAR PtO%Q"1Yה!so%%^z_hn,{?"L5_D6+Sb<gfJ0b_x- ;HW:GMiEeIuvJ]~mQHLKkhbA>}.(h"U]9Ih_V@GZ0C pb :L 3tN*N 2!3 Cayn.ɋW`̳}QBCi 8*{57O#aTBUoi0 _^ ChrU}~rL 1z>..=%GG o EuPPsؘ޸8Pu&;*|i&Pbțh;[|y*cVhҼ(~_AqU2GIQ3`^v=@K'ЇZ#4sJ=:sY sڥbyj S_E܃"@~>86#y[cSŬ#SJGZyvvSя扝pwaT/, 9'Jkv%%.~o[ 衧RBjSȀ*$'腁pçSu +9\_f+8u\,tpэkخJ0h(]NQvW7 86:ݣ WcY_i>"R(e]6RA%U6&F]7@̳k3X h?KQ2Bk[<o-[ s~0]T2hJqKv(32J//W,z d$2cAkP K+Ec [QiEdVxR8B5a=:KQ\@V^;Kr M{{#Cw}{^,$0Rc\oQѼץP$Yvp>?..KKAb65ke+]F<He";{wNyx/&f檄/XZ[7c%ŀ5dY_y"Ыߞ2\37 k\띲|FO 68nKzR"?/732:а>eWHU0Oק5 e3Hco>l]02cH9{Z {sO!A,7?ŷ3w俎A Fj8B&8U$G$Y5FL5n1> q2.6e +@/kb{(7i={l͍݂濦81g(%h/EfMҍt5̼vgo ~ਜ਼WKi父UأݖwRSEFT% `=|*=1*SX^w)lfQH(YSSˌK1W]f7ך^&p@T'.%3 5zaTf6A5LX̡|L-ηTg{A)F."hjA;.~o% G#}&]׾c`ChH9xnNY lc\+v\EƧ1D9KX)2b.NWQש$/|6tð32ԛ72иyu0e)Nuh'd~xY ># b"k3 :9v$ПC:)H> զz;ed\jmfOa%9cKxۥ!k%HDn{Y"{n_} )9= _/Z(>lYVgQ#߭:Qbw$zwٮ#U?|Ghz{o$wϜ)|Vh? ZV7%Go/׆E"KӲlp76-z !l4n>$\zV?szqejQ]m^=^ !lHB4sL i9}2^K5OB)O v^~݀xrm\K&G^5CL}&FB]Kn3|sGjykObsܽaW?R6Jfh2 lBS\=jV*Y^˺^E)*\ rr(a@6nԌ?}dLgIvqNcaƮkmLcA!hdVwc=憖s_:җsLg>1*4-%&0Ub)Eܬ*b51 ++;<`!qfM*,[/GK+{,>CLR%%c~'EGAG=h䟔8:IDN)W̻AF)ucw'qhXèL@a~6Pc2L"A2bU & 9A#QLO:E9kfKFb93tL$cˬpLz5dp۰>$`.~X=?NͰ/LPNo0p b8AR4r Jj} Ӳ04ˋquۏAFP 'HfXDIVTM7Lv\(N,/ʪnڮi^m?~ QU Ӳ04ˋquۏb$tV&gϖr><y?f{紷%~ZazW2sveW@DDDD$""""bffff}X O0cDDDDDZ6W08BI.HW ߈9u*R*J^}:M$I$IFyџ_W<G<
wOF2Fl\F M?FFTM `r $e6$t 0 "Q?webfe5옏@? t,3+2q FYO&>bm5ZH$Y{H jd Չ %٧y"+@]e{vNc)n?~?萤h_&iѝ?>^K v-cۍ12Ky,'n(3EwiB& Tlh0M҆dYrﲬnti]yurVXsjgMnәHW r2>iT`V7R(+o6'cB4ι㿚T ]a[Qd<3wq8,rTI80>E?*E痦#7'S ocʷ_7&#*+)+4aA6cy٣f(bF$;{ YA1vP-tG"Cf- WԙuKְK#*K< (Z`٫ [%YT{%Ɋ$s{oջvt"p4`ߩϤ}o `'ne> G5sz_N PKӦvmU ɾ{z"3`l W#Ԑ^@+,ckoAOpnuzzJ)Υ1}O=xR`J`qUs/+kv1xljlEl\nDƶVjg{Zdz7 5!xm5o[u&1ڂHBkAqrR (\gh7Ҋy=HZUPh$8RgzgͭN:1u$܅>R]"f7 K^'3+E/^YU5]NB.ʋ8+͏8,|{M|Aua|a˅՝% lKGP,Nukc8mX@d̘?Y&{?P(G]Or-\LF9,&y8r3ܟ?p>~sDz1?\U5q=tzԒ&Znj%mM"}tkDwh-=mB76&:һqt" 1:Еu;"K_/Jdc0l0'^B8VCzg[ ;d Ybȃuu;@*}y| .'C>\g=9VŐ[o|g^ >d 9 *E|A*M[[*mOQz?Pn?R)YoT&[U*5S MB [ oYDh{,}1<f&6h'ʥU#VED"TީAD9eB:%O Fun 7?%RG4"fgF꺁 a=-Qy+B,2օ5𙄌xnΪf*!l|GXQ ރUp Eu @-Do.6YZ-&a>f?NN ]O/^;\J BEsJrĚ'g/B%o Cn7:|yKt&$s|wP\i]$Z@+ Հ90x]r%+RUEm+ܰ;wu9/I77զQlu\yWN)8ܰvY*umm( fEG8 j#IRz #q߷ )Y$ Лc_%m-{!0-` ;公hyV]Hv! ta\K[1{"j 6@3T0%Θ"ԙZIGS.ΣpӬS1eٓ؛ Yv8d\BlSR)ӆ {Iӆ%>0Ўڦ\'cg2%4QD 0͒3B"MՎ&ۊhIڧRgME I(5UD] }b8$8>X h"l΀j.%ۀHH- Iݸ#1C4Y7YݖV o>P]6O47f ~AJdYF€.oy) 8l 22e1H[t@!ȅ 2\@5ٓ%Zkޒa@.`n3OFR(󅥶ZkLkF HWjY I5*6eSbk.5F,.N0ԙ|V||~N( 4],Jp|~xeA5/ڻSvy?'_v|rXHQēB@= XB94TBBcHP+_YH#$`FB;+BPR4̼ t:t"ZEJ^!XǓq4_dTW(5܀IUŇAz@U6n.WGXHRK&'swMjʎ<3)`#F@  F Ԣvob$x +u&}|X&[٪8F-E&/>/G.az^/})'x$O=<zoA9M؝&~3r3g'8ң\-MDzk5A G9|1-! 87[,mRu|57 =X,aJ^tN4\fЄ]AzH^7F&k"LU>}>rBX(ۂT% JdhKPKTFaA3HHC[r;ad54 lLkjG{8h~ fR@9wB0 zS'a7@@Nƹlbj3hNXF/es'DsQ<k^׼ZASOidSJxN4DK! !٫vhA`EX- P :ѤC:WzSsdO :_`:taηБ س IY4 # *+<qnou Ucwwx$dƿ}ρ949p*T:%GQ^a'ebl-*XL%*ź.ڊ\@pR$T*Khpm-/oS3Eto}жVoeJ `<$t ]g*Z6ql~E S/iTtkǮWþ =?jGUUAJ`bˑGˆQAϫÖcWWSmgF&^ؘԡ6;C1:=ۈP`ڜVVE5"hOX~N3_5Ӂ]z-CWtԥӈe]\Vc#m[kuޗ_ʱ"sH<}xm0bxHqba3tfMT*]I }(,M= @JAd?§6PV[ dVv4jߛlH\{MȘ\Y܁`9M`Db<;a#z<x",dgCi`c:I>jw}Jz^:V.:ڋ{ͼ(ȲBɦx<Db#"S{PHuN/{r6;wUsPО<XYsMxu\bs$x(/^|^*0j~m;#%JM4pQM׬::b\C2gf]zP8T UQbtCT> p8+6g_2lΡ6H džH: d<C6ؤ/6E:K"`kJ<Ƣ=v7N5`Jt\j6ͅ%˞7*'U4:X+ \bE afx}1+pB063rA$N~#d}פP7hH7bF§8 P>BtGNmx@j |{s9=wR/oDJs5z>;'xEq^r^=G?9AA_K%Dɮ:uikjkIeG՝#*)jm|t}`JZ؈H=4{g߁)qXMA,H71V"o,Y#hݨS_;a_ԗZ^cn4HE?} ȝ٤=}BWvުUehGF;@2S@f n2#fY:]JyH]-G׌wgv'|0e _7Ґn+fٸY<( ?y%wm+j&&!c^u'b&hm6¤*2 ?AIƲ5FWؙ[ƜBUzIE!m:xheǮnz|]% mrUFگ1 };!n F&gP;&$$F).tBQ3(C=Xes;iي@~NΡE SRh\BeobTnΒju g@'qQ딎nx.u6bVU& ];!C_  5*zɺmRQuqPZ0}mn^nOrT:U'h0nZp^R|DF_b\@mDE8{oGM᠜q}Sd C,iܚE/Ë[d8],MCI_u,]Vc"pg@`"y),;B^el2'.(Ęy>-|hw;jՍiԽ_o|!@)ɢ=̌SPz*!z})|ƧT}jEtCZný*՞4ۆ׽[ 9Юݓz`Wmeo|j8j59@.EV/ZW@|f_\"${v/;a:Sei3TG*]ơ/h2C32$1}DNXt?Fϝ~n,Pj9.>ף{ 9EN-v|3hCиE XT;P$=J-gݕigz~q(A<:h193N̽Q}CLWߧ׎~ b"|4u}cy62[ \d,ҎճbkD%0Tx{=;Է(i LS13Nh/6?'E^~P{sZZKĞB{Dt&z)Uoa5Q3ȗr~ F]$<tm(} MB@[GxFh8#},#u Laz(Qh4%xm`Uչ.Ev1a4_'/[d{FxI59 D<&8VEFg 芘#I䟍2S_]QqAn_Q>bޘ4g-0&E#ci8 vR/4rP7KsOWN3ՏvE\bqQ5ZڽVy5]h/ i)-/kNю#e)"P {KSQx>a&<a,릌HEH ]%,eDU~Wlڛ;cᘓ`? pM l.PW7٣./W#;Wd*:z;E2j9yASS8u;fY8m KѯԄԶ͡>, _g-mc<n]Ч-52cz 7d PzVOPvfR Rఓ9Z -dC`,at=k?v4#P Bإ/[s.<a0e{&va~e8)fnyfBPLuIyH=S2"[(¼O@z*I@0#,I$Qy cўF aߞv"|Rܘ 'WF x?+aNMK`D/nf:XI8:H IRm]K6i @UH*NoF;ᇏ"Wqd\Ѝ*C=#26x7<T 7yrU>-bH)ɺz '}׶w!rXZ .:Vn;->: 6rUcs4kVW{#5ߑ0B`ܝ0u".QdB0Cr]#Q9lqN^ֳh~NU\ 16 ~SnTl\THҲڛ-~G~)$oQ7-C}q%/avO|[q4~Bc-$N7<VHEi-RF GNM{"3 49[j<Wӭ hln QҨډGcq@w/e qg<: a钷u_P` b{EI(OWGfEyABa_;O^DQ's `D#њi:Ѵ+Y{{p&\RagϞ0gTLi<'7?X1C an0or1 /U o/?♯a_pHֱ G촠8ݣ?3F0`%ϑ< G]Խ8bl͏%-,)}%J:YjT;Ыȶ5Œ>6w{V餃.&(o*n<n9J "a Д+ a/;7zDZη{tM Mp iؚkNPwؑͺH`T $23f0z;"]*Y,QWlSOrW$5]KVٻBܚIk|=&[58ER0ދGksSnnnuExKr}~m`G4u{=]6fר Bo&< ñc;2P$ǃ{mW_cª'B6Њ?$^z[CYݭjN~ ۮ0t6/)-1:p$Dꥅȗ  ,'yv nFTс['aMbJ]%&îlc6&IpF oi5'rr(qz6(5Eɢ՟l\Lk71Y4^)bٗ¦8yƏ N=9zT^[T$dk QiK%6qfO|c8$ji^vr.QQR"YrĊ krK<QI"@R9 /\&7Y}mgҊ7z6-Mu=,N3O\6aDAޮLd^r/.> NeRi4!3R"4nbm-y[X."!QKE\N4gՠםaNp >k)90BZBs yrer)vDtrv\v[>rJm a̼~uՏ>rMZcB<`)\yt|ۍr'<>[Îh7Z8caI! p⢟̮,G k5@`iw nО8pv *'O A[.rhT pR?+;\*HsLqUf:ql-ć *6!h+ˬ{h- jgkMMP#:}{/VŶC]옙&[W$ګ^#4fWa\ 5躺M[6)T3~ :. Z`si(RQ|/` il^L#f-;-C;_*{@EMCooÂ_7TrqzF%ׯ|U<Zo[TA='DPJ];,U9Qpk4~_C^qEŮb SGsY2NAu%SD hj y;9$ߴIAhEO} g/+ Ճ5JY @Gf2Y/߼e߷|v/"p~刋T8OKr** 4hi@Q3g"j:$;:f,dzȚԌ꺳u%ˣ}O&i2U, @kj%u?4NKmd?5ݓ;0Ye}sZ>EƫUs^ݜv{fQ<ĐVPTfͦ?mpP*&QG{cJEPe2)xP0AMɪZHj"׻"AC+zqmVzᖞU%C:@1W [y)J@ob% jA>)Nǀi$At`>?f0gH36p6D|M 4N 4JJڃ jƇ\ p38Я6pV?:$sDNƹ2n,HO\[ոK-)W~im?T:޺UeY-#dJe)Z5?$\dW<,Ɇ;ط5SոTT̄f(PYv=Q ~DX*8辩s- ˨΀55 XRl QC l|5{ӦT\t꼕+en۸Psl3UO[ZS3*,:ÛZLS'̵**@ı~xgno2- WV;pZ9?~$6<QrbQ8&seEbQ,^|B碘VdV-(] .ˎ8/qhVnRQD*U(*1h1`؝QL{Uj `"o3ܻVl: jaFaE̞Zg1z2֠:AuZIf62tw+fDCL-}gZ0>҄xJ>\QA_Cihbl] 64*A˯ɰqX7YX.-ոaɇVhiKgqNRĆN(r']%٘@3̀jZJ.;nm,S0xͻOF33ҧ<$'GE+}'1f3y5/&Z\RB7dm]8\3߂Ȫ@oT3eu^W@e7l!B,s1$Z&?dC (YЦSm>J"&pt܈P㇄BF4G5 t^Ć$j-a㠍g^ʐCAsT=kTS,|r9IBϘЬ'vGA@thQNj&T=xt;2]P|T- LÞe1ݽWZŚ*MrH5?=o"9K5='k-*AE| qҔ_?\7%|M6f++S*}W_]3fmܮ˳m w!.R#鬪;qq71$•ݙկ_iK&JάMemV5P0> Q5WHIh&4ҍIlE7}sm[cȾ|d^ %Uv1D>.T7*=tZ_㟾1Х:=0pZ6ҋNt(uƝ; B]$kڌ.{F*/UZN砦|oqKG;^侞9NexK \wh~ZpHb䉸 [k8k.bX.QXpxYa^"#Bwnbum5F~>8bN:p4 [gv^ BFUz)?60F8/2C8>N8G%l%5FH{46h4%# 7x oN t\'Ȩ E0#jNãVӹd?WlcW žֵu-}22EN}#䵵2H^a3rqs-S3&f퇣fwl.=W8,cHjcTWנs90ZDMC2ZMdjt"8:g{.Ʊ1Fb618"yԦ> W9 V `jT򔔑<IMԱW'%f&\yZdkʹRyjw}Ѐ[8ԍbB 'd'mo'<|E5:ڋo>r,ni <TS>d qN .g+ S Q KaB?_QE rjh>Eӛ;C׭7^q `Ue#-;oJċԝ>) ;Jg׭9R;OgiI7}8Kہqjeؓ+ٗ'nϷk3eFρ0V#pMAzb^PVu~1uғwn ^.II_vdW[Q,+Lbćq 9V} ΏVw4qU3&jıHYb ttT7ρarBwP9?)uT/aA19kM \Ps<Ta@<?M (.,'%?,%a~eU0/zQ(Ѹap:.6jdF@\V4{Ri 8ɪnuFM_=Z8Hlsy5k%|(i9 "6}ԋ~WK۟hYk\lRm& 0b]g"ހD^ތjJ*)6-Ybh Z=ޑA,(K# OfJ:;I!6Yi&d%m86#QW_Av}?+G cc*mg`>q+=[5͔?9W+^o^E8s)f 2aQxi& NE>"^Naa;f9]NE& t^CLz'e8ZRs&67_ãcyJ1 @TZ?SD2 |POӌ\dR7zH9iQ#zrc.4GR4qx<2~Xhnੳ2auBNC+kX0 aj5n>މe3vާ<>_ uH:XR%~9!4oѼ38? 1d#A&{A!i6 /Xa㇤=W;|) g~ ?*悽 }ڧKt>5|E.A Q6 (6 6є7<9_C f1Ўi8, V4$uti,.`v6r P gFBɎ t C3; ,oÂx| /KMp1S_X.fV#U>Ȓ#B] AIVoІϵGTV1nr+OXS% ³fOZ[_9P߰ {Gln%#hdwH= ye/W>,IP,*MV~ºK&eċM콣=)qFS"GTF*LX,h[wweWQEx ?{^چExhiׂJH|^͓e*^Я.uxEb#;ԝ<]z]\wNhochqE=4Q17W̓lÕ6᧿HE_̣qy YR۫<x=cSXy!=08Ǘx ?{}F_Ǡzktɱ7ڂ|t+am<xe$eɍ<[TX[ sV̋ާU*hSK=Fesw uYoٯnQ=NE:[(t] k|@ٿuZ\9{hvܕӆ.ڡsa$u+qw:#?eT3=л!pPL`:R; gʮ Fhaΐ;5Ie+ bt06AW40ThJcc<&mJcc  OCnW?Nio](XЄ{Lz;g|Ǐ>9~l4sVy`Uߛ,#_u+DeM~hq벇#Yz$; 5ͯ9$ z> *jO$$O/xRtf-}*oɦ|3M;xިUl/.~XǎY4x3&x";$KI5dڭ ~w[M9O%4Q}S^t@w[Y;-s;bwH-* imI-1e/~TNN.p)H$W~ƦO (9, ]gM6r+#%/swA$q4O> d9}+$s?0a,>yڈs<=,c_*\D}2MT8/4g'ڦ8'}"C*\9#Y>z$7c[s|"$} ymzQx 5%o$jkp)x-:И|?ofgFr2SZq}q o,wyOgCF1l'L5T33yM92"s5uD6-JUbs O)wR -2/5f<BQ4kꐭG )%߼<dĪĞ32 `a]S{K%\]3&pڸCո 놶, ^T7h5ulDxڷL'Dr6v շfc\gA@? GFVAl,:i#~NUDV~7kK`!PMXR$#Tiihom՘<.8Um<3ES4 ܫV9'bv{?VV3;U'֬1RV{Bi4C Rhr6~ӖJP͎M 7G-,NLo<ѣz2H&|$<{ ڜK_mmS)>rϛf@=BFCB&'F}@&yubC?'S49+ÓCIî+f/RU C Fu:C*} T:}{ݽⲷue[!>? ڸ"M 8gz0\HkZ:h~@+#N fjyio!B R'5>`[!T`mC Iѝ}n >W!M}Uav43)!kcȂm? dwv!ה;Xϡۨ}8vt"Ӽ# kvXJ[l[ZݙMÀXC3l[ TaVjʻѬ"œ t:(<cZveQTqHi{銀Q埓'ÖiP￭mKAIBF =Tᅽ(&TS?/؁A:ַОV(@wFa^]o]*99Ri_2vM`Pf{QYH#V7v7Ұq>@~uɘ׆Ax/xB3Ġtyb0nG` EDٍA: PwI7nW2ED<hD&Z Π73&)LD4;7Ѵ?$k@""L&~1ʺf14ʱ|7Os}L1;?{1$w)1}0~7# E5`q&o ow _鴊8Q1GɊ08hWe+\ԉRU?weOSxAU̞3| =WAR PtO%Q"1Yה!so%%^z_hn,{?"L5_D6+Sb<gfJ0b_x- ;HW:GMiEeIuvJ]~mQHLKkhbA>}.(h"U]9Ih_V@GZ0C pb :L 3tN*N 2!3 Cayn.ɋW`̳}QBCi 8*{57O#aTBUoi0 _^ ChrU}~rL 1z>..=%GG o EuPPsؘ޸8Pu&;*|i&Pbțh;[|y*cVhҼ(~_AqU2GIQ3`^v=@K'ЇZ#4sJ=:sY sڥbyj S_E܃"@~>86#y[cSŬ#SJGZyvvSя扝pwaT/, 9'Jkv%%.~o[ 衧RBjSȀ*$'腁pçSu +9\_f+8u\,tpэkخJ0h(]NQvW7 86:ݣ WcY_i>"R(e]6RA%U6&F]7@̳k3X h?KQ2Bk[<o-[ s~0]T2hJqKv(32J//W,z d$2cAkP K+Ec [QiEdVxR8B5a=:KQ\@V^;Kr M{{#Cw}{^,$0Rc\oQѼץP$Yvp>?..KKAb65ke+]F<He";{wNyx/&f檄/XZ[7c%ŀ5dY_y"Ыߞ2\37 k\띲|FO 68nKzR"?/732:а>eWHU0Oק5 e3Hco>l]02cH9{Z {sO!A,7?ŷ3w俎A Fj8B&8U$G$Y5FL5n1> q2.6e +@/kb{(7i={l͍݂濦81g(%h/EfMҍt5̼vgo ~ਜ਼WKi父UأݖwRSEFT% `=|*=1*SX^w)lfQH(YSSˌK1W]f7ך^&p@T'.%3 5zaTf6A5LX̡|L-ηTg{A)F."hjA;.~o% G#}&]׾c`ChH9xnNY lc\+v\EƧ1D9KX)2b.NWQש$/|6tð32ԛ72иyu0e)Nuh'd~xY ># b"k3 :9v$ПC:)H> զz;ed\jmfOa%9cKxۥ!k%HDn{Y"{n_} )9= _/Z(>lYVgQ#߭:Qbw$zwٮ#U?|Ghz{o$wϜ)|Vh? ZV7%Go/׆E"KӲlp76-z !l4n>$\zV?szqejQ]m^=^ !lHB4sL i9}2^K5OB)O v^~݀xrm\K&G^5CL}&FB]Kn3|sGjykObsܽaW?R6Jfh2 lBS\=jV*Y^˺^E)*\ rr(a@6nԌ?}dLgIvqNcaƮkmLcA!hdVwc=憖s_:җsLg>1*4-%&0Ub)Eܬ*b51 ++;<`!qfM*,[/GK+{,>CLR%%c~'EGAG=h䟔8:IDN)W̻AF)ucw'qhXèL@a~6Pc2L"A2bU & 9A#QLO:E9kfKFb93tL$cˬpLz5dp۰>$`.~X=?NͰ/LPNo0p b8AR4r Jj} Ӳ04ˋquۏAFP 'HfXDIVTM7Lv\(N,/ʪnڮi^m?~ QU Ӳ04ˋquۏb$tV&gϖr><y?f{紷%~ZazW2sveW@DDDD$""""bffff}X O0cDDDDDZ6W08BI.HW ߈9u*R*J^}:M$I$IFyџ_W<G<
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./doc/images/create-cluster-detail.png
PNG  IHDRC IDATxweŝ,$ / @xI3c4;nLBњVLwK-0-p#;Ὡw=yu}MUoRɈsI<='όK)[sw.RJٺӜM( /!!!!!!!0/",^҆@@@@@@ y"a9O8B B B B B B 2c B B B B B B`DX$'/C B B B B B ",3B B B B B B @<Kˌy"a9O8B B B B B B 2c B B B B B B`,2O"{W{Z,Мkwy<e̙eV++\dpy>C7(,LYGw}wYxk=W^y^_<7,-\hz>^q +0[>`y뭷ꫯ^m-b@@@@@ *,k\r%eƌe6+g饗~B`uQec%N?Oƌ?I'?IenmҗKSN9=˲.;?;n{KYwu}or-^|+_)K-T^{(뭷^׾V\r@@@@@ 7*,r饗馛@9CYd ޿EYQ~ 6ؠ^#vZ/qy}yy_}յK/te󼭻[>lyꩧIXs9m-G_ho]yú?AI/b-'@@@@@@#0g]l$~BtﾭN-$aFlVe]v).h=/ D4=c eOyvm5p44X~֫OqN]u]unK{IT+&l.+w_;5p+[l1p,-?#kmtLx;;=8ʣ%Xց$y{}09!!!!!0t拰$;OV1C׿B+"f]wE,Q=X)7|><='PQX;NX]'nnKd ҚjX(+U*{m&Q3VP><yM6٤|߬Py{nATE5\Snƞeo\m^ۛozS_yUG’O.)UW]U5\eUVB$xx.=  (D6[[oMėg Bv-lQӟT=~w1T/'1j/>K!.r׸>؉Z*!GD<Z;~>A<XcZ B^yM%b}_~?!!!!!!LJp$*}c;f/.묳θ^VѶ]afzo~: Rz}N╴%GLp6<zx&_dJ̶zxTAA^7SnG}htLtEzĦ\ki3X>j]&̟&0ҳy<1vaOy 7PWb DZMW%\| m`M$,J^T=!Z =Wټ}ΛKX9gqwON;|#-:ݗ5VqMo݀ !>D9D];&^`paA믿z-F$Mկ~UtaU[ي#4-_|BS&,U7{g9gCLyUd?[9= ?≠3}B S<,_^%ohwyg.ۄ%ygV*4QB~p̫;7B\-]\b;ny: _ m V)K|6lSߡc,2m bճ_|NS", N;J‘@ y<>(rJHYu=K<^="Šq\}{QD+MfXH 5ORonX2ÛO$*=q>uHeHS~n=zJ~njaV_MʲN!~@@@@taSH=7y<a0C믿~}o$QwcOGJm}ml^Sl喫S]# 3jlĠg$M+L%<_I+j0!<(H?9B_bMGuT*kszT~> !!!!!!0 K!nxy ?*RnE!F=Cu&NJEʴXEwx D+blB(=bL-XM:ڪ27t*(ύSKm8ĥt!lrq f zՈۊ҈۞mtNMD{ջ?~@@@@@ /IVN!1{‚XUqCV'm iO?]EUM^!בfKl^r%>utSO=W|e2mE:^X'y#f_eʫ|!)sm!X&ܱҶr} ;ηZa4i#!0’( AE<K693&dڹzg+ɇ$&k#,lބ)fBN$oj,:s=UحjuʩWV9{U!mjvkgwږ4+qNicZWTejɳ r.,$Є9#J+4P;$f"Ĉ_U4yrme8lKۜx="G|M$([N7|6?{zʱRl %\/4˶ ',ŵhĩ",lC B B B B &&S gEXMf ~Xn y#m9:}[^MuO`ݼxA>ۚ9M= :){P~nq'>QY/m?=;6-OdW57Y-$껅B B B B B Bo²8[BB;T9Nl6ayO?o;u#Lu8[Z}s=1I"Ly1)Aybז+^sҍk*ߪ[ouڍ׿3ݘ@ K<{ggصnB@@@@@4$&3񱢫i$=by,y Mցxj8g7^;a'pP<^@BvN18(YKmZkjy]屴ZuWuαYڄD` &ܚ@y8uBi%齏oʖΫ+JqUu c=gI~dWt<f9^W^Vq|z_?0~@@@@pҴP6w]wۼnY]kV_}nOR}S@G 4&O&1צ܎'Ջ+oXAXŏZ}5}u,Vz߶-ؑ O<QV>!!!!!0滰E<{@!p&KgzKt)ë2nz'"s=W^Z'b7=+٭CT=#y)*, )~Vr;Nr!}^,ܣ΄'._{uu'?I}H]?kP= v1|<VBfv&#kĔ/W]uUD韼qSn rՇ9=']wݲ[eZ<hh#[}O<xhTG[) ksϫIv%!,S-,ⶺք}eGB@@@@@wae&*/xϬJYt! kN +޹ocNlAO ʳ(_=uiu f[H$r~ߘ-~dlZ!0= JkWlZ? s1 F[2'f.D%Hpn6uj-^-BH6z _B˶nʛnrPט:5xmB@@@@@waIP3OQwmՅw;=ǫ`"& 7ܰ<+;aI(O~'Z 1u衇ӳm=->jo~SFkhtLYĬi^r=ܳzr9LOz}-/wmi/>;c;z>I^^+ne'B B B B B`( 7a9!5ɓf 4<]D{0;⥻=أټx<C^}NUKm"fBym;ë<YgU.rWш )?KbײBʟkuwc:M$0߄xxB!`%޳D\Px*- .XcXYGPKD6kZik,YˣKoE$=,l[o]<_O۝Ѵp&>'|rwcPD'tRF{.'vi M wB@@@@@L)UM|L/R}$7(Xkyż.D:? HGDXU SY/p(g F Z2-UZ xVЖ8#2:RYO[&D{<m0+TKN|pM7-Kۭh孼{ ~aS]zzbi!!!!!A`J%ւXsXwKĵEv:"B3Vo̥g!Ͷx7W\qEs){Byr-BЇ!XAFP$8^E/뭷^=6'rv˶c=Vv1S}1S믿~6QN@@@@@TXFO}"%a3Z Lx㍫U4%3M'y7hY g:kxMEij,K\rLmSI[A[ʰD`P={w=YQт67/hqlVR:h-`~u]{S_q;Eտy%@@@@@hf\_JNRqkD@HlwGMg -/Xb#O4CW y" ߿7(nѧΣ=*_YqM1rxGǒGWsz<(~@@@@@ -\X- 65˳9f ,|i[ڮ(5B B B B B  S:vNDT SU!!!!! z\pژ@@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`,#ִ1B B B B B B` QyȌu 3FF"+,dr:<m &0cƌL$@@@@@@=sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@@eEvB B B B B B @PK@@@@@@ ˹4!!!!!!== sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@"LK###'(sOy饗6lS6xiYT*B B B B B`8 DXN~1cFӟT~ߖwy<Ss$,{rg7|s[޺eE2dd@@@@J *a2;Ƚe&}̙G~?tO?t9sˊ+Xx3[lfe嗯}W^ys}ݲꪫyg}v2V^yZ̯ꏡz-/݋/؋J+w0;!!!!!%r2믕_z)<Vf࿕;rBlw_Ko IDAT25l۫,6aI]tC.R^PP~VW|ﭷު,½vmUl;(<fgQۨ^gvm7nzN(믿>V[mUvuׁMou쮹暵ZkYƒ +-R:]vٲr>XӼ /Xce ?^Sme7[KQ^0ov*RLjvzF;,QhG;&q+\rtZj6/!!!!0 DXN'/ɧKYaRBn)QF3ˌ6+elE71x$2k"M~xˣgw-(w\5Z[s9Gʗ +?v?om[=]"__{FޟwU0%.vZ;{.W^ye9裫0k9B?i}VwilqW7H.iwફ*~xqgGO~Rnzk!z/V{ :ߵ:4n(;s?]\Kݪ<35]$ίYnzK:딏~Uwy5.?.+vXr-Ye?B B B >Pu9Rvج?Ws+#OU) _RV[mܒ kƮgkbːFaF1Xjplyxs ~umSMq Spl-4WJ ^㬾UIO/t5.š?lPob<s5<Ģq {X02|:~_2,fZ-CXwug߉Z.rGV;k׮S>e&Nоw}kA[yuQ$y6MY\#QkW#ObULyA;}/.n-rα",'RK֊ts{R]V-#[nqojn]1Aaz~F{3JSn`e2f-҄&V|x!ܦ̶ҿՠ_mf)[<^1B9?0f0Q;9 cڢ@ vc5}_rj1Z:u]Wyc}衇M7ݴF馛 o~sC^ƝLc=ꨣ*W_}}ULzzU$ a>W׃2Nb@AU#}3oʮvr/axwr!c*0!LڦNqƬ22uk7_p<mQ]=y]v٥+m[\Zi5#,Pk }e_/3:,fKY賟-e \67. kzB4c|a$|<],B|x΋o>G z^ξq@(i-8O0מ-cDZnaw}{#0HS]//08Yleo՗,!!ouh?݂]Yxm|JL~*xO}%82F:^诽޻>s%B ބO~=Q .ui+ݜqDqNZlM z{C˜UiƤ`ߘ&<]D2G>ƛ떸51.=oD]̄N",'7,s;bߖrf(2VM`hz,Q{ K^6“7+0V nPs|<Բ[-$5/$Cق+-Kĩ8</D<ZsLm?]\^Kv\bA>mu"u0a}<>_m/榲 X&k\OK_cGC+7D(@0NA@o'GwC }E0 tyAܨW&ouцrK<:G V1,Ѯ6~ZډlqLUbY0nyիM#oZ}Z!!! Mf-}ˌÏ,#'e)PFXu)b FF,4%ã&8s "Qİf8 ,p2y`e&0Z9<.3b4Gu5UR , &Z ?whb#|n_:SygJDnr;Zz&cc8S( (禃m7Kׄ(/5 ;b̹- |oSTo1ۇXuuu!ȟnӴ]:®"T9ztI:~I7qLmm.",''Z,_',կVf>dewf3 b!6W9C&"8YV5b7Wh`8^C()d~1☠mpP^L<i<Mhv)<Z y^ 6ub(@\~u5VΠ 걱Dc . }+AleKcߘʐke2w8+~ʕ_E[Sw=9z +J c \\kPB@@@LK>Xeu <2c&< (XD/D(L }`4C!|oږ!;Z0c CWki\^e [!Ny䫍<S[TA&qy\Hh[F'yJJkqa%tnq'ꎡ-kL6S8zsMGwNƴ1.>&B B B B`rcׇKX1ly,dBTy)<v)K ' i9ȫ5MhN3֥c4!PyƯxAS+QiaqbP|Z FT]þtDe<Dl+gVބ0Oe OX0s?_A-ܔ1XtcxЌtndyyٱŋɍװ*Xy\@@@8e0F`[#.1d*/xm`fD@{D7eon/_-Q*Hjà-k!M8Eɻ+*W"U\vhK- &m5 uG'Mc?8./VAӝ-B9Gp޵"V|-uqxJT*,ě۠7vkЭ,VmoZnzMن@@@$a9?iRchmBƴP+[M.s!>eK-Fތi*7Cv}syttF.>zy뮳dk'۳MӦ+cڊԙK4!)dP[yø 7\ڴƃӧtї僵isƍœPe42P7ױgs̞a$nu,m\+Ss-y׍'Z0xބ",A/0M5fQBϸ |Cqx Deqߚe,Pf[`z c4?[PiA˃cg"!ӄ/,Qڪ D6qxyoWGkSwĪ-#o}M74ei|Rq1ژ#c}ƢL^]4G|771`{=c}q >>sA8s rx\1hwo*$HkT3O@]/d7kA=ǫYSs͵70jSMxɼ&2 ]%qSaInɔ4J" Cy3yjG\A+/ixM__{P'-#TB%y|B<߯ăgшKe{*;SzuHkt .M2ۖqĆt^堮DE]Tֿm#Xy-qe2DrL<7@.CҦnKPoP%>OXׁ^#_"|9ӱ}vq:Fy0ozƸiۺdݸqx!ޤiyɵC^I{l۳n(+!B B B  CBMq#,oUAC1N0B4& n+ɿ</ #\ބgLJKDb><5& !oAՅ̧B}_P#uj( ~m|1?LanM=e]jgyf}ݫC;&Nµ^[n20ABl*9H\1264=k˕W^Yһ6]+Ę2x훨#<s]qU`L='fye56/A kAFW&v&^I!!!E rHe>*'W"1gdZTx,<#Akqxh_]%(1~}F3p2bRzi3֛XSq^xjMť?HGx.Qr衇DI/$^QB'4yaد?&fiɸtmz~V8&%;_)8cS{D"MTnֵ2P1u^V#8viuL|wYW?+z)_xᅵ u2=<v1:iHU%,15=((bG~r]!!!Ӆ`fnAΨxKx=h10}MXBt1ԃ<ZYDisNO1K2yzIVϴ7aў5 寮S.o)cxmuzf&_yuhr:/N: sym %̫תgo ?+X&?W~#|ן@t/7]cl Gu{Fcӿn(7Za '+TwyPʬJ#ڭ[w裏7Fc%..sLkm`Lj6fhF+C B B B`~_(`(2 H/#h,6@bT <C l}bW6ؾ Dhf-ChS[8'. 7oEQbx<lbMlS3GK 鶗$ l+B`z&'y&R>Į2y)[=[BUlAm pnƋ;oLk",?^!L߳POLmD!֕1yyHSMM9d2 O<Din4a8Zum,q2Zcg A5q8ѱcyv L4_i2ѴSoN0H!!!!0͇%"ݓ!T!n<H=tLuhuNilJ DX~}Pk<]Dd5BycxK'U5qv"$N@@@@122r})e6,1ͶX)BjVў+}΅@@@@@L:",'i2 "pÿ-9TmNcC B B B B B &@dL^!!!!!!0",LI3y@@@@@NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@Xdۜ&@ [o_~7(3g+B B B B K,QYf36?r  !022R^|c{, /<<yϗ{eV+,2r0B`A%+z UVY,b2S~A+B B B &Jw-fqD<.뮻n#,'J4B`$'^JwLsF"HB B B B  bU[єgy e饗n.0gS:Si+Q>C#M @FvkQ2-vW%l$ !#`}r\yS|",l0!!!!0 &,">4=-DX6نp鯋/x2,in@@@@@YJK.Y<w ]!#k;<C47B B B B`؋mJO7d.!4;B B B &HًB *9CF`!Ð@@@@A`,1r p9!!!!!!0>%F@@@@@",ǀS!!!!!!Qb@@@@@@A r 89!!!!!!0>r|F>hyʊ+X?/le=Se饗.-\ Tg/kFrՉW_}<e%(,LYy{'v8ovyJ+TgwV2F+;C B B B B`A$01~AlަGyzꩅ0vmqW]wU97ʆn8!W\QxQE?*֮Z/K-T!4 ;cLmjc=*c%_|+{_|KU\+_}gO~o*߄,K@@@@ )oYFx*3XQ^D:Zo*k>袋VtWo̙3gF<wܱw_/7xcg⌌ Ս6ڨjx{4=X%tӄ4c .u_l _ye vWϯ%RqqCw}T_vfӴ-۪ IDATGIlYYWfkO?5>ET *‰#⬾%\Na%TZS%֚ؔ7)Ѧ+U*\oFz !xg;c|婼8%XMy{’x6U'W[q_~*&_yGxz{+GȦ&@@@@@J rV.3Zw-?Vy2cKYr1hUW]Up<tUO |>*"O9O߾lϮHyIX7tS*_Pބ\<?p9s(T/qCm[R^TXM>w)Os=+bѴX]SxիīN<"τ#z:.7礪x AAq7c?*SܱO۾|ocnSmJ'!!!!0] DXNy2УJyRZjeGe@5 5quuוn lYy݌gA O<aA8\ zbO^Zdʭ@xwW^/(*Ok,/>*h[}ԗ ^ߵ_~S*> {y<ׂOiWN-]sFX1<놃k|3&/r7x& //}ceY]wݵg7N7]?i#h'5]36X7W<|Wױ-Qqyv7@@@t$a9zeKY~Ry'_^)?SKb*/ˀе^[;＞"F-cb?Cx6K K/z-=1UO#(Gh/D_l:een'!+_b䠃EXj!.ڦV6#< b>MϜKœQ`0va+_G>^!w]MsGq5l\{5Ծ7V {+?Ɔ oxWX7MXT&Px76 nחE,vqO9C B B > ",Q/j˲2 +-Re:dlM0͎`g23 .\$oޒ׭x)J$xe－$n ~4J)+PƷ/{i6lS>OZu<%>Zv!ҟqUd?!ө|bBݕ[T(!@vY|_ sF͋O>zy6dvX{ʏ~WW_| J7XQ #_;,[8c='mK.R9+7Jj̱xnr<Co:)இN8!c 2!!! ө,,\̑RVYUW=ƫtw<0liBStq nFn ߿TgM[yxrLPV뮻n5y S>JDQGUum-tEx>acDH򓟬O?zrMVB3G#<qx$o}[&C7Uþ0UZVD&qf>rMG ד1~!ԛ#Z76._ƽ袋M~hiO rus+JYx2?u7re̳JcR:WA+P<"]-Qnqy)o3b0$$/"1#^dhð7 չ3ve<'IHKTMldBhA$6F\oM%pMTτ9#`Cigͅڳn;Y[N7V5<}Ճ? ƺ%nFxcV[t%C=t n@@@t"a9zjTԓe~[Ys2+e'T[qC 2# ׶xEKL<S@m}9SB 4CBQqLƴ:s1Mt̳I5aQ]c^~'Fzꩺ/2 V~0'NA\⁐e]9hnB<O)MY X$G0-fOwW-R7[<E'<ʫj|zNn-ɠ|MϏZȸwsf==B B B B`Znݲe!"TX6ڲ մBb &Kx-3';s<y<<My&}7r/Sdǔ|74AxZmT|λx-(C} 1%XPr)a{z뭫U?uѼwœiMn)m8f< ֹη4uč }k%j:71xKUXyA 1 xvC(qa9N",So٦wΡd0lD o bp0o$&-yW3=/}h!,-ðƳ<U j"mW/qZy4 q,5TAEPKÃ{E4踶Uz% aηϴnb_ۖvکi M4򴛲-qe:4~n귛 6 Vަ[ huo;JR=я~WB@@@| >L-H]{D#3U@+ `ϱ 4ýg* tPyc&AƵlnƴD0s+ Ӟт"/h Db%|yZ^!<+h mg&kG$kRxwMusn(т8n J/UXYyRj,x~ִj>W3nݱ<^:i㫛xr>B B B  T޼: 3"8%L!mynߊ^%<քH'xм'5%оU2q j! 7#=BZyj _ ve<14HG͛)gxK8csM2Usg+eܴ 79 ٖ[n9;?y{`1`<[uXwa~ӟ-9:cmڸ8M`?B B B B`:N1u1ի9 ^he^ |yZ 8yr˶yZDeU5y<B3yh&ˇ)^CbbKJ8Zm{WyO_ORzNw'²b?>mb7x5Q&em?; ۹nF}ݶm}&WK/ cVY1ś+m͏6m'.qB B B B`:0Iu xe2Ʈ7&Cj+]{6<B]/Zq' </MGtǔ~6K*]W-Sאop0skkPWL>5 H -6!V>;&1>m<zjTq13Zcƃ^WfGۖ1׾*{I ɳ,i嚎D*8ѠƙkĸKSoSW;cسH ØMĝ~v2yyMxJb</'}aP7ڻ DZ$N8븼PK7$@9ABXuI"xN/w:ڴ/| %"|kmS&,[́vm71Kg,4&so'ai^n__1՟wcF955<'OZїM 7C B B B`:ν3u#LdGqg 8*"I-&> vءzxx.w}i"R姜3<kh@͠eODLK|B'k4!i%{zjy׺qZ{d0q<nn^?=7E<q3[}OpO{^ۮvSC >cd 6'{֘T_+vk v1~לEB B B BD [3f@eC9@l[ DxQSG7uִO_z5t"B ͋Gh~8`O?QyVl9餓곜#<V}B;/MM866<{k$,cܸqGGNa'5Ɖwj²{E:M76ac= lu8'|rbxҙ-nǵt~L r: Z xCT XI<C6<521Ga mMl""p}|H Zg\{O^*/ݠܖg=ZYV.C'9^]v٥׿SNc\ Vj5׏)̦NF0n*_y*qƓ(|7Uؼ袋d[dJ:k:8(AkLPIӃӟ<ƩA_|L r:֍0t] 靦{ER<ưwFnZ~yL H@/?7PO< zsΩ۶J˧mk $? <iMZ5 Jw|}Ջ{07Җ}Z?WP<SN6q3V d杷qfk ge㮰t_el.*FyLS4};FКz!!!&ޚ@]'^ihS A"Q<*{l5W9 a-.g1BS"}Hw}{QkBp'(i/>Ck=A" $zF+?|'xb\Zqմƺ@vS@M9֧-8om[v+~ksMnغ;?V03 U])dό:r_kεF\lijGpMn<DG=VUs.B B B ###חRvVJeB /mWLvġe =?ל#009ׄzSjhEWxP.n2XG>/&So7hƺ><Ǝh72<ޭole?B B B >pl3DKG x!²®y~ԽAM%HF`,aӭRX T&KK˃!!!6{֪7B B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSPL?,H\j!!!!0̜9̘1~~ ?K,Dyw{7ۏHSC B B B &@37,.htDXvid? /\[n[o^{mZ@@@@ ~en]!"cjZ<套^֧!!!!sB|l76$e7DXvid?b-V^{:72 in@@@hysϕ|eV*+lg\_Ji39!0̕˓O>YŚ"B4F@@@8؊Xcꪫb_ߖ;!CVX,u:+Rfii@@@@;,LY~嫽=ݏ~ 1݁I9!nsB+qC B B B B B f#a9sB+qC B B B B B f#a9sB+qC`H Xf;wzzzw몶<[|/yuIcu^ƫU>Ljx7562/{\ZShgm/n~~_4!0]dUGLc: /}KԔK/QwCle--Xe2>"+E_wߕ;ＳeW%?6X{o]p}p@=M(k%(GqWC` w^O~x} z땥ZjBu]}9CG? -ӟw~\rѢy\>_}xˆn8uQ^r%UHG-Z>Oڪ?lz2<,r婧*7tSe]zr_uUATf#<2~J`vKN  k[moxB8 <Hs3O?oq< 'F[o]Ӌg{v4+OkQN8Z^ }c{<C[n)u :ub(3WoWǕ.n6W\QB_,m{9|gʃ>8(n4L6@ GcNĮ*U>r :f(K>ʚh`X,6C!yy0~qebݠ>Σ7mVgTwmk-n{zu{vM@1Zh}kGqmsh?s-_;0Vz5:z0{k^Rmgci:nfc1O<Qûﾻwqe5%V]'z'7pCvmWó>[W_]_ױ nJviu5G}t>W}۶뮻&,}QVU3,A7ʔ9ZjHE{c_gǍ!ɚA<Pvcލ}Qkdn_NO>Ye}6ƵqAqӴﯿWuoJ+4ۘmMcTiA{ j+Ӯq  o~O?.(]u6ڨDqqO r-`1$$# ftl3Fz~j wMH` ʧ?j`8-آn& F mP7O?]x1DYnlDՉ)f`j>˨k?\`gc<+~6)`$co0`bLӸ7.mnek2ˀZwuk}2q;blͪǪDk]Վw_^ k6Ѧ. cu1 IDATNjΫGx oyn(wq8RWߍ}ZMOhcqҦ{B3a>2ҵ)q溑76 /Ck͡6VeK71hq|vy|[K{k^zi9czhl3kBiAG擭zi~>K{l&m٦Q\0``z=@їnuDnƇ>p~oWP_\Inz6}_;}q}<{Z!y}^׷ߗAcL{_/hf0ov_\s~+'2^=&!}g<m,s ]tQnm믇T|)ݜu'e؉o=%In<3o1th~Wf[#a9uls|*֌/pjQ1V RҦ˿KҝV tW]4`|wWÁA`Tf D1Z>sNMcA"/ ?3gحJ<A{ce2cKƾ5u`dcϜ7Ny2/-ďzc9/s 0ʘ΃H2xzd`/dhJ-`b@}<,~SLAc{PR:tvcr a"?SD cI ZDzptLoԱ /ѮAP5^us-rJ'.4ϽMi6z)&@s|,{パ~ Z:cƏ0hA=1۠^]a醍>;tR}ݷCz1`3[ojsMnZI&2lck8Ėx82UWnH#uo֮S]^.ظ«~}P(IZwЍA\u~_'39oD뮻y}/,hkV7^D om^b~_m/nWd?M}Z2OכH}[7/u륿@_X9nm_m]aigi7pck7k_ׄ!a95\k|;.)ŝ_a(3}qDdj?jv'/F~Q<=G#Ç"1u?LqeD #8oD1^?wbܨcDc|-7*ĉNƙx&C0&By1S// OEeQv(϶/yuQ#8;[6ASsŇmd0ğ<LvƬ;8e&y`,xg0>7V Km#(T=ҩ;M7pԑW1o: "Iq;:"k(O߸9䘴>8UwVvél?5Ս=h 1#5c|]<nC?"_2%~_{fk Ђ,פ  {e9O8ks1}.:î~5/DQfmuK ~KSW7^ơ:c,+pA}L}!D!-N ^mocA7v-gng,٠*v=~(ß^uƠlpo|9[⹙oxA gx~ߍƎ!ƙ1#h߶Fa+cvh!0O]<?r.cI\To?G?tNn3QAp?Js7E?%y1ΔM!c Z-H/-4{E1f0!]Q A`zι/(4N6CXˇXj}%-!ͩZvcܟ~wǼ<u>8y 0vƫscո"xy#Z%ȍ1׽~pxl= o@=Z`3b[~v*YFe`c,)ϼ1'+Ƙ1[0qQy6a,bz }Wg:cH11}@p+H zsc&`)ˍ)J?51e\qڍ+7?\0pom%l 6ۊwkGOګګ}ݺt_W-Qz |AKM}OeG۵Q'/ҽ( &65lfuoBKow] e \G_z67TeNVxt}~p"²I0~+_]b8qwvujl]ƫX.c1m3~V(]vrDXNZ~& P< cgٵ;^?M=j\yMO`ZO?,\bD2[>#y3wWdc]coя~T~[ߪm<˱[nel_aLB#@iߎ1D׿S=CZݤOaX?b@BA93=!57’qF7o3Lbh1(1~OWX: hX}q6R3D@w쵼8ĉU[U`ey1VF^b Y|g L7~V\60ʛGr߅:|ꨜB9ƀ=ؾ033ޝwޙsg=w;Ύ2N`1 2`""P}Tj.ԭ(UW'Nz+GXH u1I8'}pƽ' Ga̋ヵuB+(펴/"lgבq|߲@}p <p8菊~8BW\q &y);5  bvUFA$"0:E 9v_S;vg8~)Njxw1^~Oۭ7!2r|F*߸Wzm2&^yE jX h.E~ͼYLㅐ>Ѯ+ s\~ĴB`1vrRkܮ]{v"mq^x1 " #6빫G>UYoFy|90Ҟynzga1Z}ˋFO1&8VB;Lid12(3)22YgD(  4?d0hq@daYD I {H¤CP~-D%GXƘ ~y'n& ;F?p0b$E11vU] 1O!-'QQZNXѺLBM#?7=^_䅧_˲7L1rk]=KQ+,0vb#,0`K]s@|R䝲M0D1DicMZG\hң묳* Ge|O=6D OS#As<RA.+C^0 Gҡy-uئ]!<m, zQf^<y$?oyC:b|E="Bzee^Ãe@GŔr9L9PN2evA˜>?EZ^&$M0@Xw|eO}Ý[ 0_O_btF uYM[8Kd`<֋#h 8.l|?2Ɛ:*@1q63/ҖY\ LhsS;A|R~<m:1NZ^`G\c-K2f2P3 s8׹'qGm_^\LgΧF/8xf9aXb7 I}bei4ʃw譜 DFF.;1~8ȠdǐIÌ8p1 gbh0h18,qb,€2ar?'~pCF*q;d4vp'\C1a׿^uILM&0 ;i&kl=/?1\Gj\^Pc f+&43FHԈc@~#}!FH2sy%tmK_RݸaZG(;d=ab #bNۦGrb_?FGxq#66ZGd .v i//G7"]=y`W##aKSUve1`16~10wﰡ}+F:,~f\ X= gq (8'~`Î)W_h(c2",9qa|SV0ռ(m3K'I>V[wKc7G9j q4wvo98xJJD#|PΧo"}# @?ퟶD1﹐K<jÂWF̕M8#]4$ 909u6SXҧ(7}=)N;1Ў@Ѷe9k5$0A B ڹd`T.  D1R'>"<2~&AȤdBL/$}D o:#}³Jt\uL6< 0:yω\p3!0yMĄx0ZXQEyHiT2{V1Hp+~!w]v(Hو A7ZGZ8)QXQύa2ca/@ c.3IAW)7\jR?3"O\O ae/R&ҥ/a(3ZGeYGN{+0J~XTJc/׾ꐾ6<87. ?<ȅ0i9Ч9 868@yh p̶w]` 1u&}8kcaBhes# )aEqʎ8^K/mrvqϴ2 )9"@Xb|ѧ(sWFm eu G,GBDs‹r"raxXo*qn4n,퇲u˸Qܜ2sz)l=^v'~f&=cQ~{z?m<P^W3ewSv#˜G8H8wi3䕾0S:Z.e#9nC 'x)12:&` b&%"+j 0I1619A; \#]_0C^P4E3`1bֺ\'^&/u&̈́GcTp_ #91HĆaq֮kc0`цn <*e# 娝a7w0%4W_|Fhy$ǤOa^ҧac„66G3z#8 >9R0Y);'aEXEi䥼;A|_nxAG=atyRr v9ZGaΪ>#Q3 !,VP78iOkm~Af~x賵&|ߝH5XD|:7he7d$GFzǑ.>Mq++̨kBž7c_?ʖF7q2+/!x0K:a<h/=NC-;BXxÜ1rwSؕ6/zaC惲V 4bL /C!hGgahr\ċ#8Ӷ@!/xq†PH9im 8F73O!h܋1a\;Zm OH6s4mJF N`=@oKh/pGnCߪWucO@a9LQ@ɀ bH_&= &&RvYdgb„A 9`\3XILL|' degR-3)ce",M;X"_g~ !$ϊ/`YF슣Gv0vx1abŖ!1k¤puYuXXa`2(' ++,6${a@`1@)/&Ҩc׊\64<:xoʎQ+3Ax҆1D1pp\I\/1yRo K:IgMH i9,_7q!a 1ZA'HNS'm5ix0.ƒKf?.66>\ÀGGGv[CE8&Ä!B B8De."e>vtX,b\g,alU_xJ7cCy|څFQo|?2rg_?eEʎ"Z|OџuqD=);GW>}Kxώ1 Ip, B GL\/>.;2e./,,1CHc1']ƛa/uI` 6 R!=EC$hd˶8]"|2W2[Q%ɋn l]}( L9^rN|; #3'#FC&vpLW&AD 99΋@0&b9\sMa$7Fy,)/t0ĉ+)ϔ/x0R?3‡'"$aW<g `=E Y'Ne1yb`2beYg]|/%_Ypn9'0DX!Ή^H|ca|`N~ӱB FQW/vX!$ˎ87 P\2\'mر1.rѦ1:(\k$,i'-aH¸e^y/_ 2FFs qw0Y?#n .;PA:eG\wϔN/m2Hy&ㆡO~h1,#y/Bz}Fg fɕepQ09M~ag|a<d=Kg|!˲1ҩFKɅ9er䟺'< hs< npFx’`~ȶIX#^xgq')GXFY˾HfLq,<`~oF' NRz2 KHNfzHe\0fYe"6b(/~8A]eaɘVvp%qY^* #;|ǸnE,q/pcQ2;v/Ljo2.#4 LlL 윤)0 Z(N#\g7рLC$ns~W?qSE䙉?LfL|&ċB~!1Il1"D&%EoA8&(7Cid00Ԉ q;`PˁɞUZB?!2[# '|X쌣<\rb`3DR~b7& IDAT=!%ċccr饗abp#;4O"o׈l l Iz<;N{fxY-;lꍝ-F)<18%<u 7bX;0y-!fvB|zX.` 9aoE(N=Ga"iH?^0YI4)A.iGM\/䇺]!wF=@8D_D{X48Y&i=O7_a+3&?){/āw>_^e5e`\A/Q^XgÑqėB/佶oRf›> i—uq90=5X\n߅-01j5d!M퍾OO|,Rwu2./xr,""5peU>{XF?gg8s&M[N))NN>-ʆЦ~}8΢){Dyi,8_RwRꝟf"0o} #Y'sǎc H```de`"(;&iy1/':^7I:C0qwّy!>r\(;~5 0&" ]ّbq+|18 /~|VeaŖy(C"Ǒ{^v|\1(G^1hR}D'6>Sv𨝘 Oa1@ͮMDa#{Ðf$Eav<p3'F'|802N4 $;겾G{)y:B4hg?6io) /j~=ޙμ.mF:I11h7/ ceL,z?9}9nmvA{ 3m.=e@pE;ݑ0E:X5/uSq.?p:m>wEr2N_BHUx~1N]QʒK͌}A҇+O Ja|aBqN댥;Z7NFB}~HK=0Ý15>3.&"5A_WL-uFQqKE,\[I?#!*q9B=65K mq)1Kp.F ]_2oԊJ‰:fNX$!-YӎogX!A @I8Z/ưđ&m!@SsyjmZs^w.$ NIÄ;qI %WꙘYd{XLĉ0i0 Fil_b]vEXaa23ELL,L}{ # ?'I VJ141 2bt33""0\2gz0<7 L|[6ڒu+va01& K?C`dy40䍺,7&pbSp`?/p}?{q7.a1pT82ꏧb˂xࡼI\C(L:K9Í#8 TJ11l('m1A(3mqAQ qpK2DÞC}#1i?-H_LFP7\'oe/_M\' v8Q8w?: ꒺z!5qK=QVD q`K//Ӷ;`.&ui,NQn“&y~9/hgG!I "cB8h˴tG%zL)3b#L(c 4޹0AxSWGG}_/ie_>]Frї@"nD>YL`1N/~N6%fx""qq 2Q%m|@A8NO/{W)'mOrBі:}ee??Cø?y7w-iܧL=.oxv:uXIySxV5c" f#9|Ciz䓹{}>ͼB,:e~5 ]gh LxL$Lxc[!&t 䬸'AJǀWA?dDŽ]W;ch 3aNJ 1h+"%vISTO 1v(>#7yg 2BLIZ)`y'&`)*G#B0NS0bHc`c?]Lzǰ&H\#A$q>$<;qĉwL/꒶H\ s80 Wk™1"<a :Hvu 1G~9Ң`arߍ9[R/i/àFb5O~ER<w#SNjRŋٍ/QgG0@1", iѾbT#Y Y o)x1SP T.ܳ=fxW?36 >(+^ig\@/)-AN$ `,Fapϋh{bJڴtK(g`^Wّ_O{$@ G ,{/Q<@]h_e# mBbSǔ G=4bkPmtk1VҎ)cE9"7}䏼Sh{0&n u!>33}2BN_i,nP\'K \p0at!̵p"%9b iˈc( Jm,J2׎uk,Pr(#uM ?=E? tNn l=}( L`"0$pec"c# M113hj'b?Lt L5l0X[LneaXBHrS?M8b+OXLVa䓎4(+4~0XM%#__'¯sùBA_&4aKy&|w=@ٳL\ _^#9u?DyQq(//qR4u\9N/J~V6k9PG}8 mgG\}A71E",TY?z1B?F$m5eȦ6ak[5";e~a AIߠ=7uD!' `de&.ܼ}()(-A_e1ws_/_;P 6 ,B 29P#?mazWƗ웙V{m("*lo|`K<Q_/!cReG}_sZ6l'#c啎YȤ-1Ǯrvc]JW幻6`3N,BDy'5)y]sT3J@F͎:+ {LL>q7H[ob .'rga)+\!}&QayULaԍ-]$v4c.},(-+ezm{: Pz}8}$ NT0߸|'):ٍM2-⦯Wpd9_);c?'oYKɤˮuE Wa3~Ǘ$1qi=a▨y9pTE&a_C=B ;gZؖq},Np]~]S,RX6J`^&mokOt㬀 ^./ YkYx]|h /%b{9" G9S"ςⓅîWZ,H8~K}v"[ H@D8O8<G9MUO[ǎ>sr|EV²x\$  H@O`/V$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@PXJM[N H@$  H@M"lX$  H@$*RӖS$  H@@(,h%  H@$  eԴ唀$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@PXJM[N H@$  H@M"lX$  H@$*RӖS$  H@@(,h%  H@$  eԴ唀$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@PXJM[N H@$  H@M"lX$  H@$*RӖS$  H@@(,h%  H@$  eԴ唀$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@hZN H`[^)Jmm1[$-,~@T.YDCu*`L<9,X0mf%  H@B@a*5m9%PCݟiӦ: wj5{6͟$  He (,[-xH,$  H@f1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@cQ3V)SɓիRٳc`` ng}6k/wqGľ[e\vڸ뮻2#<rUx'8b޼y$  H@$P²> {k68cڴieY~}x㍱t8s-DSO='tҨ[āpXAs . ,X=k֬)o___Nܵ_n)im%,|/Y{+,GU;z$  H@xm 6D#f̈!Do77n믿>}XbElذ!wӋ\cӦMloob8vd" y`7q=Üs9~x~[7EN:5ϟsOQ;Cwq[ dzCIJe J`.,ob2{!ą^Xw8. H@$ V%5ߪa<o{oGD7Kvwbw݅hzbͅ8O<!*}PG?m/S񙣵/R!s3g,E=8;Bg)eƍ?0cƌ#{;|p0"-d8qą~燽][(qt $  H@$0L@a9b||wIElX.bٲ.}6*1kVÌ".\Xo|1҇z(8co/M^)±!C^({4v=\qdt֬Y}Yd':xk_[JDUW]UAr4BDn _ҟ4iRq%\RH>_zWEZ) Sv)F|'hѢXn]!O=bQ#KJk.g H@$  28KcX!b"ohǶ{,7)~;'pBq"@"wn"96p}٧K?5\S<q@C<rd?y-o׿ɧ~ήܹsI;c~__yWR8R duQ^{m?8ڊFR'B1L>_!9jK="oG)_ܣNh o!/H@$  H`&OjuQFxGC9(De̛10]aIC%b 1CkW^ye!<>Pb×w+"Fy`W_]ۿ[!(O\3<3ou2n/yMa[8 .~@"Ge`]YdP""̑WHn/)NI' M3iZjmb7ͧ?EeWdiPh['|y7%  H@PX &w\bʿ_5$"I뀽k_ʉ'Gtu:SN9hVrED. \ Ov-dWw`gqF TX)ęFkCMܙ>K!C R"eG^^~({= C;uđksReXl5_] }ۧ䎈gV}+qJtLG}p/3;|ehc,оXyX<9]uA}e??avܹ79e+Hoۼs{^_rO^$  H@@@a <(E7wE Xj]Tz&*g;<a5w Hz{<0H(j:g.+Ip2-;<i?q!o`PgQ5,B'r7MG^,Y7pC"cW]uUaAo~ ?&kmvvAɐ;vbaXEG|lChtuRG5jJ㸶;eƫl3gNўio .?,q?oSB)zEX?*qgQ7Xw0uOf^Z^$  H@;B@a#^,#vE׈[of/~Ƌ"fl v8WqCa"xa.EF)B !.wUCXt.>Xx%~sD߯~°& v09ya'Qb: 3.dCp9w@09Ky",yc̿K>˜~j|jbqJW[}ꥈoSJ GOo i#7 E;+6 >$횣eG;f1ȑ\Wbq vEgsݓ\ƿ%  H@PX(&oΝ[<-oD,\/>cY;>P^*v`׉Q1idA8wGyNv1o{XƘE3˫^#øFH,!ʎ(:y% kCbا//9q#1I ?eG~a"rcw=CZ; uoDW"*?GWêqМ ,1P$]{őq:-?v>?le??rVX'ʟAQzY$  Nakb ~R'F* O. k0 IDAT%[{LX( w8,' !(M5TXv$s+K.-KSai<D?-r .(Ǯ7\" 캲QYD'B򰢃>8wv~x Of(/~Q0Woeї~`m1ϨƦu[mĪϬ8h>@h }ߑ袋9 -qxEc~N|Gȸ|$  H@#PXDgk0>فCadk;aqd|/##Rb"X1`᏿{&qOJOLD#y੗3 B` Br_(cu]G+CY~P]VCzƬ)[j?G=xx`ݭ@{s7bM{Q:: *x21;Ew삲ý ttjꀾB?I@$ fPX68"Ҹ? 1Ʊ9bEL}g}vBƲ 41/;5~4_u8jcwK/t|%fL<o/ }0Ph}{@|8tnG,"PluP Kϐ: #l]ӆy;qgaNa {qq[ $  H@  ˱8A`= Z1Uι"׿u!x*,Oa#ӈX*q<('3c$Gaya0sgC,"+8㵯}mi /08{i {aG[VadㇼGuI<1|WG?.9U+/n&.= 2;оʎM#QmSM9/qXs_3|$  H@@(,Evŋ!.$G>9=餓%(/brLKv8_!6eMGԤ<` "om]k^S[?Zx·.a]Mْ;GN\^+"F qr``0;:}JQ_ڸk`L61;}vő;s\6;eQU2’ s%GcpN$  4²Ydwc>v 1^j_ h_~A׾%kb"nFo:"8t>rcMa."I/O> trWO<u4!1bx#8)?~)3;BZ6aR.c̴E۩nEφp} Θ]iٚCh\/%,heGgᅾĩS~EZ,"R%  H@B +D8RHpetiN<VHM.JP,% b0޹F>9&(f<;1]GX6Dv^;<wb'${B{-lUϞꗶ=)?0ԆmGUbjX;)Nܒ"{{KX’pWb O&nNp % I8& H@v@kn qaOn#!Šص@Dq$1ϑu]Ch*;+ܷEcu'>'d'QSB8v#$?\q=82OܼɮcE1`>4KvQv8ˎq^&@9xq=qc}o[1?>tƔ9=?!~p9kN츽Ӟ~OOivBm{ӛR;N$  4"lDf^@8=<Ao!Q葎k9{DTÇW?*JXy$b"btH;rr<aF>8W!"w;c([pc7~JvHy,(W2Nc`:yxX3tGwųkz[wo1)LiVm/߲!ںDwWXOk=G*SO=.]Ps1Qo?'xb,yM$  )ܽ!0&Hdx= 9HeG0||Ǯc# ccv93)KNSQ/?ˀiS JvKqPvz٩E !vV)3;]@'VbCtUm'̈?<;Nٿgׯ'_쌽fcxPntM{K_(,m/.efaivi[N Rva+KK8ZhQ$  H`W (,w8 |׻w#1V/N N^> `^-CrX K~#((*i8ZOg::!Z^;r,GR. s`"FW\<H!0)3Gu{@%*{:n\ǙL-kz1n^23g̈-?r=턇<qFhIю;]:/K>_}ѵ’#fpwN$  4²ل_1LyH;kGGBk]%Nq}{*oA-w3rĕF>o/ipcY._!8\v4r|{gL<9_^ֶ8f܋}nDWWgC}#tY&,qʎ "d$߳ÑX<Q9. H@v@ZJ$Z=/TC Nʍaŵsfķ;_茩ӦGGн(m\Tem9DhH|E\8}$  H@u,z鼎/I@(pvs#K ;o3O7Ƈ:L3fLQTFLgGCiM#Wצ%$  &+A4$ ZD@`II1c׬1cZ!63΍8pu!yQ$  w,[-vԮ+Nk#"Mԡo'qawW`u<WopHTO'Ooo H@$ D@a9j˼J`F%jT5Wё-JwG%qGͫ>I9͆$  H@qҗ$P@Oވj l#너=rzWĔ^( H@$0U_V^uϼ H@$ &=Mk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V  ,]!n}X s/K`!PFtu!fi9v8xQf )$  H`O"PVwD{R,$0zոg~tW<bcEuـ:R~{MO^rb1۵, H@&Ha9+K`vg3_U Fפvd.ځQ}):۪ O\r|uMK@LrϬXK%Qxv~rO7ӦG[D%ٷs "*mm>iJtM߻XQՋ$  H@D#h5f~%0F6շ<w><&OmlaƎ@m1iڌxvmƞߘ$  H@8!'a6$Jw>BLνfA[{Gtuw=KVĚ=Jx%  H@n#mMX@_`<ºhoJ{*u#] /ƞ%c$  H`7PX&&+M`Zu6GV+XR_ 67-c$  H@r7@7I H@$  H@{TE$  H@n MR$  H@D@a'զe$  H@$(,wt$  H@$'PXIiY$  H@$   $%  H@$  I{RmZ H@$  H@@nH$% #PF `mV"CV-:ڢl"$  H(,[-^qiq!bٓ○{Rss@񾽌E:cygcђUq/Dwg{ H@$ $A`zv`5wzo?.tǪˊ9S⭧suon^G7IuHXGFwg[ߌ5vS_V H@$ (,GW@PΝUD։FT#=5>~aFZ7=.~qBr #iq>ㄅ}폮c5$  H@ (,:m V Jm@mRWO{BvvTbr+iy1oFp|Fs[]K|יsp {ևV~g4]$  0e WE@3 p-*mD$n*ѸB/{C}AQw,cYg?.8~~ TE{{mԑb; H@$zWXM'DW{{, yqмi'Wo+7`3"04P|}O<|}Lj/a@erRbp<<hڇkZ@_CQ$  H@-As< }_p6N|vm?^<{M^],9bmO͏^ӻ)Ŏй{O/z&~dM`<~xǙ 㶇WĔ-Br36E{?[&* H@%ܖW$ ]${bI͝Rʍ7]WI}'Voco0-'ￕ_ϬO-XD1ըT#f8V^p~qӊ0o:iXlC\g AW6K@$ L@a9kϼK`T<P<C_"|qۣ qSZ̘>3:J;CM+;XgF>0 >{}qOA=OYϟN }UeV$  H` (,w% `r57ڴy _RwЩE';d'q?ɝswH!$7ĕ?{(n^b̒zs߾+>;?5>{+Ni$  H@[/ H` ڶ>V:}RG{Ǹr]o?#1xvMO Fww6 sƟ\px\rE9fƭ ޓŪDLklqokW˿y㗋E'۟: H@$ QPX% !0^<$VSħ.:*GKxtד?>:+qo:&NX8-])v8zygO|KWw,Y!x|Uy^aN|θu( H@Z²E+bKߌ89CU"NX8sup6/]ڢ'HIM}۞,Dlj gE'SigSo㔃1گx%OL~I/+ip  H@Z²+"K8zYkG735i8ɍ[SfqFٴ8ʃ{*Qi:bRg[VcݦQyg%?ܺXeIo=6yn}|qSswǟ\td?"bw]ԯxxb"sw=jp  H@$= { H` F6oz} @=߻ci|wqYg_p<rcw'.w?:GW WJ%^A@(sý/#ϯ/@t妘:Gg{9(O/8*V9Z1>uᑱﬡʼq}/)j}okw?&V- *! H@$А²!v@G[%|bU\pxzxfx ]𼰦'g =9fM5{ Sdqׁ~GkE_@ح=]CF'뎝 N_~|v1ǖbg uvŪuE5l ' H@Z²jJ ^[\~Bsܸ*CS;┃qxi`tWE͍EJ"v1+UvE_^}o|qsySō}t<q[$  H@;K( T#AZS]O4W~rrW[IV6%;{1ؑql(ݯY=}+$  H@ c9zVƐs1 f1=;x~uBUZe'="^!:jv(3KHDɶW*qS~6Z/;}A`Fo,;$  H@'lIDAT=+}J@c@8~ZBDNDBF<†. D8{ˮecE&mm[N/<lV?er=m,D,39wF|}ϯ]WT<bc3a1g$  HlյV-$dIeGĖ\@5^>q{Wdu~!s]g-,Å{O+^spX;tuD''IϚOq86=k{_+Ϭ{hRđ(^:|n<sɪ   H@C@a@~- 8k\v]Hb⩫>И ?=>>qqi6ş2_><&>#⠽ŬE|7ŵw?Wxv"<h.Y!GI)d'>|Ƀѽe4]$  H>e}.^v/n+v5}u6v#+{?Ssxqsc֔a>'ŲkzXzS,_9x-o<+<?3jq|6ϊl鏇[W<]'pxt".Vx5gJ@$ "l궰xe wo:; v'xVv"{6-h<怙1kRg;gO\9~؊Woz,u恱fq/D(A}R771X1>wy'8;?.nz`yxL$  H`djzGD>74׾wߍI}ʌ>o::h+| i4Vv8y0O[ەUOY1H:䩲SoknukV[㸅CiF& H@vEX>,=BC|e=?,"_l;+&q"L:Sg H@$ m Է H@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X(=@[&wEZݭ%qS'uFgn $  H)pH%0 tu!ΈV't/?(f^$  !KhG澨ED[88{zǜivKLT$  4²t[@WG{;z6ވrlލbٓs)cI@$ q@@a9*,H`w7;ڢw-bvADq`KyTҳ#t%  H@@S TqzSS1r H`~*tݽQi&w/w҆{Ϛ䄸_@ ) H@&Ha9+I!a^>~uX kc HImq>3s[;3*3 $  H`PXN2$  H@+Eymf|I@$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'E8ϧٓ$  H@$ I`Һ^IENDB`
PNG  IHDRC IDATxweŝ,$ / @xI3c4;nLBњVLwK-0-p#;Ὡw=yu}MUoRɈsI<='όK)[sw.RJٺӜM( /!!!!!!!0/",^҆@@@@@@ y"a9O8B B B B B B 2c B B B B B B`DX$'/C B B B B B ",3B B B B B B @<Kˌy"a9O8B B B B B B 2c B B B B B B`,2O"{W{Z,Мkwy<e̙eV++\dpy>C7(,LYGw}wYxk=W^y^_<7,-\hz>^q +0[>`y뭷ꫯ^m-b@@@@@ *,k\r%eƌe6+g饗~B`uQec%N?Oƌ?I'?IenmҗKSN9=˲.;?;n{KYwu}or-^|+_)K-T^{(뭷^׾V\r@@@@@ 7*,r饗馛@9CYd ޿EYQ~ 6ؠ^#vZ/qy}yy_}յK/te󼭻[>lyꩧIXs9m-G_ho]yú?AI/b-'@@@@@@#0g]l$~BtﾭN-$aFlVe]v).h=/ D4=c eOyvm5p44X~֫OqN]u]unK{IT+&l.+w_;5p+[l1p,-?#kmtLx;;=8ʣ%Xց$y{}09!!!!!0t拰$;OV1C׿B+"f]wE,Q=X)7|><='PQX;NX]'nnKd ҚjX(+U*{m&Q3VP><yM6٤|߬Py{nATE5\Snƞeo\m^ۛozS_yUG’O.)UW]U5\eUVB$xx.=  (D6[[oMėg Bv-lQӟT=~w1T/'1j/>K!.r׸>؉Z*!GD<Z;~>A<XcZ B^yM%b}_~?!!!!!!LJp$*}c;f/.묳θ^VѶ]afzo~: Rz}N╴%GLp6<zx&_dJ̶zxTAA^7SnG}htLtEzĦ\ki3X>j]&̟&0ҳy<1vaOy 7PWb DZMW%\| m`M$,J^T=!Z =Wټ}ΛKX9gqwON;|#-:ݗ5VqMo݀ !>D9D];&^`paA믿z-F$Mկ~UtaU[ي#4-_|BS&,U7{g9gCLyUd?[9= ?≠3}B S<,_^%ohwyg.ۄ%ygV*4QB~p̫;7B\-]\b;ny: _ m V)K|6lSߡc,2m bճ_|NS", N;J‘@ y<>(rJHYu=K<^="Šq\}{QD+MfXH 5ORonX2ÛO$*=q>uHeHS~n=zJ~njaV_MʲN!~@@@@taSH=7y<a0C믿~}o$QwcOGJm}ml^Sl喫S]# 3jlĠg$M+L%<_I+j0!<(H?9B_bMGuT*kszT~> !!!!!!0 K!nxy ?*RnE!F=Cu&NJEʴXEwx D+blB(=bL-XM:ڪ27t*(ύSKm8ĥt!lrq f zՈۊ҈۞mtNMD{ջ?~@@@@@ /IVN!1{‚XUqCV'm iO?]EUM^!בfKl^r%>utSO=W|e2mE:^X'y#f_eʫ|!)sm!X&ܱҶr} ;ηZa4i#!0’( AE<K693&dڹzg+ɇ$&k#,lބ)fBN$oj,:s=UحjuʩWV9{U!mjvkgwږ4+qNicZWTejɳ r.,$Є9#J+4P;$f"Ĉ_U4yrme8lKۜx="G|M$([N7|6?{zʱRl %\/4˶ ',ŵhĩ",lC B B B B &&S gEXMf ~Xn y#m9:}[^MuO`ݼxA>ۚ9M= :){P~nq'>QY/m?=;6-OdW57Y-$껅B B B B B Bo²8[BB;T9Nl6ayO?o;u#Lu8[Z}s=1I"Ly1)Aybז+^sҍk*ߪ[ouڍ׿3ݘ@ K<{ggصnB@@@@@4$&3񱢫i$=by,y Mցxj8g7^;a'pP<^@BvN18(YKmZkjy]屴ZuWuαYڄD` &ܚ@y8uBi%齏oʖΫ+JqUu c=gI~dWt<f9^W^Vq|z_?0~@@@@pҴP6w]wۼnY]kV_}nOR}S@G 4&O&1צ܎'Ջ+oXAXŏZ}5}u,Vz߶-ؑ O<QV>!!!!!0滰E<{@!p&KgzKt)ë2nz'"s=W^Z'b7=+٭CT=#y)*, )~Vr;Nr!}^,ܣ΄'._{uu'?I}H]?kP= v1|<VBfv&#kĔ/W]uUD韼qSn rՇ9=']wݲ[eZ<hh#[}O<xhTG[) ksϫIv%!,S-,ⶺք}eGB@@@@@wae&*/xϬJYt! kN +޹ocNlAO ʳ(_=uiu f[H$r~ߘ-~dlZ!0= JkWlZ? s1 F[2'f.D%Hpn6uj-^-BH6z _B˶nʛnrPט:5xmB@@@@@waIP3OQwmՅw;=ǫ`"& 7ܰ<+;aI(O~'Z 1u衇ӳm=->jo~SFkhtLYĬi^r=ܳzr9LOz}-/wmi/>;c;z>I^^+ne'B B B B B`( 7a9!5ɓf 4<]D{0;⥻=أټx<C^}NUKm"fBym;ë<YgU.rWш )?KbײBʟkuwc:M$0߄xxB!`%޳D\Px*- .XcXYGPKD6kZik,YˣKoE$=,l[o]<_O۝Ѵp&>'|rwcPD'tRF{.'vi M wB@@@@@L)UM|L/R}$7(Xkyż.D:? HGDXU SY/p(g F Z2-UZ xVЖ8#2:RYO[&D{<m0+TKN|pM7-Kۭh孼{ ~aS]zzbi!!!!!A`J%ւXsXwKĵEv:"B3Vo̥g!Ͷx7W\qEs){Byr-BЇ!XAFP$8^E/뭷^=6'rv˶c=Vv1S}1S믿~6QN@@@@@TXFO}"%a3Z Lx㍫U4%3M'y7hY g:kxMEij,K\rLmSI[A[ʰD`P={w=YQт67/hqlVR:h-`~u]{S_q;Eտy%@@@@@hf\_JNRqkD@HlwGMg -/Xb#O4CW y" ߿7(nѧΣ=*_YqM1rxGǒGWsz<(~@@@@@ -\X- 65˳9f ,|i[ڮ(5B B B B B  S:vNDT SU!!!!! z\pژ@@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`DXC/!!!!!!0",na a9 6@@@@@B:B B B B B @0r!!!!!SH r &ic@@@@@L!)C B B B B B`,#ִ1B B B B B B` QyȌu 3FF"+,dr:<m &0cƌL$@@@@@@=sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@@eEvB B B B B B @PK@@@@@@ ˹4!!!!!!== sC-iB B B B B B z",{(!!!!!!07",Z҄@@@@@@DXPd'B B B B B B`nDX N@@@@@jI!!!!!!#aC!a97Ԓ&B B B B B BG ²";!!!!!!sC rn%M@@@@@@"LK###'(sOy饗6lS6xiYT*B B B B B`8 DXN~1cFӟT~ߖwy<Ss$,{rg7|s[޺eE2dd@@@@J *a2;Ƚe&}̙G~?tO?t9sˊ+Xx3[lfe嗯}W^ys}ݲꪫyg}v2V^yZ̯ꏡz-/݋/؋J+w0;!!!!!%r2믕_z)<Vf࿕;rBlw_Ko IDAT25l۫,6aI]tC.R^PP~VW|ﭷު,½vmUl;(<fgQۨ^gvm7nzN(믿>V[mUvuׁMou쮹暵ZkYƒ +-R:]vٲr>XӼ /Xce ?^Sme7[KQ^0ov*RLjvzF;,QhG;&q+\rtZj6/!!!!0 DXN'/ɧKYaRBn)QF3ˌ6+elE71x$2k"M~xˣgw-(w\5Z[s9Gʗ +?v?om[=]"__{FޟwU0%.vZ;{.W^ye9裫0k9B?i}VwilqW7H.iwફ*~xqgGO~Rnzk!z/V{ :ߵ:4n(;s?]\Kݪ<35]$ίYnzK:딏~Uwy5.?.+vXr-Ye?B B B >Pu9Rvج?Ws+#OU) _RV[mܒ kƮgkbːFaF1Xjplyxs ~umSMq Spl-4WJ ^㬾UIO/t5.š?lPob<s5<Ģq {X02|:~_2,fZ-CXwug߉Z.rGV;k׮S>e&Nоw}kA[yuQ$y6MY\#QkW#ObULyA;}/.n-rα",'RK֊ts{R]V-#[nqojn]1Aaz~F{3JSn`e2f-҄&V|x!ܦ̶ҿՠ_mf)[<^1B9?0f0Q;9 cڢ@ vc5}_rj1Z:u]Wyc}衇M7ݴF馛 o~sC^ƝLc=ꨣ*W_}}ULzzU$ a>W׃2Nb@AU#}3oʮvr/axwr!c*0!LڦNqƬ22uk7_p<mQ]=y]v٥+m[\Zi5#,Pk }e_/3:,fKY賟-e \67. kzB4c|a$|<],B|x΋o>G z^ξq@(i-8O0מ-cDZnaw}{#0HS]//08Yleo՗,!!ouh?݂]Yxm|JL~*xO}%82F:^诽޻>s%B ބO~=Q .ui+ݜqDqNZlM z{C˜UiƤ`ߘ&<]D2G>ƛ떸51.=oD]̄N",'7,s;bߖrf(2VM`hz,Q{ K^6“7+0V nPs|<Բ[-$5/$Cق+-Kĩ8</D<ZsLm?]\^Kv\bA>mu"u0a}<>_m/榲 X&k\OK_cGC+7D(@0NA@o'GwC }E0 tyAܨW&ouцrK<:G V1,Ѯ6~ZډlqLUbY0nyիM#oZ}Z!!! Mf-}ˌÏ,#'e)PFXu)b FF,4%ã&8s "Qİf8 ,p2y`e&0Z9<.3b4Gu5UR , &Z ?whb#|n_:SygJDnr;Zz&cc8S( (禃m7Kׄ(/5 ;b̹- |oSTo1ۇXuuu!ȟnӴ]:®"T9ztI:~I7qLmm.",''Z,_',կVf>dewf3 b!6W9C&"8YV5b7Wh`8^C()d~1☠mpP^L<i<Mhv)<Z y^ 6ub(@\~u5VΠ 걱Dc . }+AleKcߘʐke2w8+~ʕ_E[Sw=9z +J c \\kPB@@@LK>Xeu <2c&< (XD/D(L }`4C!|oږ!;Z0c CWki\^e [!Ny䫍<S[TA&qy\Hh[F'yJJkqa%tnq'ꎡ-kL6S8zsMGwNƴ1.>&B B B B`rcׇKX1ly,dBTy)<v)K ' i9ȫ5MhN3֥c4!PyƯxAS+QiaqbP|Z FT]þtDe<Dl+gVބ0Oe OX0s?_A-ܔ1XtcxЌtndyyٱŋɍװ*Xy\@@@8e0F`[#.1d*/xm`fD@{D7eon/_-Q*Hjà-k!M8Eɻ+*W"U\vhK- &m5 uG'Mc?8./VAӝ-B9Gp޵"V|-uqxJT*,ě۠7vkЭ,VmoZnzMن@@@$a9?iRchmBƴP+[M.s!>eK-Fތi*7Cv}syttF.>zy뮳dk'۳MӦ+cڊԙK4!)dP[yø 7\ڴƃӧtї僵isƍœPe42P7ױgs̞a$nu,m\+Ss-y׍'Z0xބ",A/0M5fQBϸ |Cqx Deqߚe,Pf[`z c4?[PiA˃cg"!ӄ/,Qڪ D6qxyoWGkSwĪ-#o}M74ei|Rq1ژ#c}ƢL^]4G|771`{=c}q >>sA8s rx\1hwo*$HkT3O@]/d7kA=ǫYSs͵70jSMxɼ&2 ]%qSaInɔ4J" Cy3yjG\A+/ixM__{P'-#TB%y|B<߯ăgшKe{*;SzuHkt .M2ۖqĆt^堮DE]Tֿm#Xy-qe2DrL<7@.CҦnKPoP%>OXׁ^#_"|9ӱ}vq:Fy0ozƸiۺdݸqx!ޤiyɵC^I{l۳n(+!B B B  CBMq#,oUAC1N0B4& n+ɿ</ #\ބgLJKDb><5& !oAՅ̧B}_P#uj( ~m|1?LanM=e]jgyf}ݫC;&Nµ^[n20ABl*9H\1264=k˕W^Yһ6]+Ę2x훨#<s]qU`L='fye56/A kAFW&v&^I!!!E rHe>*'W"1gdZTx,<#Akqxh_]%(1~}F3p2bRzi3֛XSq^xjMť?HGx.Qr衇DI/$^QB'4yaد?&fiɸtmz~V8&%;_)8cS{D"MTnֵ2P1u^V#8viuL|wYW?+z)_xᅵ u2=<v1:iHU%,15=((bG~r]!!!Ӆ`fnAΨxKx=h10}MXBt1ԃ<ZYDisNO1K2yzIVϴ7aў5 寮S.o)cxmuzf&_yuhr:/N: sym %̫תgo ?+X&?W~#|ן@t/7]cl Gu{Fcӿn(7Za '+TwyPʬJ#ڭ[w裏7Fc%..sLkm`Lj6fhF+C B B B`~_(`(2 H/#h,6@bT <C l}bW6ؾ Dhf-ChS[8'. 7oEQbx<lbMlS3GK 鶗$ l+B`z&'y&R>Į2y)[=[BUlAm pnƋ;oLk",?^!L߳POLmD!֕1yyHSMM9d2 O<Din4a8Zum,q2Zcg A5q8ѱcyv L4_i2ѴSoN0H!!!!0͇%"ݓ!T!n<H=tLuhuNilJ DX~}Pk<]Dd5BycxK'U5qv"$N@@@@122r})e6,1ͶX)BjVў+}΅@@@@@L:",'i2 "pÿ-9TmNcC B B B B B &@dL^!!!!!!0",LI3y@@@@@NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@NOC B B B B B`2 DXN&!!!!!CH r;=M$a94W@@@@@ !!49B B B B B &@dL^!!!!!!0",LI3y@@@@@Xdۜ&@ [o_~7(3g+B B B B K,QYf36?r  !022R^|c{, /<<yϗ{eV+,2r0B`A%+z UVY,b2S~A+B B B &Jw-fqD<.뮻n#,'J4B`$'^JwLsF"HB B B B  bU[єgy e饗n.0gS:Si+Q>C#M @FvkQ2-vW%l$ !#`}r\yS|",l0!!!!0 &,">4=-DX6نp鯋/x2,in@@@@@YJK.Y<w ]!#k;<C47B B B B`؋mJO7d.!4;B B B &HًB *9CF`!Ð@@@@A`,1r p9!!!!!!0>%F@@@@@",ǀS!!!!!!Qb@@@@@@A r 89!!!!!!0>r|F>hyʊ+X?/le=Se饗.-\ Tg/kFrՉW_}<e%(,LYy{'v8ovyJ+TgwV2F+;C B B B B`A$01~AlަGyzꩅ0vmqW]wU97ʆn8!W\QxQE?*֮Z/K-T!4 ;cLmjc=*c%_|+{_|KU\+_}gO~o*߄,K@@@@ )oYFx*3XQ^D:Zo*k>袋VtWo̙3gF<wܱw_/7xcg⌌ Ս6ڨjx{4=X%tӄ4c .u_l _ye vWϯ%RqqCw}T_vfӴ-۪ IDATGIlYYWfkO?5>ET *‰#⬾%\Na%TZS%֚ؔ7)Ѧ+U*\oFz !xg;c|婼8%XMy{’x6U'W[q_~*&_yGxz{+GȦ&@@@@@J rV.3Zw-?Vy2cKYr1hUW]Up<tUO |>*"O9O߾lϮHyIX7tS*_Pބ\<?p9s(T/qCm[R^TXM>w)Os=+bѴX]SxիīN<"τ#z:.7礪x AAq7c?*SܱO۾|ocnSmJ'!!!!0] DXNy2УJyRZjeGe@5 5quuוn lYy݌gA O<aA8\ zbO^Zdʭ@xwW^/(*Ok,/>*h[}ԗ ^ߵ_~S*> {y<ׂOiWN-]sFX1<놃k|3&/r7x& //}ceY]wݵg7N7]?i#h'5]36X7W<|Wױ-Qqyv7@@@t$a9zeKY~Ry'_^)?SKb*/ˀе^[;＞"F-cb?Cx6K K/z-=1UO#(Gh/D_l:een'!+_b䠃EXj!.ڦV6#< b>MϜKœQ`0va+_G>^!w]MsGq5l\{5Ծ7V {+?Ɔ oxWX7MXT&Px76 nחE,vqO9C B B > ",Q/j˲2 +-Re:dlM0͎`g23 .\$oޒ׭x)J$xe－$n ~4J)+PƷ/{i6lS>OZu<%>Zv!ҟqUd?!ө|bBݕ[T(!@vY|_ sF͋O>zy6dvX{ʏ~WW_| J7XQ #_;,[8c='mK.R9+7Jj̱xnr<Co:)இN8!c 2!!! ө,,\̑RVYUW=ƫtw<0liBStq nFn ߿TgM[yxrLPV뮻n5y S>JDQGUum-tEx>acDH򓟬O?zrMVB3G#<qx$o}[&C7Uþ0UZVD&qf>rMG ד1~!ԛ#Z76._ƽ袋M~hiO rus+JYx2?u7re̳JcR:WA+P<"]-Qnqy)o3b0$$/"1#^dhð7 չ3ve<'IHKTMldBhA$6F\oM%pMTτ9#`Cigͅڳn;Y[N7V5<}Ճ? ƺ%nFxcV[t%C=t n@@@t"a9zjTԓe~[Ys2+e'T[qC 2# ׶xEKL<S@m}9SB 4CBQqLƴ:s1Mt̳I5aQ]c^~'Fzꩺ/2 V~0'NA\⁐e]9hnB<O)MY X$G0-fOwW-R7[<E'<ʫj|zNn-ɠ|MϏZȸwsf==B B B B`Znݲe!"TX6ڲ մBb &Kx-3';s<y<<My&}7r/Sdǔ|74AxZmT|λx-(C} 1%XPr)a{z뭫U?uѼwœiMn)m8f< ֹη4uč }k%j:71xKUXyA 1 xvC(qa9N",So٦wΡd0lD o bp0o$&-yW3=/}h!,-ðƳ<U j"mW/qZy4 q,5TAEPKÃ{E4踶Uz% aηϴnb_ۖvکi M4򴛲-qe:4~n귛 6 Vަ[ huo;JR=я~WB@@@| >L-H]{D#3U@+ `ϱ 4ýg* tPyc&AƵlnƴD0s+ Ӟт"/h Db%|yZ^!<+h mg&kG$kRxwMusn(т8n J/UXYyRj,x~ִj>W3nݱ<^:i㫛xr>B B B  T޼: 3"8%L!mynߊ^%<քH'xм'5%оU2q j! 7#=BZyj _ ve<14HG͛)gxK8csM2Usg+eܴ 79 ٖ[n9;?y{`1`<[uXwa~ӟ-9:cmڸ8M`?B B B B`:N1u1ի9 ^he^ |yZ 8yr˶yZDeU5y<B3yh&ˇ)^CbbKJ8Zm{WyO_ORzNw'²b?>mb7x5Q&em?; ۹nF}ݶm}&WK/ cVY1ś+m͏6m'.qB B B B`:0Iu xe2Ʈ7&Cj+]{6<B]/Zq' </MGtǔ~6K*]W-Sאop0skkPWL>5 H -6!V>;&1>m<zjTq13Zcƃ^WfGۖ1׾*{I ɳ,i嚎D*8ѠƙkĸKSoSW;cسH ØMĝ~v2yyMxJb</'}aP7ڻ DZ$N8븼PK7$@9ABXuI"xN/w:ڴ/| %"|kmS&,[́vm71Kg,4&so'ai^n__1՟wcF955<'OZїM 7C B B B`:ν3u#LdGqg 8*"I-&> vءzxx.w}i"R姜3<kh@͠eODLK|B'k4!i%{zjy׺qZ{d0q<nn^?=7E<q3[}OpO{^ۮvSC >cd 6'{֘T_+vk v1~לEB B B BD [3f@eC9@l[ DxQSG7uִO_z5t"B ͋Gh~8`O?QyVl9餓곜#<V}B;/MM866<{k$,cܸqGGNa'5Ɖwj²{E:M76ac= lu8'|rbxҙ-nǵt~L r: Z xCT XI<C6<521Ga mMl""p}|H Zg\{O^*/ݠܖg=ZYV.C'9^]v٥׿SNc\ Vj5׏)̦NF0n*_y*qƓ(|7Uؼ袋d[dJ:k:8(AkLPIӃӟ<ƩA_|L r:֍0t] 靦{ER<ưwFnZ~yL H@/?7PO< zsΩ۶J˧mk $? <iMZ5 Jw|}Ջ{07Җ}Z?WP<SN6q3V d杷qfk ge㮰t_el.*FyLS4};FКz!!!&ޚ@]'^ihS A"Q<*{l5W9 a-.g1BS"}Hw}{QkBp'(i/>Ck=A" $zF+?|'xb\Zqմƺ@vS@M9֧-8om[v+~ksMnغ;?V03 U])dό:r_kεF\lijGpMn<DG=VUs.B B B ###חRvVJeB /mWLvġe =?ל#009ׄzSjhEWxP.n2XG>/&So7hƺ><Ǝh72<ޭole?B B B >pl3DKG x!²®y~ԽAM%HF`,aӭRX T&KK˃!!!6{֪7B B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSP@@@@@,",~MB B B B B B`oSPL?,H\j!!!!0̜9̘1~~ ?K,Dyw{7ۏHSC B B B &@37,.htDXvid? /\[n[o^{mZ@@@@ ~en]!"cjZ<套^֧!!!!sB|l76$e7DXvid?b-V^{:72 in@@@hysϕ|eV*+lg\_Ji39!0̕˓O>YŚ"B4F@@@8؊Xcꪫb_ߖ;!CVX,u:+Rfii@@@@;,LY~嫽=ݏ~ 1݁I9!nsB+qC B B B B B f#a9sB+qC B B B B B f#a9sB+qC`H Xf;wzzzw몶<[|/yuIcu^ƫU>Ljx7562/{\ZShgm/n~~_4!0]dUGLc: /}KԔK/QwCle--Xe2>"+E_wߕ;ＳeW%?6X{o]p}p@=M(k%(GqWC` w^O~x} z땥ZjBu]}9CG? -ӟw~\rѢy\>_}xˆn8uQ^r%UHG-Z>Oڪ?lz2<,r婧*7tSe]zr_uUATf#<2~J`vKN  k[moxB8 <Hs3O?oq< 'F[o]Ӌg{v4+OkQN8Z^ }c{<C[n)u :ub(3WoWǕ.n6W\QB_,m{9|gʃ>8(n4L6@ GcNĮ*U>r :f(K>ʚh`X,6C!yy0~qebݠ>Σ7mVgTwmk-n{zu{vM@1Zh}kGqmsh?s-_;0Vz5:z0{k^Rmgci:nfc1O<Qûﾻwqe5%V]'z'7pCvmWó>[W_]_ױ nJviu5G}t>W}۶뮻&,}QVU3,A7ʔ9ZjHE{c_gǍ!ɚA<Pvcލ}Qkdn_NO>Ye}6ƵqAqӴﯿWuoJ+4ۘmMcTiA{ j+Ӯq  o~O?.(]u6ڨDqqO r-`1$$# ftl3Fz~j wMH` ʧ?j`8-آn& F mP7O?]x1DYnlDՉ)f`j>˨k?\`gc<+~6)`$co0`bLӸ7.mnek2ˀZwuk}2q;blͪǪDk]Վw_^ k6Ѧ. cu1 IDATNjΫGx oyn(wq8RWߍ}ZMOhcqҦ{B3a>2ҵ)q溑76 /Ck͡6VeK71hq|vy|[K{k^zi9czhl3kBiAG擭zi~>K{l&m٦Q\0``z=@їnuDnƇ>p~oWP_\Inz6}_;}q}<{Z!y}^׷ߗAcL{_/hf0ov_\s~+'2^=&!}g<m,s ]tQnm믇T|)ݜu'e؉o=%In<3o1th~Wf[#a9uls|*֌/pjQ1V RҦ˿KҝV tW]4`|wWÁA`Tf D1Z>sNMcA"/ ?3gحJ<A{ce2cKƾ5u`dcϜ7Ny2/-ďzc9/s 0ʘ΃H2xzd`/dhJ-`b@}<,~SLAc{PR:tvcr a"?SD cI ZDzptLoԱ /ѮAP5^us-rJ'.4ϽMi6z)&@s|,{パ~ Z:cƏ0hA=1۠^]a醍>;tR}ݷCz1`3[ojsMnZI&2lck8Ėx82UWnH#uo֮S]^.ظ«~}P(IZwЍA\u~_'39oD뮻y}/,hkV7^D om^b~_m/nWd?M}Z2OכH}[7/u륿@_X9nm_m]aigi7pck7k_ׄ!a95\k|;.)ŝ_a(3}qDdj?jv'/F~Q<=G#Ç"1u?LqeD #8oD1^?wbܨcDc|-7*ĉNƙx&C0&By1S// OEeQv(϶/yuQ#8;[6ASsŇmd0ğ<LvƬ;8e&y`,xg0>7V Km#(T=ҩ;M7pԑW1o: "Iq;:"k(O߸9䘴>8UwVvél?5Ս=h 1#5c|]<nC?"_2%~_{fk Ђ,פ  {e9O8ks1}.:î~5/DQfmuK ~KSW7^ơ:c,+pA}L}!D!-N ^mocA7v-gng,٠*v=~(ß^uƠlpo|9[⹙oxA gx~ߍƎ!ƙ1#h߶Fa+cvh!0O]<?r.cI\To?G?tNn3QAp?Js7E?%y1ΔM!c Z-H/-4{E1f0!]Q A`zι/(4N6CXˇXj}%-!ͩZvcܟ~wǼ<u>8y 0vƫscո"xy#Z%ȍ1׽~pxl= o@=Z`3b[~v*YFe`c,)ϼ1'+Ƙ1[0qQy6a,bz }Wg:cH11}@p+H zsc&`)ˍ)J?51e\qڍ+7?\0pom%l 6ۊwkGOګګ}ݺt_W-Qz |AKM}OeG۵Q'/ҽ( &65lfuoBKow] e \G_z67TeNVxt}~p"²I0~+_]b8qwvujl]ƫX.c1m3~V(]vrDXNZ~& P< cgٵ;^?M=j\yMO`ZO?,\bD2[>#y3wWdc]coя~T~[ߪm<˱[nel_aLB#@iߎ1D׿S=CZݤOaX?b@BA93=!57’qF7o3Lbh1(1~OWX: hX}q6R3D@w쵼8ĉU[U`ey1VF^b Y|g L7~V\60ʛGr߅:|ꨜB9ƀ=ؾ033ޝwޙsg=w;Ύ2N`1 2`""P}Tj.ԭ(UW'Nz+GXH u1I8'}pƽ' Ga̋ヵuB+(펴/"lgבq|߲@}p <p8菊~8BW\q &y);5  bvUFA$"0:E 9v_S;vg8~)Njxw1^~Oۭ7!2r|F*߸Wzm2&^yE jX h.E~ͼYLㅐ>Ѯ+ s\~ĴB`1vrRkܮ]{v"mq^x1 " #6빫G>UYoFy|90Ҟynzga1Z}ˋFO1&8VB;Lid12(3)22YgD(  4?d0hq@daYD I {H¤CP~-D%GXƘ ~y'n& ;F?p0b$E11vU] 1O!-'QQZNXѺLBM#?7=^_䅧_˲7L1rk]=KQ+,0vb#,0`K]s@|R䝲M0D1DicMZG\hң묳* Ge|O=6D OS#As<RA.+C^0 Gҡy-uئ]!<m, zQf^<y$?oyC:b|E="Bzee^Ãe@GŔr9L9PN2evA˜>?EZ^&$M0@Xw|eO}Ý[ 0_O_btF uYM[8Kd`<֋#h 8.l|?2Ɛ:*@1q63/ҖY\ LhsS;A|R~<m:1NZ^`G\c-K2f2P3 s8׹'qGm_^\LgΧF/8xf9aXb7 I}bei4ʃw譜 DFF.;1~8ȠdǐIÌ8p1 gbh0h18,qb,€2ar?'~pCF*q;d4vp'\C1a׿^uILM&0 ;i&kl=/?1\Gj\^Pc f+&43FHԈc@~#}!FH2sy%tmK_RݸaZG(;d=ab #bNۦGrb_?FGxq#66ZGd .v i//G7"]=y`W##aKSUve1`16~10wﰡ}+F:,~f\ X= gq (8'~`Î)W_h(c2",9qa|SV0ռ(m3K'I>V[wKc7G9j q4wvo98xJJD#|PΧo"}# @?ퟶD1﹐K<jÂWF̕M8#]4$ 909u6SXҧ(7}=)N;1Ў@Ѷe9k5$0A B ڹd`T.  D1R'>"<2~&AȤdBL/$}D o:#}³Jt\uL6< 0:yω\p3!0yMĄx0ZXQEyHiT2{V1Hp+~!w]v(Hو A7ZGZ8)QXQύa2ca/@ c.3IAW)7\jR?3"O\O ae/R&ҥ/a(3ZGeYGN{+0J~XTJc/׾ꐾ6<87. ?<ȅ0i9Ч9 868@yh p̶w]` 1u&}8kcaBhes# )aEqʎ8^K/mrvqϴ2 )9"@Xb|ѧ(sWFm eu G,GBDs‹r"raxXo*qn4n,퇲u˸Qܜ2sz)l=^v'~f&=cQ~{z?m<P^W3ewSv#˜G8H8wi3䕾0S:Z.e#9nC 'x)12:&` b&%"+j 0I1619A; \#]_0C^P4E3`1bֺ\'^&/u&̈́GcTp_ #91HĆaq֮kc0`цn <*e# 娝a7w0%4W_|Fhy$ǤOa^ҧac„66G3z#8 >9R0Y);'aEXEi䥼;A|_nxAG=atyRr v9ZGaΪ>#Q3 !,VP78iOkm~Af~x賵&|ߝH5XD|:7he7d$GFzǑ.>Mq++̨kBž7c_?ʖF7q2+/!x0K:a<h/=NC-;BXxÜ1rwSؕ6/zaC惲V 4bL /C!hGgahr\ċ#8Ӷ@!/xq†PH9im 8F73O!h܋1a\;Zm OH6s4mJF N`=@oKh/pGnCߪWucO@a9LQ@ɀ bH_&= &&RvYdgb„A 9`\3XILL|' degR-3)ce",M;X"_g~ !$ϊ/`YF슣Gv0vx1abŖ!1k¤puYuXXa`2(' ++,6${a@`1@)/&Ҩc׊\64<:xoʎQ+3Ax҆1D1pp\I\/1yRo K:IgMH i9,_7q!a 1ZA'HNS'm5ix0.ƒKf?.66>\ÀGGGv[CE8&Ä!B B8De."e>vtX,b\g,alU_xJ7cCy|څFQo|?2rg_?eEʎ"Z|OџuqD=);GW>}Kxώ1 Ip, B GL\/>.;2e./,,1CHc1']ƛa/uI` 6 R!=EC$hd˶8]"|2W2[Q%ɋn l]}( L9^rN|; #3'#FC&vpLW&AD 99΋@0&b9\sMa$7Fy,)/t0ĉ+)ϔ/x0R?3‡'"$aW<g `=E Y'Ne1yb`2beYg]|/%_Ypn9'0DX!Ή^H|ca|`N~ӱB FQW/vX!$ˎ87 P\2\'mر1.rѦ1:(\k$,i'-aH¸e^y/_ 2FFs qw0Y?#n .;PA:eG\wϔN/m2Hy&ㆡO~h1,#y/Bz}Fg fɕepQ09M~ag|a<d=Kg|!˲1ҩFKɅ9er䟺'< hs< npFx’`~ȶIX#^xgq')GXFY˾HfLq,<`~oF' NRz2 KHNfzHe\0fYe"6b(/~8A]eaɘVvp%qY^* #;|ǸnE,q/pcQ2;v/Ljo2.#4 LlL 윤)0 Z(N#\g7рLC$ns~W?qSE䙉?LfL|&ċB~!1Il1"D&%EoA8&(7Cid00Ԉ q;`PˁɞUZB?!2[# '|X쌣<\rb`3DR~b7& IDAT=!%ċccr饗abp#;4O"o׈l l Iz<;N{fxY-;lꍝ-F)<18%<u 7bX;0y-!fvB|zX.` 9aoE(N=Ga"iH?^0YI4)A.iGM\/䇺]!wF=@8D_D{X48Y&i=O7_a+3&?){/āw>_^e5e`\A/Q^XgÑqėB/佶oRf›> i—uq90=5X\n߅-01j5d!M퍾OO|,Rwu2./xr,""5peU>{XF?gg8s&M[N))NN>-ʆЦ~}8΢){Dyi,8_RwRꝟf"0o} #Y'sǎc H```de`"(;&iy1/':^7I:C0qwّy!>r\(;~5 0&" ]ّbq+|18 /~|VeaŖy(C"Ǒ{^v|\1(G^1hR}D'6>Sv𨝘 Oa1@ͮMDa#{Ðf$Eav<p3'F'|802N4 $;겾G{)y:B4hg?6io) /j~=ޙμ.mF:I11h7/ ceL,z?9}9nmvA{ 3m.=e@pE;ݑ0E:X5/uSq.?p:m>wEr2N_BHUx~1N]QʒK͌}A҇+O Ja|aBqN댥;Z7NFB}~HK=0Ý15>3.&"5A_WL-uFQqKE,\[I?#!*q9B=65K mq)1Kp.F ]_2oԊJ‰:fNX$!-YӎogX!A @I8Z/ưđ&m!@SsyjmZs^w.$ NIÄ;qI %WꙘYd{XLĉ0i0 Fil_b]vEXaa23ELL,L}{ # ?'I VJ141 2bt33""0\2gz0<7 L|[6ڒu+va01& K?C`dy40䍺,7&pbSp`?/p}?{q7.a1pT82ꏧb˂xࡼI\C(L:K9Í#8 TJ11l('m1A(3mqAQ qpK2DÞC}#1i?-H_LFP7\'oe/_M\' v8Q8w?: ꒺z!5qK=QVD q`K//Ӷ;`.&ui,NQn“&y~9/hgG!I "cB8h˴tG%zL)3b#L(c 4޹0AxSWGG}_/ie_>]Frї@"nD>YL`1N/~N6%fx""qq 2Q%m|@A8NO/{W)'mOrBі:}ee??Cø?y7w-iܧL=.oxv:uXIySxV5c" f#9|Ciz䓹{}>ͼB,:e~5 ]gh LxL$Lxc[!&t 䬸'AJǀWA?dDŽ]W;ch 3aNJ 1h+"%vISTO 1v(>#7yg 2BLIZ)`y'&`)*G#B0NS0bHc`c?]Lzǰ&H\#A$q>$<;qĉwL/꒶H\ s80 Wk™1"<a :Hvu 1G~9Ң`arߍ9[R/i/àFb5O~ER<w#SNjRŋٍ/QgG0@1", iѾbT#Y Y o)x1SP T.ܳ=fxW?36 >(+^ig\@/)-AN$ `,Fapϋh{bJڴtK(g`^Wّ_O{$@ G ,{/Q<@]h_e# mBbSǔ G=4bkPmtk1VҎ)cE9"7}䏼Sh{0&n u!>33}2BN_i,nP\'K \p0at!̵p"%9b iˈc( Jm,J2׎uk,Pr(#uM ?=E? tNn l=}( L`"0$pec"c# M113hj'b?Lt L5l0X[LneaXBHrS?M8b+OXLVa䓎4(+4~0XM%#__'¯sùBA_&4aKy&|w=@ٳL\ _^#9u?DyQq(//qR4u\9N/J~V6k9PG}8 mgG\}A71E",TY?z1B?F$m5eȦ6ak[5";e~a AIߠ=7uD!' `de&.ܼ}()(-A_e1ws_/_;P 6 ,B 29P#?mazWƗ웙V{m("*lo|`K<Q_/!cReG}_sZ6l'#c啎YȤ-1Ǯrvc]JW幻6`3N,BDy'5)y]sT3J@F͎:+ {LL>q7H[ob .'rga)+\!}&QayULaԍ-]$v4c.},(-+ezm{: Pz}8}$ NT0߸|'):ٍM2-⦯Wpd9_);c?'oYKɤˮuE Wa3~Ǘ$1qi=a▨y9pTE&a_C=B ;gZؖq},Np]~]S,RX6J`^&mokOt㬀 ^./ YkYx]|h /%b{9" G9S"ςⓅîWZ,H8~K}v"[ H@D8O8<G9MUO[ǎ>sr|EV²x\$  H@O`/V$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@PXJM[N H@$  H@M"lX$  H@$*RӖS$  H@@(,h%  H@$  eԴ唀$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@PXJM[N H@$  H@M"lX$  H@$*RӖS$  H@@(,h%  H@$  eԴ唀$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@PXJM[N H@$  H@M"lX$  H@$*RӖS$  H@@(,h%  H@$  eԴ唀$  H@$$ &5Z H@$  H@B@a*5m9%  H@$  4²I`V$  H@@hZN H`[^)Jmm1[$-,~@T.YDCu*`L<9,X0mf%  H@B@a*5m9%PCݟiӦ: wj5{6͟$  He (,[-xH,$  H@f1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@ 1h$  H@Z²k߲K@$  H@cQ3V)SɓիRٳc`` ng}6k/wqGľ[e\vڸ뮻2#<rUx'8b޼y$  H@$P²> {k68cڴieY~}x㍱t8s-DSO='tҨ[āpXAs . ,X=k֬)o___Nܵ_n)im%,|/Y{+,GU;z$  H@xm 6D#f̈!Do77n믿>}XbElذ!wӋ\cӦMloob8vd" y`7q=Üs9~x~[7EN:5ϟsOQ;Cwq[ dzCIJe J`.,ob2{!ą^Xw8. H@$ V%5ߪa<o{oGD7Kvwbw݅hzbͅ8O<!*}PG?m/S񙣵/R!s3g,E=8;Bg)eƍ?0cƌ#{;|p0"-d8qą~燽][(qt $  H@$0L@a9b||wIElX.bٲ.}6*1kVÌ".\Xo|1҇z(8co/M^)±!C^({4v=\qdt֬Y}Yd':xk_[JDUW]UAr4BDn _ҟ4iRq%\RH>_zWEZ) Sv)F|'hѢXn]!O=bQ#KJk.g H@$  28KcX!b"ohǶ{,7)~;'pBq"@"wn"96p}٧K?5\S<q@C<rd?y-o׿ɧ~ήܹsI;c~__yWR8R duQ^{m?8ڊFR'B1L>_!9jK="oG)_ܣNh o!/H@$  H`&OjuQFxGC9(De̛10]aIC%b 1CkW^ye!<>Pb×w+"Fy`W_]ۿ[!(O\3<3ou2n/yMa[8 .~@"Ge`]YdP""̑WHn/)NI' M3iZjmb7ͧ?EeWdiPh['|y7%  H@PX &w\bʿ_5$"I뀽k_ʉ'Gtu:SN9hVrED. \ Ov-dWw`gqF TX)ęFkCMܙ>K!C R"eG^^~({= C;uđksReXl5_] }ۧ䎈gV}+qJtLG}p/3;|ehc,оXyX<9]uA}e??avܹ79e+Hoۼs{^_rO^$  H@@@a <(E7wE Xj]Tz&*g;<a5w Hz{<0H(j:g.+Ip2-;<i?q!o`PgQ5,B'r7MG^,Y7pC"cW]uUaAo~ ?&kmvvAɐ;vbaXEG|lChtuRG5jJ㸶;eƫl3gNўio .?,q?oSB)zEX?*qgQ7Xw0uOf^Z^$  H@;B@a#^,#vE׈[of/~Ƌ"fl v8WqCa"xa.EF)B !.wUCXt.>Xx%~sD߯~°& v09ya'Qb: 3.dCp9w@09Ky",yc̿K>˜~j|jbqJW[}ꥈoSJ GOo i#7 E;+6 >$횣eG;f1ȑ\Wbq vEgsݓ\ƿ%  H@PX(&oΝ[<-oD,\/>cY;>P^*v`׉Q1idA8wGyNv1o{XƘE3˫^#øFH,!ʎ(:y% kCbا//9q#1I ?eG~a"rcw=CZ; uoDW"*?GWêqМ ,1P$]{őq:-?v>?le??rVX'ʟAQzY$  Nakb ~R'F* O. k0 IDAT%[{LX( w8,' !(M5TXv$s+K.-KSai<D?-r .(Ǯ7\" 캲QYD'B򰢃>8wv~x Of(/~Q0Woeї~`m1ϨƦu[mĪϬ8h>@h }ߑ袋9 -qxEc~N|Gȸ|$  H@#PXDgk0>فCadk;aqd|/##Rb"X1`᏿{&qOJOLD#y੗3 B` Br_(cu]G+CY~P]VCzƬ)[j?G=xx`ݭ@{s7bM{Q:: *x21;Ew삲ý ttjꀾB?I@$ fPX68"Ҹ? 1Ʊ9bEL}g}vBƲ 41/;5~4_u8jcwK/t|%fL<o/ }0Ph}{@|8tnG,"PluP Kϐ: #l]ӆy;qgaNa {qq[ $  H@  ˱8A`= Z1Uι"׿u!x*,Oa#ӈX*q<('3c$Gaya0sgC,"+8㵯}mi /08{i {aG[VadㇼGuI<1|WG?.9U+/n&.= 2;оʎM#QmSM9/qXs_3|$  H@@(,Evŋ!.$G>9=餓%(/brLKv8_!6eMGԤ<` "om]k^S[?Zx·.a]Mْ;GN\^+"F qr``0;:}JQ_ڸk`L61;}vő;s\6;eQU2’ s%GcpN$  4²Ydwc>v 1^j_ h_~A׾%kb"nFo:"8t>rcMa."I/O> trWO<u4!1bx#8)?~)3;BZ6aR.c̴E۩nEφp} Θ]iٚCh\/%,heGgᅾĩS~EZ,"R%  H@B +D8RHpetiN<VHM.JP,% b0޹F>9&(f<;1]GX6Dv^;<wb'${B{-lUϞꗶ=)?0ԆmGUbjX;)Nܒ"{{KX’pWb O&nNp % I8& H@v@kn qaOn#!Šص@Dq$1ϑu]Ch*;+ܷEcu'>'d'QSB8v#$?\q=82OܼɮcE1`>4KvQv8ˎq^&@9xq=qc}o[1?>tƔ9=?!~p9kN츽Ӟ~OOivBm{ӛR;N$  4"lDf^@8=<Ao!Q葎k9{DTÇW?*JXy$b"btH;rr<aF>8W!"w;c([pc7~JvHy,(W2Nc`:yxX3tGwųkz[wo1)LiVm/߲!ںDwWXOk=G*SO=.]Ps1Qo?'xb,yM$  )ܽ!0&Hdx= 9HeG0||Ǯc# ccv93)KNSQ/?ˀiS JvKqPvz٩E !vV)3;]@'VbCtUm'̈?<;Nٿgׯ'_쌽fcxPntM{K_(,m/.efaivi[N Rva+KK8ZhQ$  H`W (,w8 |׻w#1V/N N^> `^-CrX K~#((*i8ZOg::!Z^;r,GR. s`"FW\<H!0)3Gu{@%*{:n\ǙL-kz1n^23g̈-?r=턇<qFhIю;]:/K>_}ѵ’#fpwN$  4²ل_1LyH;kGGBk]%Nq}{*oA-w3rĕF>o/ipcY._!8\v4r|{gL<9_^ֶ8f܋}nDWWgC}#tY&,qʎ "d$߳ÑX<Q9. H@v@ZJ$Z=/TC Nʍaŵsfķ;_茩ӦGGн(m\Tem9DhH|E\8}$  H@u,z鼎/I@(pvs#K ;o3O7Ƈ:L3fLQTFLgGCiM#Wצ%$  &+A4$ ZD@`II1c׬1cZ!63΍8pu!yQ$  w,[-vԮ+Nk#"Mԡo'qawW`u<WopHTO'Ooo H@$ D@a9j˼J`F%jT5Wё-JwG%qGͫ>I9͆$  H@qҗ$P@Oވj l#너=rzWĔ^( H@$0U_V^uϼ H@$ &=Mk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V lZ$  H@H@aDF- H@$  H(,[-$  H@$ &PX6QK@$  H@h Ve( H@$  HMk$  H@Z²j2J@$  H@h"e$  H@$ V  ,]!n}X s/K`!PFtu!fi9v8xQf )$  H`O"PVwD{R,$0zոg~tW<bcEuـ:R~{MO^rb1۵, H@&Ha9+K`vg3_U Fפvd.ځQ}):۪ O\r|uMK@LrϬXK%Qxv~rO7ӦG[D%ٷs "*mm>iJtM߻XQՋ$  H@D#h5f~%0F6շ<w><&OmlaƎ@m1iڌxvmƞߘ$  H@8!'a6$Jw>BLνfA[{Gtuw=KVĚ=Jx%  H@n#mMX@_`<ºhoJ{*u#] /ƞ%c$  H`7PX&&+M`Zu6GV+XR_ 67-c$  H@r7@7I H@$  H@{TE$  H@n MR$  H@D@a'զe$  H@$(,wt$  H@$'PXIiY$  H@$   $%  H@$  I{RmZ H@$  H@@nH$% #PF `mV"CV-:ڢl"$  H(,[-^qiq!bٓ○{Rss@񾽌E:cygcђUq/Dwg{ H@$ $A`zv`5wzo?.tǪˊ9S⭧suon^G7IuHXGFwg[ߌ5vS_V H@$ (,GW@PΝUD։FT#=5>~aFZ7=.~qBr #iq>ㄅ}폮c5$  H@ (,:m V Jm@mRWO{BvvTbr+iy1oFp|Fs[]K|יsp {ևV~g4]$  0e WE@3 p-*mD$n*ѸB/{C}AQw,cYg?.8~~ TE{{mԑb; H@$zWXM'DW{{, yqмi'Wo+7`3"04P|}O<|}Lj/a@erRbp<<hڇkZ@_CQ$  H@-As< }_p6N|vm?^<{M^],9bmO͏^ӻ)Ŏй{O/z&~dM`<~xǙ 㶇WĔ-Br36E{?[&* H@%ܖW$ ]${bI͝Rʍ7]WI}'Voco0-'ￕ_ϬO-XD1ըT#f8V^p~qӊ0o:iXlC\g AW6K@$ L@a9kϼK`T<P<C_"|qۣ qSZ̘>3:J;CM+;XgF>0 >{}qOA=OYϟN }UeV$  H` (,w% `r57ڴy _RwЩE';d'q?ɝswH!$7ĕ?{(n^b̒zs߾+>;?5>{+Ni$  H@[/ H` ڶ>V:}RG{Ǹr]o?#1xvMO Fww6 sƟ\px\rE9fƭ ޓŪDLklqokW˿y㗋E'۟: H@$ QPX% !0^<$VSħ.:*GKxtד?>:+qo:&NX8-])v8zygO|KWw,Y!x|Uy^aN|θu( H@Z²E+bKߌ89CU"NX8sup6/]ڢ'HIM}۞,Dlj gE'SigSo㔃1گx%OL~I/+ip  H@Z²+"K8zYkG735i8ɍ[SfqFٴ8ʃ{*Qi:bRg[VcݦQyg%?ܺXeIo=6yn}|qSswǟ\td?"bw]ԯxxb"sw=jp  H@$= { H` F6oz} @=߻ci|wqYg_p<rcw'.w?:GW WJ%^A@(sý/#ϯ/@t妘:Gg{9(O/8*V9Z1>uᑱﬡʼq}/)j}okw?&V- *! H@$А²!v@G[%|bU\pxzxfx ]𼰦'g =9fM5{ Sdqׁ~GkE_@ح=]CF'뎝 N_~|v1ǖbg uvŪuE5l ' H@Z²jJ ^[\~Bsܸ*CS;┃qxi`tWE͍EJ"v1+UvE_^}o|qsySō}t<q[$  H@;K( T#AZS]O4W~rrW[IV6%;{1ؑql(ݯY=}+$  H@ c9zVƐs1 f1=;x~uBUZe'="^!:jv(3KHDɶW*qS~6Z/;}A`Fo,;$  H@'lIDAT=+}J@c@8~ZBDNDBF<†. D8{ˮecE&mm[N/<lV?er=m,D,39wF|}ϯ]WT<bc3a1g$  HlյV-$dIeGĖ\@5^>q{Wdu~!s]g-,Å{O+^spX;tuD''IϚOq86=k{_+Ϭ{hRđ(^:|n<sɪ   H@C@a@~- 8k\v]Hb⩫>И ?=>>qqi6ş2_><&>#⠽ŬE|7ŵw?Wxv"<h.Y!GI)d'>|Ƀѽe4]$  H>e}.^v/n+v5}u6v#+{?Ssxqsc֔a>'ŲkzXzS,_9x-o<+<?3jq|6ϊl鏇[W<]'pxt".Vx5gJ@$ "l궰xe wo:; v'xVv"{6-h<怙1kRg;gO\9~؊Woz,u恱fq/D(A}R771X1>wy'8;?.nz`yxL$  H`djzGD>74׾wߍI}ʌ>o::h+| i4Vv8y0O[ەUOY1H:䩲SoknukV[㸅CiF& H@vEX>,=BC|e=?,"_l;+&q"L:Sg H@$ m Է H@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X( H@$  H@%-)I@$  H@@] ˺X(=@[&wEZݭ%qS'uFgn $  H)pH%0 tu!ΈV't/?(f^$  !KhG澨ED[88{zǜivKLT$  4²t[@WG{;z6ވrlލbٓs)cI@$ q@@a9*,H`w7;ڢw-bvADq`KyTҳ#t%  H@@S TqzSS1r H`~*tݽQi&w/w҆{Ϛ䄸_@ ) H@&Ha9+I!a^>~uX kc HImq>3s[;3*3 $  H`PXN2$  H@+Eymf|I@$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'd$  H@$  w ^CO$  H@8'E8ϧٓ$  H@$ I`Һ^IENDB`
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/spi/defaultImpl/RolePermissionServiceTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.defaultImpl; import com.ctrip.framework.apollo.common.entity.BaseEntity; import com.ctrip.framework.apollo.portal.AbstractIntegrationTest; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.Permission; import com.ctrip.framework.apollo.portal.entity.po.Role; import com.ctrip.framework.apollo.portal.entity.po.RolePermission; import com.ctrip.framework.apollo.portal.entity.po.UserRole; import com.ctrip.framework.apollo.portal.repository.PermissionRepository; import com.ctrip.framework.apollo.portal.repository.RolePermissionRepository; import com.ctrip.framework.apollo.portal.repository.RoleRepository; import com.ctrip.framework.apollo.portal.repository.UserRoleRepository; import com.ctrip.framework.apollo.portal.service.RolePermissionService; import com.google.common.collect.Sets; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.jdbc.Sql; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** * @author Jason Song(song_s@ctrip.com) */ public class RolePermissionServiceTest extends AbstractIntegrationTest { @Autowired private RolePermissionService rolePermissionService; @Autowired private RoleRepository roleRepository; @Autowired private RolePermissionRepository rolePermissionRepository; @Autowired private UserRoleRepository userRoleRepository; @Autowired private PermissionRepository permissionRepository; private String someCreatedBy; private String someLastModifiedBy; @Before public void setUp() throws Exception { someCreatedBy = "someCreatedBy"; someLastModifiedBy = "someLastModifiedBy"; } @Test @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermission() throws Exception { String someTargetId = "someTargetId"; String somePermissionType = "somePermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); Permission created = rolePermissionService.createPermission(somePermission); Permission createdFromDB = permissionRepository.findById(created.getId()).orElse(null); assertEquals(somePermissionType, createdFromDB.getPermissionType()); assertEquals(someTargetId, createdFromDB.getTargetId()); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermissionWithPermissionExisted() throws Exception { String someTargetId = "someTargetId"; String somePermissionType = "somePermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); rolePermissionService.createPermission(somePermission); } @Test @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermissions() throws Exception { String someTargetId = "someTargetId"; String anotherTargetId = "anotherTargetId"; String somePermissionType = "somePermissionType"; String anotherPermissionType = "anotherPermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); Permission anotherPermission = assemblePermission(anotherPermissionType, anotherTargetId); Set<Permission> created = rolePermissionService.createPermissions(Sets.newHashSet(somePermission, anotherPermission)); Set<Long> permissionIds = created.stream().map(BaseEntity::getId).collect(Collectors.toSet()); Iterable<Permission> permissionsFromDB = permissionRepository.findAllById(permissionIds); Set<String> targetIds = Sets.newHashSet(); Set<String> permissionTypes = Sets.newHashSet(); for (Permission permission : permissionsFromDB) { targetIds.add(permission.getTargetId()); permissionTypes.add(permission.getPermissionType()); } assertEquals(2, targetIds.size()); assertEquals(2, permissionTypes.size()); assertTrue(targetIds.containsAll(Sets.newHashSet(someTargetId, anotherTargetId))); assertTrue( permissionTypes.containsAll(Sets.newHashSet(somePermissionType, anotherPermissionType))); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermissionsWithPermissionsExisted() throws Exception { String someTargetId = "someTargetId"; String anotherTargetId = "anotherTargetId"; String somePermissionType = "somePermissionType"; String anotherPermissionType = "anotherPermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); Permission anotherPermission = assemblePermission(anotherPermissionType, anotherTargetId); rolePermissionService.createPermissions(Sets.newHashSet(somePermission, anotherPermission)); } @Test @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreateRoleWithPermissions() throws Exception { String someRoleName = "someRoleName"; Role role = assembleRole(someRoleName); Set<Long> permissionIds = Sets.newHashSet(990L, 991L); Role created = rolePermissionService.createRoleWithPermissions(role, permissionIds); Role createdFromDB = roleRepository.findById(created.getId()).orElse(null); List<RolePermission> rolePermissions = rolePermissionRepository.findByRoleIdIn(Sets.newHashSet(createdFromDB.getId())); Set<Long> rolePermissionIds = rolePermissions.stream().map(RolePermission::getPermissionId).collect(Collectors.toSet()); assertEquals(someRoleName, createdFromDB.getRoleName()); assertEquals(2, rolePermissionIds.size()); assertTrue(rolePermissionIds.containsAll(permissionIds)); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreateRoleWithPermissionsWithRoleExisted() throws Exception { String someRoleName = "someRoleName"; Role role = assembleRole(someRoleName); rolePermissionService.createRoleWithPermissions(role, null); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testAssignRoleToUsers() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String anotherUser = "anotherUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser, anotherUser); rolePermissionService .assignRoleToUsers(someRoleName, users, operator); List<UserRole> userRoles = userRoleRepository.findByRoleId(990); Set<String> usersWithRole = Sets.newHashSet(); for (UserRole userRole : userRoles) { assertEquals(operator, userRole.getDataChangeCreatedBy()); assertEquals(operator, userRole.getDataChangeLastModifiedBy()); usersWithRole.add(userRole.getUserId()); } assertEquals(2, usersWithRole.size()); assertTrue(usersWithRole.containsAll(users)); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testAssignRoleToUsersWithRoleNotExists() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser); rolePermissionService .assignRoleToUsers(someRoleName, users, operator); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testAssignRoleToUsersWithUserRolesExisted() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String anotherUser = "anotherUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser, anotherUser); rolePermissionService .assignRoleToUsers(someRoleName, users, operator); List<UserRole> userRoles = userRoleRepository.findByRoleId(990); Set<String> usersWithRole = Sets.newHashSet(); for (UserRole userRole : userRoles) { assertEquals("someOperator", userRole.getDataChangeCreatedBy()); assertEquals("someOperator", userRole.getDataChangeLastModifiedBy()); usersWithRole.add(userRole.getUserId()); } assertEquals(2, usersWithRole.size()); assertTrue(usersWithRole.containsAll(users)); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testRemoveRoleFromUsers() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String anotherUser = "anotherUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser, anotherUser); List<UserRole> userRoles = userRoleRepository.findByRoleId(990); assertFalse(userRoles.isEmpty()); rolePermissionService.removeRoleFromUsers(someRoleName, users, operator); List<UserRole> userRolesAfterRemoval = userRoleRepository.findByRoleId(990); assertTrue(userRolesAfterRemoval.isEmpty()); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testRemoveRoleFromUsersWithRoleNotExisted() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser); rolePermissionService.removeRoleFromUsers(someRoleName, users, operator); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testQueryUsersWithRole() throws Exception { String someRoleName = "someRoleName"; Set<UserInfo> users = rolePermissionService.queryUsersWithRole(someRoleName); Set<String> userIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet()); assertTrue(userIds.containsAll(Sets.newHashSet("someUser", "anotherUser"))); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-rolepermissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testUserHasPermission() throws Exception { String someTargetId = "someTargetId"; String anotherTargetId = "anotherTargetId"; String somePermissionType = "somePermissionType"; String anotherPermissionType = "anotherPermissionType"; String someUser = "someUser"; String anotherUser = "anotherUser"; String someUserWithNoPermission = "someUserWithNoPermission"; assertTrue(rolePermissionService.userHasPermission(someUser, somePermissionType, someTargetId)); assertTrue(rolePermissionService.userHasPermission(someUser, anotherPermissionType, anotherTargetId)); assertTrue(rolePermissionService.userHasPermission(anotherUser, somePermissionType, someTargetId)); assertTrue(rolePermissionService.userHasPermission(anotherUser, anotherPermissionType, anotherTargetId)); assertFalse(rolePermissionService.userHasPermission(someUserWithNoPermission, somePermissionType, someTargetId)); assertFalse(rolePermissionService.userHasPermission(someUserWithNoPermission, anotherPermissionType, anotherTargetId)); } private Role assembleRole(String roleName) { Role role = new Role(); role.setRoleName(roleName); role.setDataChangeCreatedBy(someCreatedBy); role.setDataChangeLastModifiedBy(someLastModifiedBy); return role; } private Permission assemblePermission(String permissionType, String targetId) { Permission permission = new Permission(); permission.setPermissionType(permissionType); permission.setTargetId(targetId); permission.setDataChangeCreatedBy(someCreatedBy); permission.setDataChangeLastModifiedBy(someCreatedBy); return permission; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.defaultImpl; import com.ctrip.framework.apollo.common.entity.BaseEntity; import com.ctrip.framework.apollo.portal.AbstractIntegrationTest; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.entity.po.Permission; import com.ctrip.framework.apollo.portal.entity.po.Role; import com.ctrip.framework.apollo.portal.entity.po.RolePermission; import com.ctrip.framework.apollo.portal.entity.po.UserRole; import com.ctrip.framework.apollo.portal.repository.PermissionRepository; import com.ctrip.framework.apollo.portal.repository.RolePermissionRepository; import com.ctrip.framework.apollo.portal.repository.RoleRepository; import com.ctrip.framework.apollo.portal.repository.UserRoleRepository; import com.ctrip.framework.apollo.portal.service.RolePermissionService; import com.google.common.collect.Sets; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.jdbc.Sql; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** * @author Jason Song(song_s@ctrip.com) */ public class RolePermissionServiceTest extends AbstractIntegrationTest { @Autowired private RolePermissionService rolePermissionService; @Autowired private RoleRepository roleRepository; @Autowired private RolePermissionRepository rolePermissionRepository; @Autowired private UserRoleRepository userRoleRepository; @Autowired private PermissionRepository permissionRepository; private String someCreatedBy; private String someLastModifiedBy; @Before public void setUp() throws Exception { someCreatedBy = "someCreatedBy"; someLastModifiedBy = "someLastModifiedBy"; } @Test @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermission() throws Exception { String someTargetId = "someTargetId"; String somePermissionType = "somePermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); Permission created = rolePermissionService.createPermission(somePermission); Permission createdFromDB = permissionRepository.findById(created.getId()).orElse(null); assertEquals(somePermissionType, createdFromDB.getPermissionType()); assertEquals(someTargetId, createdFromDB.getTargetId()); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermissionWithPermissionExisted() throws Exception { String someTargetId = "someTargetId"; String somePermissionType = "somePermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); rolePermissionService.createPermission(somePermission); } @Test @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermissions() throws Exception { String someTargetId = "someTargetId"; String anotherTargetId = "anotherTargetId"; String somePermissionType = "somePermissionType"; String anotherPermissionType = "anotherPermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); Permission anotherPermission = assemblePermission(anotherPermissionType, anotherTargetId); Set<Permission> created = rolePermissionService.createPermissions(Sets.newHashSet(somePermission, anotherPermission)); Set<Long> permissionIds = created.stream().map(BaseEntity::getId).collect(Collectors.toSet()); Iterable<Permission> permissionsFromDB = permissionRepository.findAllById(permissionIds); Set<String> targetIds = Sets.newHashSet(); Set<String> permissionTypes = Sets.newHashSet(); for (Permission permission : permissionsFromDB) { targetIds.add(permission.getTargetId()); permissionTypes.add(permission.getPermissionType()); } assertEquals(2, targetIds.size()); assertEquals(2, permissionTypes.size()); assertTrue(targetIds.containsAll(Sets.newHashSet(someTargetId, anotherTargetId))); assertTrue( permissionTypes.containsAll(Sets.newHashSet(somePermissionType, anotherPermissionType))); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreatePermissionsWithPermissionsExisted() throws Exception { String someTargetId = "someTargetId"; String anotherTargetId = "anotherTargetId"; String somePermissionType = "somePermissionType"; String anotherPermissionType = "anotherPermissionType"; Permission somePermission = assemblePermission(somePermissionType, someTargetId); Permission anotherPermission = assemblePermission(anotherPermissionType, anotherTargetId); rolePermissionService.createPermissions(Sets.newHashSet(somePermission, anotherPermission)); } @Test @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreateRoleWithPermissions() throws Exception { String someRoleName = "someRoleName"; Role role = assembleRole(someRoleName); Set<Long> permissionIds = Sets.newHashSet(990L, 991L); Role created = rolePermissionService.createRoleWithPermissions(role, permissionIds); Role createdFromDB = roleRepository.findById(created.getId()).orElse(null); List<RolePermission> rolePermissions = rolePermissionRepository.findByRoleIdIn(Sets.newHashSet(createdFromDB.getId())); Set<Long> rolePermissionIds = rolePermissions.stream().map(RolePermission::getPermissionId).collect(Collectors.toSet()); assertEquals(someRoleName, createdFromDB.getRoleName()); assertEquals(2, rolePermissionIds.size()); assertTrue(rolePermissionIds.containsAll(permissionIds)); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testCreateRoleWithPermissionsWithRoleExisted() throws Exception { String someRoleName = "someRoleName"; Role role = assembleRole(someRoleName); rolePermissionService.createRoleWithPermissions(role, null); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testAssignRoleToUsers() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String anotherUser = "anotherUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser, anotherUser); rolePermissionService .assignRoleToUsers(someRoleName, users, operator); List<UserRole> userRoles = userRoleRepository.findByRoleId(990); Set<String> usersWithRole = Sets.newHashSet(); for (UserRole userRole : userRoles) { assertEquals(operator, userRole.getDataChangeCreatedBy()); assertEquals(operator, userRole.getDataChangeLastModifiedBy()); usersWithRole.add(userRole.getUserId()); } assertEquals(2, usersWithRole.size()); assertTrue(usersWithRole.containsAll(users)); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testAssignRoleToUsersWithRoleNotExists() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser); rolePermissionService .assignRoleToUsers(someRoleName, users, operator); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testAssignRoleToUsersWithUserRolesExisted() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String anotherUser = "anotherUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser, anotherUser); rolePermissionService .assignRoleToUsers(someRoleName, users, operator); List<UserRole> userRoles = userRoleRepository.findByRoleId(990); Set<String> usersWithRole = Sets.newHashSet(); for (UserRole userRole : userRoles) { assertEquals("someOperator", userRole.getDataChangeCreatedBy()); assertEquals("someOperator", userRole.getDataChangeLastModifiedBy()); usersWithRole.add(userRole.getUserId()); } assertEquals(2, usersWithRole.size()); assertTrue(usersWithRole.containsAll(users)); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testRemoveRoleFromUsers() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String anotherUser = "anotherUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser, anotherUser); List<UserRole> userRoles = userRoleRepository.findByRoleId(990); assertFalse(userRoles.isEmpty()); rolePermissionService.removeRoleFromUsers(someRoleName, users, operator); List<UserRole> userRolesAfterRemoval = userRoleRepository.findByRoleId(990); assertTrue(userRolesAfterRemoval.isEmpty()); } @Test(expected = IllegalStateException.class) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testRemoveRoleFromUsersWithRoleNotExisted() throws Exception { String someRoleName = "someRoleName"; String someUser = "someUser"; String operator = "operator"; Set<String> users = Sets.newHashSet(someUser); rolePermissionService.removeRoleFromUsers(someRoleName, users, operator); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testQueryUsersWithRole() throws Exception { String someRoleName = "someRoleName"; Set<UserInfo> users = rolePermissionService.queryUsersWithRole(someRoleName); Set<String> userIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet()); assertTrue(userIds.containsAll(Sets.newHashSet("someUser", "anotherUser"))); } @Test @Sql(scripts = "/sql/permission/insert-test-roles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-permissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/permission/insert-test-rolepermissions.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testUserHasPermission() throws Exception { String someTargetId = "someTargetId"; String anotherTargetId = "anotherTargetId"; String somePermissionType = "somePermissionType"; String anotherPermissionType = "anotherPermissionType"; String someUser = "someUser"; String anotherUser = "anotherUser"; String someUserWithNoPermission = "someUserWithNoPermission"; assertTrue(rolePermissionService.userHasPermission(someUser, somePermissionType, someTargetId)); assertTrue(rolePermissionService.userHasPermission(someUser, anotherPermissionType, anotherTargetId)); assertTrue(rolePermissionService.userHasPermission(anotherUser, somePermissionType, someTargetId)); assertTrue(rolePermissionService.userHasPermission(anotherUser, anotherPermissionType, anotherTargetId)); assertFalse(rolePermissionService.userHasPermission(someUserWithNoPermission, somePermissionType, someTargetId)); assertFalse(rolePermissionService.userHasPermission(someUserWithNoPermission, anotherPermissionType, anotherTargetId)); } private Role assembleRole(String roleName) { Role role = new Role(); role.setRoleName(roleName); role.setDataChangeCreatedBy(someCreatedBy); role.setDataChangeLastModifiedBy(someLastModifiedBy); return role; } private Permission assemblePermission(String permissionType, String targetId) { Permission permission = new Permission(); permission.setPermissionType(permissionType); permission.setTargetId(targetId); permission.setDataChangeCreatedBy(someCreatedBy); permission.setDataChangeLastModifiedBy(someCreatedBy); return permission; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.defaultimpl; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.spi.UserService; import java.util.Arrays; import java.util.Collections; import java.util.List; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultUserService implements UserService { @Override public List<UserInfo> searchUsers(String keyword, int offset, int limit) { return Collections.singletonList(assembleDefaultUser()); } @Override public UserInfo findByUserId(String userId) { if (userId.equals("apollo")) { return assembleDefaultUser(); } return null; } @Override public List<UserInfo> findByUserIds(List<String> userIds) { if (userIds.contains("apollo")) { return Lists.newArrayList(assembleDefaultUser()); } return null; } private UserInfo assembleDefaultUser() { UserInfo defaultUser = new UserInfo(); defaultUser.setUserId("apollo"); defaultUser.setName("apollo"); defaultUser.setEmail("apollo@acme.com"); return defaultUser; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.defaultimpl; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.portal.entity.bo.UserInfo; import com.ctrip.framework.apollo.portal.spi.UserService; import java.util.Arrays; import java.util.Collections; import java.util.List; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultUserService implements UserService { @Override public List<UserInfo> searchUsers(String keyword, int offset, int limit) { return Collections.singletonList(assembleDefaultUser()); } @Override public UserInfo findByUserId(String userId) { if (userId.equals("apollo")) { return assembleDefaultUser(); } return null; } @Override public List<UserInfo> findByUserIds(List<String> userIds) { if (userIds.contains("apollo")) { return Lists.newArrayList(assembleDefaultUser()); } return null; } private UserInfo assembleDefaultUser() { UserInfo defaultUser = new UserInfo(); defaultUser.setUserId("apollo"); defaultUser.setName("apollo"); defaultUser.setEmail("apollo@acme.com"); return defaultUser; } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/bootstrap/css/bootstrap.min.css
/*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! * Generated using the Bootstrap Customizer (http://v3.bootcss.com/customize/?id=822d18dc2e4e823a577b) * Config saved to config.json and https://gist.github.com/822d18dc2e4e823a577b *//*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100% } body { margin: 0 } article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block } audio, canvas, progress, video { display: inline-block; vertical-align: baseline } audio:not([controls]) { display: none; height: 0 } [hidden], template { display: none } a { background-color: transparent } a:active, a:hover { outline: 0 } abbr[title] { border-bottom: 1px dotted } b, strong { font-weight: bold } dfn { font-style: italic } h1 { font-size: 2em; margin: 0.67em 0 } mark { background: #ff0; color: #000 } small { font-size: 80% } sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline } sup { top: -0.5em } sub { bottom: -0.25em } img { border: 0 } svg:not(:root) { overflow: hidden } figure { margin: 1em 40px } hr { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; height: 0 } pre { overflow: auto } code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em } button, input, optgroup, select, textarea { color: inherit; font: inherit; margin: 0 } button { overflow: visible } button, select { text-transform: none } button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; cursor: pointer } button[disabled], html input[disabled] { cursor: default } button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0 } input { line-height: normal } input[type="checkbox"], input[type="radio"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; padding: 0 } input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto } input[type="search"] { -webkit-appearance: textfield; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none } fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em } legend { border: 0; padding: 0 } textarea { overflow: auto } optgroup { font-weight: bold } table { border-collapse: collapse; border-spacing: 0 } td, th { padding: 0 } /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { *, *:before, *:after { background: transparent !important; color: #000 !important; -webkit-box-shadow: none !important; box-shadow: none !important; text-shadow: none !important } a, a:visited { text-decoration: underline } a[href]:after { content: " (" attr(href) ")" } abbr[title]:after { content: " (" attr(title) ")" } a[href^="#"]:after, a[href^="javascript:"]:after { content: "" } pre, blockquote { border: 1px solid #999; page-break-inside: avoid } thead { display: table-header-group } tr, img { page-break-inside: avoid } img { max-width: 100% !important } p, h2, h3 { orphans: 3; widows: 3 } h2, h3 { page-break-after: avoid } .navbar { display: none } .btn > .caret, .dropup > .btn > .caret { border-top-color: #000 !important } .label { border: 1px solid #000 } .table { border-collapse: collapse !important } .table td, .table th { background-color: #fff !important } .table-bordered th, .table-bordered td { border: 1px solid #ddd !important } } @font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg') } .glyphicon { position: relative; top: 1px; display: inline-block; font-family: 'Glyphicons Halflings'; font-style: normal; font-weight: normal; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale } .glyphicon-asterisk:before { content: "\2a" } .glyphicon-plus:before { content: "\2b" } .glyphicon-euro:before, .glyphicon-eur:before { content: "\20ac" } .glyphicon-minus:before { content: "\2212" } .glyphicon-cloud:before { content: "\2601" } .glyphicon-envelope:before { content: "\2709" } .glyphicon-pencil:before { content: "\270f" } .glyphicon-glass:before { content: "\e001" } .glyphicon-music:before { content: "\e002" } .glyphicon-search:before { content: "\e003" } .glyphicon-heart:before { content: "\e005" } .glyphicon-star:before { content: "\e006" } .glyphicon-star-empty:before { content: "\e007" } .glyphicon-user:before { content: "\e008" } .glyphicon-film:before { content: "\e009" } .glyphicon-th-large:before { content: "\e010" } .glyphicon-th:before { content: "\e011" } .glyphicon-th-list:before { content: "\e012" } .glyphicon-ok:before { content: "\e013" } .glyphicon-remove:before { content: "\e014" } .glyphicon-zoom-in:before { content: "\e015" } .glyphicon-zoom-out:before { content: "\e016" } .glyphicon-off:before { content: "\e017" } .glyphicon-signal:before { content: "\e018" } .glyphicon-cog:before { content: "\e019" } .glyphicon-trash:before { content: "\e020" } .glyphicon-home:before { content: "\e021" } .glyphicon-file:before { content: "\e022" } .glyphicon-time:before { content: "\e023" } .glyphicon-road:before { content: "\e024" } .glyphicon-download-alt:before { content: "\e025" } .glyphicon-download:before { content: "\e026" } .glyphicon-upload:before { content: "\e027" } .glyphicon-inbox:before { content: "\e028" } .glyphicon-play-circle:before { content: "\e029" } .glyphicon-repeat:before { content: "\e030" } .glyphicon-refresh:before { content: "\e031" } .glyphicon-list-alt:before { content: "\e032" } .glyphicon-lock:before { content: "\e033" } .glyphicon-flag:before { content: "\e034" } .glyphicon-headphones:before { content: "\e035" } .glyphicon-volume-off:before { content: "\e036" } .glyphicon-volume-down:before { content: "\e037" } .glyphicon-volume-up:before { content: "\e038" } .glyphicon-qrcode:before { content: "\e039" } .glyphicon-barcode:before { content: "\e040" } .glyphicon-tag:before { content: "\e041" } .glyphicon-tags:before { content: "\e042" } .glyphicon-book:before { content: "\e043" } .glyphicon-bookmark:before { content: "\e044" } .glyphicon-print:before { content: "\e045" } .glyphicon-camera:before { content: "\e046" } .glyphicon-font:before { content: "\e047" } .glyphicon-bold:before { content: "\e048" } .glyphicon-italic:before { content: "\e049" } .glyphicon-text-height:before { content: "\e050" } .glyphicon-text-width:before { content: "\e051" } .glyphicon-align-left:before { content: "\e052" } .glyphicon-align-center:before { content: "\e053" } .glyphicon-align-right:before { content: "\e054" } .glyphicon-align-justify:before { content: "\e055" } .glyphicon-list:before { content: "\e056" } .glyphicon-indent-left:before { content: "\e057" } .glyphicon-indent-right:before { content: "\e058" } .glyphicon-facetime-video:before { content: "\e059" } .glyphicon-picture:before { content: "\e060" } .glyphicon-map-marker:before { content: "\e062" } .glyphicon-adjust:before { content: "\e063" } .glyphicon-tint:before { content: "\e064" } .glyphicon-edit:before { content: "\e065" } .glyphicon-share:before { content: "\e066" } .glyphicon-check:before { content: "\e067" } .glyphicon-move:before { content: "\e068" } .glyphicon-step-backward:before { content: "\e069" } .glyphicon-fast-backward:before { content: "\e070" } .glyphicon-backward:before { content: "\e071" } .glyphicon-play:before { content: "\e072" } .glyphicon-pause:before { content: "\e073" } .glyphicon-stop:before { content: "\e074" } .glyphicon-forward:before { content: "\e075" } .glyphicon-fast-forward:before { content: "\e076" } .glyphicon-step-forward:before { content: "\e077" } .glyphicon-eject:before { content: "\e078" } .glyphicon-chevron-left:before { content: "\e079" } .glyphicon-chevron-right:before { content: "\e080" } .glyphicon-plus-sign:before { content: "\e081" } .glyphicon-minus-sign:before { content: "\e082" } .glyphicon-remove-sign:before { content: "\e083" } .glyphicon-ok-sign:before { content: "\e084" } .glyphicon-question-sign:before { content: "\e085" } .glyphicon-info-sign:before { content: "\e086" } .glyphicon-screenshot:before { content: "\e087" } .glyphicon-remove-circle:before { content: "\e088" } .glyphicon-ok-circle:before { content: "\e089" } .glyphicon-ban-circle:before { content: "\e090" } .glyphicon-arrow-left:before { content: "\e091" } .glyphicon-arrow-right:before { content: "\e092" } .glyphicon-arrow-up:before { content: "\e093" } .glyphicon-arrow-down:before { content: "\e094" } .glyphicon-share-alt:before { content: "\e095" } .glyphicon-resize-full:before { content: "\e096" } .glyphicon-resize-small:before { content: "\e097" } .glyphicon-exclamation-sign:before { content: "\e101" } .glyphicon-gift:before { content: "\e102" } .glyphicon-leaf:before { content: "\e103" } .glyphicon-fire:before { content: "\e104" } .glyphicon-eye-open:before { content: "\e105" } .glyphicon-eye-close:before { content: "\e106" } .glyphicon-warning-sign:before { content: "\e107" } .glyphicon-plane:before { content: "\e108" } .glyphicon-calendar:before { content: "\e109" } .glyphicon-random:before { content: "\e110" } .glyphicon-comment:before { content: "\e111" } .glyphicon-magnet:before { content: "\e112" } .glyphicon-chevron-up:before { content: "\e113" } .glyphicon-chevron-down:before { content: "\e114" } .glyphicon-retweet:before { content: "\e115" } .glyphicon-shopping-cart:before { content: "\e116" } .glyphicon-folder-close:before { content: "\e117" } .glyphicon-folder-open:before { content: "\e118" } .glyphicon-resize-vertical:before { content: "\e119" } .glyphicon-resize-horizontal:before { content: "\e120" } .glyphicon-hdd:before { content: "\e121" } .glyphicon-bullhorn:before { content: "\e122" } .glyphicon-bell:before { content: "\e123" } .glyphicon-certificate:before { content: "\e124" } .glyphicon-thumbs-up:before { content: "\e125" } .glyphicon-thumbs-down:before { content: "\e126" } .glyphicon-hand-right:before { content: "\e127" } .glyphicon-hand-left:before { content: "\e128" } .glyphicon-hand-up:before { content: "\e129" } .glyphicon-hand-down:before { content: "\e130" } .glyphicon-circle-arrow-right:before { content: "\e131" } .glyphicon-circle-arrow-left:before { content: "\e132" } .glyphicon-circle-arrow-up:before { content: "\e133" } .glyphicon-circle-arrow-down:before { content: "\e134" } .glyphicon-globe:before { content: "\e135" } .glyphicon-wrench:before { content: "\e136" } .glyphicon-tasks:before { content: "\e137" } .glyphicon-filter:before { content: "\e138" } .glyphicon-briefcase:before { content: "\e139" } .glyphicon-fullscreen:before { content: "\e140" } .glyphicon-dashboard:before { content: "\e141" } .glyphicon-paperclip:before { content: "\e142" } .glyphicon-heart-empty:before { content: "\e143" } .glyphicon-link:before { content: "\e144" } .glyphicon-phone:before { content: "\e145" } .glyphicon-pushpin:before { content: "\e146" } .glyphicon-usd:before { content: "\e148" } .glyphicon-gbp:before { content: "\e149" } .glyphicon-sort:before { content: "\e150" } .glyphicon-sort-by-alphabet:before { content: "\e151" } .glyphicon-sort-by-alphabet-alt:before { content: "\e152" } .glyphicon-sort-by-order:before { content: "\e153" } .glyphicon-sort-by-order-alt:before { content: "\e154" } .glyphicon-sort-by-attributes:before { content: "\e155" } .glyphicon-sort-by-attributes-alt:before { content: "\e156" } .glyphicon-unchecked:before { content: "\e157" } .glyphicon-expand:before { content: "\e158" } .glyphicon-collapse-down:before { content: "\e159" } .glyphicon-collapse-up:before { content: "\e160" } .glyphicon-log-in:before { content: "\e161" } .glyphicon-flash:before { content: "\e162" } .glyphicon-log-out:before { content: "\e163" } .glyphicon-new-window:before { content: "\e164" } .glyphicon-record:before { content: "\e165" } .glyphicon-save:before { content: "\e166" } .glyphicon-open:before { content: "\e167" } .glyphicon-saved:before { content: "\e168" } .glyphicon-import:before { content: "\e169" } .glyphicon-export:before { content: "\e170" } .glyphicon-send:before { content: "\e171" } .glyphicon-floppy-disk:before { content: "\e172" } .glyphicon-floppy-saved:before { content: "\e173" } .glyphicon-floppy-remove:before { content: "\e174" } .glyphicon-floppy-save:before { content: "\e175" } .glyphicon-floppy-open:before { content: "\e176" } .glyphicon-credit-card:before { content: "\e177" } .glyphicon-transfer:before { content: "\e178" } .glyphicon-cutlery:before { content: "\e179" } .glyphicon-header:before { content: "\e180" } .glyphicon-compressed:before { content: "\e181" } .glyphicon-earphone:before { content: "\e182" } .glyphicon-phone-alt:before { content: "\e183" } .glyphicon-tower:before { content: "\e184" } .glyphicon-stats:before { content: "\e185" } .glyphicon-sd-video:before { content: "\e186" } .glyphicon-hd-video:before { content: "\e187" } .glyphicon-subtitles:before { content: "\e188" } .glyphicon-sound-stereo:before { content: "\e189" } .glyphicon-sound-dolby:before { content: "\e190" } .glyphicon-sound-5-1:before { content: "\e191" } .glyphicon-sound-6-1:before { content: "\e192" } .glyphicon-sound-7-1:before { content: "\e193" } .glyphicon-copyright-mark:before { content: "\e194" } .glyphicon-registration-mark:before { content: "\e195" } .glyphicon-cloud-download:before { content: "\e197" } .glyphicon-cloud-upload:before { content: "\e198" } .glyphicon-tree-conifer:before { content: "\e199" } .glyphicon-tree-deciduous:before { content: "\e200" } .glyphicon-cd:before { content: "\e201" } .glyphicon-save-file:before { content: "\e202" } .glyphicon-open-file:before { content: "\e203" } .glyphicon-level-up:before { content: "\e204" } .glyphicon-copy:before { content: "\e205" } .glyphicon-paste:before { content: "\e206" } .glyphicon-alert:before { content: "\e209" } .glyphicon-equalizer:before { content: "\e210" } .glyphicon-king:before { content: "\e211" } .glyphicon-queen:before { content: "\e212" } .glyphicon-pawn:before { content: "\e213" } .glyphicon-bishop:before { content: "\e214" } .glyphicon-knight:before { content: "\e215" } .glyphicon-baby-formula:before { content: "\e216" } .glyphicon-tent:before { content: "\26fa" } .glyphicon-blackboard:before { content: "\e218" } .glyphicon-bed:before { content: "\e219" } .glyphicon-apple:before { content: "\f8ff" } .glyphicon-erase:before { content: "\e221" } .glyphicon-hourglass:before { content: "\231b" } .glyphicon-lamp:before { content: "\e223" } .glyphicon-duplicate:before { content: "\e224" } .glyphicon-piggy-bank:before { content: "\e225" } .glyphicon-scissors:before { content: "\e226" } .glyphicon-bitcoin:before { content: "\e227" } .glyphicon-btc:before { content: "\e227" } .glyphicon-xbt:before { content: "\e227" } .glyphicon-yen:before { content: "\00a5" } .glyphicon-jpy:before { content: "\00a5" } .glyphicon-ruble:before { content: "\20bd" } .glyphicon-rub:before { content: "\20bd" } .glyphicon-scale:before { content: "\e230" } .glyphicon-ice-lolly:before { content: "\e231" } .glyphicon-ice-lolly-tasted:before { content: "\e232" } .glyphicon-education:before { content: "\e233" } .glyphicon-option-horizontal:before { content: "\e234" } .glyphicon-option-vertical:before { content: "\e235" } .glyphicon-menu-hamburger:before { content: "\e236" } .glyphicon-modal-window:before { content: "\e237" } .glyphicon-oil:before { content: "\e238" } .glyphicon-grain:before { content: "\e239" } .glyphicon-sunglasses:before { content: "\e240" } .glyphicon-text-size:before { content: "\e241" } .glyphicon-text-color:before { content: "\e242" } .glyphicon-text-background:before { content: "\e243" } .glyphicon-object-align-top:before { content: "\e244" } .glyphicon-object-align-bottom:before { content: "\e245" } .glyphicon-object-align-horizontal:before { content: "\e246" } .glyphicon-object-align-left:before { content: "\e247" } .glyphicon-object-align-vertical:before { content: "\e248" } .glyphicon-object-align-right:before { content: "\e249" } .glyphicon-triangle-right:before { content: "\e250" } .glyphicon-triangle-left:before { content: "\e251" } .glyphicon-triangle-bottom:before { content: "\e252" } .glyphicon-triangle-top:before { content: "\e253" } .glyphicon-console:before { content: "\e254" } .glyphicon-superscript:before { content: "\e255" } .glyphicon-subscript:before { content: "\e256" } .glyphicon-menu-left:before { content: "\e257" } .glyphicon-menu-right:before { content: "\e258" } .glyphicon-menu-down:before { content: "\e259" } .glyphicon-menu-up:before { content: "\e260" } * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } *:before, *:after { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } html { font-size: 10px; -webkit-tap-highlight-color: rgba(0, 0, 0, 0) } body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; color: #333; background-color: #fff } input, button, select, textarea { font-family: inherit; font-size: inherit; line-height: inherit } a { color: #337ab7; text-decoration: none } a:hover, a:focus { color: #23527c; text-decoration: underline } a:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } figure { margin: 0 } img { vertical-align: middle } .img-responsive, .thumbnail > img, .thumbnail a > img, .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto } .img-rounded { border-radius: 6px } .img-thumbnail { padding: 4px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out; transition: all .2s ease-in-out; display: inline-block; max-width: 100%; height: auto } .img-circle { border-radius: 50% } hr { margin-top: 20px; margin-bottom: 20px; border: 0; border-top: 1px solid #eee } .sr-only { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0 } .sr-only-focusable:active, .sr-only-focusable:focus { position: static; width: auto; height: auto; margin: 0; overflow: visible; clip: auto } [role="button"] { cursor: pointer } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small, h1 .small, h2 .small, h3 .small, h4 .small, h5 .small, h6 .small, .h1 .small, .h2 .small, .h3 .small, .h4 .small, .h5 .small, .h6 .small { font-weight: normal; line-height: 1; color: #777 } h1, .h1, h2, .h2, h3, .h3 { margin-top: 20px; margin-bottom: 10px } h1 small, .h1 small, h2 small, .h2 small, h3 small, .h3 small, h1 .small, .h1 .small, h2 .small, .h2 .small, h3 .small, .h3 .small { font-size: 65% } h4, .h4, h5, .h5, h6, .h6 { margin-top: 10px; margin-bottom: 10px } h4 small, .h4 small, h5 small, .h5 small, h6 small, .h6 small, h4 .small, .h4 .small, h5 .small, .h5 .small, h6 .small, .h6 .small { font-size: 75% } h1, .h1 { font-size: 36px } h2, .h2 { font-size: 30px } h3, .h3 { font-size: 24px } h4, .h4 { font-size: 18px } h5, .h5 { font-size: 14px } h6, .h6 { font-size: 12px } p { margin: 0 0 10px } .lead { margin-bottom: 20px; font-size: 16px; font-weight: 300; line-height: 1.4 } @media (min-width: 768px) { .lead { font-size: 21px } } small, .small { font-size: 85% } mark, .mark { background-color: #fcf8e3; padding: .2em } .text-left { text-align: left } .text-right { text-align: right } .text-center { text-align: center } .text-justify { text-align: justify } .text-nowrap { white-space: nowrap } .text-lowercase { text-transform: lowercase } .text-uppercase { text-transform: uppercase } .text-capitalize { text-transform: capitalize } .text-muted { color: #777 } .text-primary { color: #337ab7 } a.text-primary:hover, a.text-primary:focus { color: #286090 } .text-success { color: #3c763d } a.text-success:hover, a.text-success:focus { color: #2b542c } .text-info { color: #31708f } a.text-info:hover, a.text-info:focus { color: #245269 } .text-warning { color: #8a6d3b } a.text-warning:hover, a.text-warning:focus { color: #66512c } .text-danger { color: #a94442 } a.text-danger:hover, a.text-danger:focus { color: #843534 } .bg-primary { color: #fff; background-color: #337ab7 } a.bg-primary:hover, a.bg-primary:focus { background-color: #286090 } .bg-success { background-color: #dff0d8 } a.bg-success:hover, a.bg-success:focus { background-color: #c1e2b3 } .bg-info { background-color: #d9edf7 } a.bg-info:hover, a.bg-info:focus { background-color: #afd9ee } .bg-warning { background-color: #fcf8e3 } a.bg-warning:hover, a.bg-warning:focus { background-color: #f7ecb5 } .bg-danger { background-color: #f2dede } a.bg-danger:hover, a.bg-danger:focus { background-color: #e4b9b9 } .page-header { padding-bottom: 9px; margin: 40px 0 20px; border-bottom: 1px solid #eee } ul, ol { margin-top: 0; margin-bottom: 10px } ul ul, ol ul, ul ol, ol ol { margin-bottom: 0 } .list-unstyled { padding-left: 0; list-style: none } .list-inline { padding-left: 0; list-style: none; margin-left: -5px } .list-inline > li { display: inline-block; padding-left: 5px; padding-right: 5px } dl { margin-top: 0; margin-bottom: 20px } dt, dd { line-height: 1.42857143 } dt { font-weight: bold } dd { margin-left: 0 } @media (min-width: 768px) { .dl-horizontal dt { float: left; width: 160px; clear: left; text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap } .dl-horizontal dd { margin-left: 180px } } abbr[title], abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #777 } .initialism { font-size: 90%; text-transform: uppercase } blockquote { padding: 10px 20px; margin: 0 0 20px; font-size: 17.5px; border-left: 5px solid #eee } blockquote p:last-child, blockquote ul:last-child, blockquote ol:last-child { margin-bottom: 0 } blockquote footer, blockquote small, blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; color: #777 } blockquote footer:before, blockquote small:before, blockquote .small:before { content: '\2014 \00A0' } .blockquote-reverse, blockquote.pull-right { padding-right: 15px; padding-left: 0; border-right: 5px solid #eee; border-left: 0; text-align: right } .blockquote-reverse footer:before, blockquote.pull-right footer:before, .blockquote-reverse small:before, blockquote.pull-right small:before, .blockquote-reverse .small:before, blockquote.pull-right .small:before { content: '' } .blockquote-reverse footer:after, blockquote.pull-right footer:after, .blockquote-reverse small:after, blockquote.pull-right small:after, .blockquote-reverse .small:after, blockquote.pull-right .small:after { content: '\00A0 \2014' } address { margin-bottom: 20px; font-style: normal; line-height: 1.42857143 } code, kbd, pre, samp { font-family: Menlo, Monaco, Consolas, "Courier New", monospace } code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; border-radius: 4px } kbd { padding: 2px 4px; font-size: 90%; color: #fff; background-color: #333; border-radius: 3px; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25) } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; -webkit-box-shadow: none; box-shadow: none } pre { display: block; padding: 9.5px; margin: 0 0 10px; font-size: 13px; line-height: 1.42857143; word-break: break-all; word-wrap: break-word; color: #333; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px } pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap; background-color: transparent; border-radius: 0 } .pre-scrollable { max-height: 340px; overflow-y: scroll } .container { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } @media (min-width: 768px) { .container { width: 750px } } @media (min-width: 992px) { .container { width: 970px } } @media (min-width: 1200px) { .container { width: 1170px } } .container-fluid { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } .row { margin-left: -15px; margin-right: -15px } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left } .col-xs-12 { width: 100% } .col-xs-11 { width: 91.66666667% } .col-xs-10 { width: 83.33333333% } .col-xs-9 { width: 75% } .col-xs-8 { width: 66.66666667% } .col-xs-7 { width: 58.33333333% } .col-xs-6 { width: 50% } .col-xs-5 { width: 41.66666667% } .col-xs-4 { width: 33.33333333% } .col-xs-3 { width: 25% } .col-xs-2 { width: 16.66666667% } .col-xs-1 { width: 8.33333333% } .col-xs-pull-12 { right: 100% } .col-xs-pull-11 { right: 91.66666667% } .col-xs-pull-10 { right: 83.33333333% } .col-xs-pull-9 { right: 75% } .col-xs-pull-8 { right: 66.66666667% } .col-xs-pull-7 { right: 58.33333333% } .col-xs-pull-6 { right: 50% } .col-xs-pull-5 { right: 41.66666667% } .col-xs-pull-4 { right: 33.33333333% } .col-xs-pull-3 { right: 25% } .col-xs-pull-2 { right: 16.66666667% } .col-xs-pull-1 { right: 8.33333333% } .col-xs-pull-0 { right: auto } .col-xs-push-12 { left: 100% } .col-xs-push-11 { left: 91.66666667% } .col-xs-push-10 { left: 83.33333333% } .col-xs-push-9 { left: 75% } .col-xs-push-8 { left: 66.66666667% } .col-xs-push-7 { left: 58.33333333% } .col-xs-push-6 { left: 50% } .col-xs-push-5 { left: 41.66666667% } .col-xs-push-4 { left: 33.33333333% } .col-xs-push-3 { left: 25% } .col-xs-push-2 { left: 16.66666667% } .col-xs-push-1 { left: 8.33333333% } .col-xs-push-0 { left: auto } .col-xs-offset-12 { margin-left: 100% } .col-xs-offset-11 { margin-left: 91.66666667% } .col-xs-offset-10 { margin-left: 83.33333333% } .col-xs-offset-9 { margin-left: 75% } .col-xs-offset-8 { margin-left: 66.66666667% } .col-xs-offset-7 { margin-left: 58.33333333% } .col-xs-offset-6 { margin-left: 50% } .col-xs-offset-5 { margin-left: 41.66666667% } .col-xs-offset-4 { margin-left: 33.33333333% } .col-xs-offset-3 { margin-left: 25% } .col-xs-offset-2 { margin-left: 16.66666667% } .col-xs-offset-1 { margin-left: 8.33333333% } .col-xs-offset-0 { margin-left: 0 } @media (min-width: 768px) { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left } .col-sm-12 { width: 100% } .col-sm-11 { width: 91.66666667% } .col-sm-10 { width: 83.33333333% } .col-sm-9 { width: 75% } .col-sm-8 { width: 66.66666667% } .col-sm-7 { width: 58.33333333% } .col-sm-6 { width: 50% } .col-sm-5 { width: 41.66666667% } .col-sm-4 { width: 33.33333333% } .col-sm-3 { width: 25% } .col-sm-2 { width: 16.66666667% } .col-sm-1 { width: 8.33333333% } .col-sm-pull-12 { right: 100% } .col-sm-pull-11 { right: 91.66666667% } .col-sm-pull-10 { right: 83.33333333% } .col-sm-pull-9 { right: 75% } .col-sm-pull-8 { right: 66.66666667% } .col-sm-pull-7 { right: 58.33333333% } .col-sm-pull-6 { right: 50% } .col-sm-pull-5 { right: 41.66666667% } .col-sm-pull-4 { right: 33.33333333% } .col-sm-pull-3 { right: 25% } .col-sm-pull-2 { right: 16.66666667% } .col-sm-pull-1 { right: 8.33333333% } .col-sm-pull-0 { right: auto } .col-sm-push-12 { left: 100% } .col-sm-push-11 { left: 91.66666667% } .col-sm-push-10 { left: 83.33333333% } .col-sm-push-9 { left: 75% } .col-sm-push-8 { left: 66.66666667% } .col-sm-push-7 { left: 58.33333333% } .col-sm-push-6 { left: 50% } .col-sm-push-5 { left: 41.66666667% } .col-sm-push-4 { left: 33.33333333% } .col-sm-push-3 { left: 25% } .col-sm-push-2 { left: 16.66666667% } .col-sm-push-1 { left: 8.33333333% } .col-sm-push-0 { left: auto } .col-sm-offset-12 { margin-left: 100% } .col-sm-offset-11 { margin-left: 91.66666667% } .col-sm-offset-10 { margin-left: 83.33333333% } .col-sm-offset-9 { margin-left: 75% } .col-sm-offset-8 { margin-left: 66.66666667% } .col-sm-offset-7 { margin-left: 58.33333333% } .col-sm-offset-6 { margin-left: 50% } .col-sm-offset-5 { margin-left: 41.66666667% } .col-sm-offset-4 { margin-left: 33.33333333% } .col-sm-offset-3 { margin-left: 25% } .col-sm-offset-2 { margin-left: 16.66666667% } .col-sm-offset-1 { margin-left: 8.33333333% } .col-sm-offset-0 { margin-left: 0 } } @media (min-width: 992px) { .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { float: left } .col-md-12 { width: 100% } .col-md-11 { width: 91.66666667% } .col-md-10 { width: 83.33333333% } .col-md-9 { width: 75% } .col-md-8 { width: 66.66666667% } .col-md-7 { width: 58.33333333% } .col-md-6 { width: 50% } .col-md-5 { width: 41.66666667% } .col-md-4 { width: 33.33333333% } .col-md-3 { width: 25% } .col-md-2 { width: 16.66666667% } .col-md-1 { width: 8.33333333% } .col-md-pull-12 { right: 100% } .col-md-pull-11 { right: 91.66666667% } .col-md-pull-10 { right: 83.33333333% } .col-md-pull-9 { right: 75% } .col-md-pull-8 { right: 66.66666667% } .col-md-pull-7 { right: 58.33333333% } .col-md-pull-6 { right: 50% } .col-md-pull-5 { right: 41.66666667% } .col-md-pull-4 { right: 33.33333333% } .col-md-pull-3 { right: 25% } .col-md-pull-2 { right: 16.66666667% } .col-md-pull-1 { right: 8.33333333% } .col-md-pull-0 { right: auto } .col-md-push-12 { left: 100% } .col-md-push-11 { left: 91.66666667% } .col-md-push-10 { left: 83.33333333% } .col-md-push-9 { left: 75% } .col-md-push-8 { left: 66.66666667% } .col-md-push-7 { left: 58.33333333% } .col-md-push-6 { left: 50% } .col-md-push-5 { left: 41.66666667% } .col-md-push-4 { left: 33.33333333% } .col-md-push-3 { left: 25% } .col-md-push-2 { left: 16.66666667% } .col-md-push-1 { left: 8.33333333% } .col-md-push-0 { left: auto } .col-md-offset-12 { margin-left: 100% } .col-md-offset-11 { margin-left: 91.66666667% } .col-md-offset-10 { margin-left: 83.33333333% } .col-md-offset-9 { margin-left: 75% } .col-md-offset-8 { margin-left: 66.66666667% } .col-md-offset-7 { margin-left: 58.33333333% } .col-md-offset-6 { margin-left: 50% } .col-md-offset-5 { margin-left: 41.66666667% } .col-md-offset-4 { margin-left: 33.33333333% } .col-md-offset-3 { margin-left: 25% } .col-md-offset-2 { margin-left: 16.66666667% } .col-md-offset-1 { margin-left: 8.33333333% } .col-md-offset-0 { margin-left: 0 } } @media (min-width: 1200px) { .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { float: left } .col-lg-12 { width: 100% } .col-lg-11 { width: 91.66666667% } .col-lg-10 { width: 83.33333333% } .col-lg-9 { width: 75% } .col-lg-8 { width: 66.66666667% } .col-lg-7 { width: 58.33333333% } .col-lg-6 { width: 50% } .col-lg-5 { width: 41.66666667% } .col-lg-4 { width: 33.33333333% } .col-lg-3 { width: 25% } .col-lg-2 { width: 16.66666667% } .col-lg-1 { width: 8.33333333% } .col-lg-pull-12 { right: 100% } .col-lg-pull-11 { right: 91.66666667% } .col-lg-pull-10 { right: 83.33333333% } .col-lg-pull-9 { right: 75% } .col-lg-pull-8 { right: 66.66666667% } .col-lg-pull-7 { right: 58.33333333% } .col-lg-pull-6 { right: 50% } .col-lg-pull-5 { right: 41.66666667% } .col-lg-pull-4 { right: 33.33333333% } .col-lg-pull-3 { right: 25% } .col-lg-pull-2 { right: 16.66666667% } .col-lg-pull-1 { right: 8.33333333% } .col-lg-pull-0 { right: auto } .col-lg-push-12 { left: 100% } .col-lg-push-11 { left: 91.66666667% } .col-lg-push-10 { left: 83.33333333% } .col-lg-push-9 { left: 75% } .col-lg-push-8 { left: 66.66666667% } .col-lg-push-7 { left: 58.33333333% } .col-lg-push-6 { left: 50% } .col-lg-push-5 { left: 41.66666667% } .col-lg-push-4 { left: 33.33333333% } .col-lg-push-3 { left: 25% } .col-lg-push-2 { left: 16.66666667% } .col-lg-push-1 { left: 8.33333333% } .col-lg-push-0 { left: auto } .col-lg-offset-12 { margin-left: 100% } .col-lg-offset-11 { margin-left: 91.66666667% } .col-lg-offset-10 { margin-left: 83.33333333% } .col-lg-offset-9 { margin-left: 75% } .col-lg-offset-8 { margin-left: 66.66666667% } .col-lg-offset-7 { margin-left: 58.33333333% } .col-lg-offset-6 { margin-left: 50% } .col-lg-offset-5 { margin-left: 41.66666667% } .col-lg-offset-4 { margin-left: 33.33333333% } .col-lg-offset-3 { margin-left: 25% } .col-lg-offset-2 { margin-left: 16.66666667% } .col-lg-offset-1 { margin-left: 8.33333333% } .col-lg-offset-0 { margin-left: 0 } } table { background-color: transparent } caption { padding-top: 8px; padding-bottom: 8px; color: #777; text-align: left } th { text-align: left } .table { width: 100%; max-width: 100%; margin-bottom: 20px } .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { padding: 8px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd } .table > thead > tr > th { vertical-align: bottom; border-bottom: 2px solid #ddd } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, .table > thead:first-child > tr:first-child > th, .table > caption + thead > tr:first-child > td, .table > colgroup + thead > tr:first-child > td, .table > thead:first-child > tr:first-child > td { border-top: 0 } .table > tbody + tbody { border-top: 2px solid #ddd } .table .table { background-color: #fff } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td { padding: 5px } .table-bordered { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { border-bottom-width: 2px } .table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9 } .table-hover > tbody > tr:hover { background-color: #f5f5f5 } table col[class*="col-"] { position: static; float: none; display: table-column } table td[class*="col-"], table th[class*="col-"] { position: static; float: none; display: table-cell } .table > thead > tr > td.active, .table > tbody > tr > td.active, .table > tfoot > tr > td.active, .table > thead > tr > th.active, .table > tbody > tr > th.active, .table > tfoot > tr > th.active, .table > thead > tr.active > td, .table > tbody > tr.active > td, .table > tfoot > tr.active > td, .table > thead > tr.active > th, .table > tbody > tr.active > th, .table > tfoot > tr.active > th { background-color: #f5f5f5 } .table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th { background-color: #e8e8e8 } .table > thead > tr > td.success, .table > tbody > tr > td.success, .table > tfoot > tr > td.success, .table > thead > tr > th.success, .table > tbody > tr > th.success, .table > tfoot > tr > th.success, .table > thead > tr.success > td, .table > tbody > tr.success > td, .table > tfoot > tr.success > td, .table > thead > tr.success > th, .table > tbody > tr.success > th, .table > tfoot > tr.success > th { background-color: #dff0d8 } .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6 } .table > thead > tr > td.info, .table > tbody > tr > td.info, .table > tfoot > tr > td.info, .table > thead > tr > th.info, .table > tbody > tr > th.info, .table > tfoot > tr > th.info, .table > thead > tr.info > td, .table > tbody > tr.info > td, .table > tfoot > tr.info > td, .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { background-color: #d9edf7 } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { background-color: #c4e3f3 } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > tfoot > tr > td.warning, .table > thead > tr > th.warning, .table > tbody > tr > th.warning, .table > tfoot > tr > th.warning, .table > thead > tr.warning > td, .table > tbody > tr.warning > td, .table > tfoot > tr.warning > td, .table > thead > tr.warning > th, .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { background-color: #fcf8e3 } .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc } .table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > tfoot > tr > td.danger, .table > thead > tr > th.danger, .table > tbody > tr > th.danger, .table > tfoot > tr > th.danger, .table > thead > tr.danger > td, .table > tbody > tr.danger > td, .table > tfoot > tr.danger > td, .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { background-color: #f2dede } .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc } .table-responsive { overflow-x: auto; min-height: 0.01% } @media screen and (max-width: 767px) { .table-responsive { width: 100%; margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid #ddd } .table-responsive > .table { margin-bottom: 0 } .table-responsive > .table > thead > tr > th, .table-responsive > .table > tbody > tr > th, .table-responsive > .table > tfoot > tr > th, .table-responsive > .table > thead > tr > td, .table-responsive > .table > tbody > tr > td, .table-responsive > .table > tfoot > tr > td { white-space: nowrap } .table-responsive > .table-bordered { border: 0 } .table-responsive > .table-bordered > thead > tr > th:first-child, .table-responsive > .table-bordered > tbody > tr > th:first-child, .table-responsive > .table-bordered > tfoot > tr > th:first-child, .table-responsive > .table-bordered > thead > tr > td:first-child, .table-responsive > .table-bordered > tbody > tr > td:first-child, .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .table-responsive > .table-bordered > thead > tr > th:last-child, .table-responsive > .table-bordered > tbody > tr > th:last-child, .table-responsive > .table-bordered > tfoot > tr > th:last-child, .table-responsive > .table-bordered > thead > tr > td:last-child, .table-responsive > .table-bordered > tbody > tr > td:last-child, .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .table-responsive > .table-bordered > tbody > tr:last-child > th, .table-responsive > .table-bordered > tfoot > tr:last-child > th, .table-responsive > .table-bordered > tbody > tr:last-child > td, .table-responsive > .table-bordered > tfoot > tr:last-child > td { border-bottom: 0 } } fieldset { padding: 0; margin: 0; border: 0; min-width: 0 } legend { display: block; width: 100%; padding: 0; margin-bottom: 20px; font-size: 21px; line-height: inherit; color: #333; border: 0; border-bottom: 1px solid #e5e5e5 } label { display: inline-block; max-width: 100%; margin-bottom: 5px; font-weight: bold } input[type="search"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; line-height: normal } input[type="file"] { display: block } input[type="range"] { display: block; width: 100% } select[multiple], select[size] { height: auto } input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } output { display: block; padding-top: 7px; font-size: 14px; line-height: 1.42857143; color: #555 } .form-control { display: block; width: 100%; height: 34px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s } .form-control:focus { border-color: #66afe9; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6) } .form-control::-moz-placeholder { color: #999; opacity: 1 } .form-control:-ms-input-placeholder { color: #999 } .form-control::-webkit-input-placeholder { color: #999 } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { background-color: #eee; opacity: 1 } .form-control[disabled], fieldset[disabled] .form-control { cursor: not-allowed } textarea.form-control { height: auto } input[type="search"] { -webkit-appearance: none } @media screen and (-webkit-min-device-pixel-ratio: 0) { input[type="date"].form-control, input[type="time"].form-control, input[type="datetime-local"].form-control, input[type="month"].form-control { line-height: 34px } input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, input[type="month"].input-sm, .input-group-sm input[type="date"], .input-group-sm input[type="time"], .input-group-sm input[type="datetime-local"], .input-group-sm input[type="month"] { line-height: 30px } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, input[type="month"].input-lg, .input-group-lg input[type="date"], .input-group-lg input[type="time"], .input-group-lg input[type="datetime-local"], .input-group-lg input[type="month"] { line-height: 46px } } .form-group { margin-bottom: 15px } .radio, .checkbox { position: relative; display: block; margin-top: 10px; margin-bottom: 10px } .radio label, .checkbox label { min-height: 20px; padding-left: 20px; margin-bottom: 0; font-weight: normal; cursor: pointer } .radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; margin-left: -20px; margin-top: 4px \9 } .radio + .radio, .checkbox + .checkbox { margin-top: -5px } .radio-inline, .checkbox-inline { position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; vertical-align: middle; font-weight: normal; cursor: pointer } .radio-inline + .radio-inline, .checkbox-inline + .checkbox-inline { margin-top: 0; margin-left: 10px } input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"].disabled, input[type="checkbox"].disabled, fieldset[disabled] input[type="radio"], fieldset[disabled] input[type="checkbox"] { cursor: not-allowed } .radio-inline.disabled, .checkbox-inline.disabled, fieldset[disabled] .radio-inline, fieldset[disabled] .checkbox-inline { cursor: not-allowed } .radio.disabled label, .checkbox.disabled label, fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed } .form-control-static { padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; min-height: 34px } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0 } .input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-sm { height: 30px; line-height: 30px } textarea.input-sm, select[multiple].input-sm { height: auto } .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .form-group-sm select.form-control { height: 30px; line-height: 30px } .form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control { height: auto } .form-group-sm .form-control-static { height: 30px; min-height: 32px; padding: 6px 10px; font-size: 12px; line-height: 1.5 } .input-lg { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-lg { height: 46px; line-height: 46px } textarea.input-lg, select[multiple].input-lg { height: auto } .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .form-group-lg select.form-control { height: 46px; line-height: 46px } .form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control { height: auto } .form-group-lg .form-control-static { height: 46px; min-height: 38px; padding: 11px 16px; font-size: 18px; line-height: 1.3333333 } .has-feedback { position: relative } .has-feedback .form-control { padding-right: 42.5px } .form-control-feedback { position: absolute; top: 0; right: 0; z-index: 2; display: block; width: 34px; height: 34px; line-height: 34px; text-align: center; pointer-events: none } .input-lg + .form-control-feedback, .input-group-lg + .form-control-feedback, .form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px } .input-sm + .form-control-feedback, .input-group-sm + .form-control-feedback, .form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px } .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { color: #3c763d } .has-success .form-control { border-color: #3c763d; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-success .form-control:focus { border-color: #2b542c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168 } .has-success .input-group-addon { color: #3c763d; border-color: #3c763d; background-color: #dff0d8 } .has-success .form-control-feedback { color: #3c763d } .has-warning .help-block, .has-warning .control-label, .has-warning .radio, .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline, .has-warning.radio label, .has-warning.checkbox label, .has-warning.radio-inline label, .has-warning.checkbox-inline label { color: #8a6d3b } .has-warning .form-control { border-color: #8a6d3b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-warning .form-control:focus { border-color: #66512c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b } .has-warning .input-group-addon { color: #8a6d3b; border-color: #8a6d3b; background-color: #fcf8e3 } .has-warning .form-control-feedback { color: #8a6d3b } .has-error .help-block, .has-error .control-label, .has-error .radio, .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label { color: #a94442 } .has-error .form-control { border-color: #a94442; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-error .form-control:focus { border-color: #843534; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483 } .has-error .input-group-addon { color: #a94442; border-color: #a94442; background-color: #f2dede } .has-error .form-control-feedback { color: #a94442 } .has-feedback label ~ .form-control-feedback { top: 25px } .has-feedback label.sr-only ~ .form-control-feedback { top: 0 } .help-block { display: block; margin-top: 5px; margin-bottom: 10px; color: #737373 } @media (min-width: 768px) { .form-inline .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .form-inline .form-control { display: inline-block; width: auto; vertical-align: middle } .form-inline .form-control-static { display: inline-block } .form-inline .input-group { display: inline-table; vertical-align: middle } .form-inline .input-group .input-group-addon, .form-inline .input-group .input-group-btn, .form-inline .input-group .form-control { width: auto } .form-inline .input-group > .form-control { width: 100% } .form-inline .control-label { margin-bottom: 0; vertical-align: middle } .form-inline .radio, .form-inline .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .form-inline .radio label, .form-inline .checkbox label { padding-left: 0 } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .form-inline .has-feedback .form-control-feedback { top: 0 } } .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { margin-top: 0; margin-bottom: 0; padding-top: 7px } .form-horizontal .radio, .form-horizontal .checkbox { min-height: 27px } .form-horizontal .form-group { margin-left: -15px; margin-right: -15px } @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; margin-bottom: 0; padding-top: 7px } } .form-horizontal .has-feedback .form-control-feedback { right: 15px } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { padding-top: 14.333333px; font-size: 18px } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; font-size: 12px } } .btn { display: inline-block; margin-bottom: 0; font-weight: normal; text-align: center; vertical-align: middle; -ms-touch-action: manipulation; touch-action: manipulation; cursor: pointer; background-image: none; border: 1px solid transparent; white-space: nowrap; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none } .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:active.focus, .btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } .btn:hover, .btn:focus, .btn.focus { color: #333; text-decoration: none } .btn:active, .btn.active { outline: 0; background-image: none; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; opacity: .65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none } a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none } .btn-default { color: #333; background-color: #fff; border-color: #ccc } .btn-default:focus, .btn-default.focus { color: #333; background-color: #e6e6e6; border-color: #8c8c8c } .btn-default:hover { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active:hover, .btn-default.active:hover, .open > .dropdown-toggle.btn-default:hover, .btn-default:active:focus, .btn-default.active:focus, .open > .dropdown-toggle.btn-default:focus, .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus { color: #333; background-color: #d4d4d4; border-color: #8c8c8c } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { background-image: none } .btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, fieldset[disabled] .btn-default.focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { background-color: #fff; border-color: #ccc } .btn-default .badge { color: #fff; background-color: #333 } .btn-primary { color: #fff; background-color: #337ab7; border-color: #2e6da4 } .btn-primary:focus, .btn-primary.focus { color: #fff; background-color: #286090; border-color: #122b40 } .btn-primary:hover { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active:hover, .btn-primary.active:hover, .open > .dropdown-toggle.btn-primary:hover, .btn-primary:active:focus, .btn-primary.active:focus, .open > .dropdown-toggle.btn-primary:focus, .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus { color: #fff; background-color: #204d74; border-color: #122b40 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { background-image: none } .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary.focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #337ab7; border-color: #2e6da4 } .btn-primary .badge { color: #337ab7; background-color: #fff } .btn-success { color: #fff; background-color: #5cb85c; border-color: #4cae4c } .btn-success:focus, .btn-success.focus { color: #fff; background-color: #449d44; border-color: #255625 } .btn-success:hover { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active:hover, .btn-success.active:hover, .open > .dropdown-toggle.btn-success:hover, .btn-success:active:focus, .btn-success.active:focus, .open > .dropdown-toggle.btn-success:focus, .btn-success:active.focus, .btn-success.active.focus, .open > .dropdown-toggle.btn-success.focus { color: #fff; background-color: #398439; border-color: #255625 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { background-image: none } .btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, .btn-success.disabled.focus, .btn-success[disabled].focus, fieldset[disabled] .btn-success.focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { background-color: #5cb85c; border-color: #4cae4c } .btn-success .badge { color: #5cb85c; background-color: #fff } .btn-info { color: #fff; background-color: #5bc0de; border-color: #46b8da } .btn-info:focus, .btn-info.focus { color: #fff; background-color: #31b0d5; border-color: #1b6d85 } .btn-info:hover { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active:hover, .btn-info.active:hover, .open > .dropdown-toggle.btn-info:hover, .btn-info:active:focus, .btn-info.active:focus, .open > .dropdown-toggle.btn-info:focus, .btn-info:active.focus, .btn-info.active.focus, .open > .dropdown-toggle.btn-info.focus { color: #fff; background-color: #269abc; border-color: #1b6d85 } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { background-image: none } .btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, .btn-info.disabled.focus, .btn-info[disabled].focus, fieldset[disabled] .btn-info.focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { background-color: #5bc0de; border-color: #46b8da } .btn-info .badge { color: #5bc0de; background-color: #fff } .btn-warning { color: #fff; background-color: #f0ad4e; border-color: #eea236 } .btn-warning:focus, .btn-warning.focus { color: #fff; background-color: #ec971f; border-color: #985f0d } .btn-warning:hover { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active:hover, .btn-warning.active:hover, .open > .dropdown-toggle.btn-warning:hover, .btn-warning:active:focus, .btn-warning.active:focus, .open > .dropdown-toggle.btn-warning:focus, .btn-warning:active.focus, .btn-warning.active.focus, .open > .dropdown-toggle.btn-warning.focus { color: #fff; background-color: #d58512; border-color: #985f0d } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { background-image: none } .btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled.focus, .btn-warning[disabled].focus, fieldset[disabled] .btn-warning.focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { background-color: #f0ad4e; border-color: #eea236 } .btn-warning .badge { color: #f0ad4e; background-color: #fff } .btn-danger { color: #fff; background-color: #d9534f; border-color: #d43f3a } .btn-danger:focus, .btn-danger.focus { color: #fff; background-color: #c9302c; border-color: #761c19 } .btn-danger:hover { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active:hover, .btn-danger.active:hover, .open > .dropdown-toggle.btn-danger:hover, .btn-danger:active:focus, .btn-danger.active:focus, .open > .dropdown-toggle.btn-danger:focus, .btn-danger:active.focus, .btn-danger.active.focus, .open > .dropdown-toggle.btn-danger.focus { color: #fff; background-color: #ac2925; border-color: #761c19 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { background-image: none } .btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled.focus, .btn-danger[disabled].focus, fieldset[disabled] .btn-danger.focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { background-color: #d9534f; border-color: #d43f3a } .btn-danger .badge { color: #d9534f; background-color: #fff } .btn-link { color: #337ab7; font-weight: normal; border-radius: 0 } .btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; -webkit-box-shadow: none; box-shadow: none } .btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent } .btn-link:hover, .btn-link:focus { color: #23527c; text-decoration: underline; background-color: transparent } .btn-link[disabled]:hover, fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { color: #777; text-decoration: none } .btn-lg, .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-block { display: block; width: 100% } .btn-block + .btn-block { margin-top: 5px } input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { width: 100% } .fade { opacity: 0; -webkit-transition: opacity .15s linear; -o-transition: opacity .15s linear; transition: opacity .15s linear } .fade.in { opacity: 1 } .collapse { display: none } .collapse.in { display: block } tr.collapse.in { display: table-row } tbody.collapse.in { display: table-row-group } .collapsing { position: relative; height: 0; overflow: hidden; -webkit-transition-property: height, visibility; -o-transition-property: height, visibility; transition-property: height, visibility; -webkit-transition-duration: .35s; -o-transition-duration: .35s; transition-duration: .35s; -webkit-transition-timing-function: ease; -o-transition-timing-function: ease; transition-timing-function: ease } .caret { display: inline-block; width: 0; height: 0; margin-left: 2px; vertical-align: middle; border-top: 4px dashed; border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent } .dropup, .dropdown { position: relative } .dropdown-toggle:focus { outline: 0 } .dropdown-menu { position: absolute; top: 100%; left: 0; z-index: 1000; display: none; float: left; min-width: 160px; padding: 5px 0; margin: 2px 0 0; list-style: none; font-size: 14px; text-align: left; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); -webkit-background-clip: padding-box; background-clip: padding-box } .dropdown-menu.pull-right { right: 0; left: auto } .dropdown-menu .divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.42857143; color: #333; white-space: nowrap } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; color: #262626; background-color: #f5f5f5 } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { color: #fff; text-decoration: none; outline: 0; background-color: #337ab7 } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #777 } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); cursor: not-allowed } .open > .dropdown-menu { display: block } .open > a { outline: 0 } .dropdown-menu-right { left: auto; right: 0 } .dropdown-menu-left { left: 0; right: auto } .dropdown-header { display: block; padding: 3px 20px; font-size: 12px; line-height: 1.42857143; color: #777; white-space: nowrap } .dropdown-backdrop { position: fixed; left: 0; right: 0; bottom: 0; top: 0; z-index: 990 } .pull-right > .dropdown-menu { right: 0; left: auto } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px dashed; border-bottom: 4px solid \9; content: "" } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 2px } @media (min-width: 768px) { .navbar-right .dropdown-menu { left: auto; right: 0 } .navbar-right .dropdown-menu-left { left: 0; right: auto } } .btn-group, .btn-group-vertical { position: relative; display: inline-block; vertical-align: middle } .btn-group > .btn, .btn-group-vertical > .btn { position: relative; float: left } .btn-group > .btn:hover, .btn-group-vertical > .btn:hover, .btn-group > .btn:focus, .btn-group-vertical > .btn:focus, .btn-group > .btn:active, .btn-group-vertical > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn.active { z-index: 2 } .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, .btn-group .btn-group + .btn-group { margin-left: -1px } .btn-toolbar { margin-left: -5px } .btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left } .btn-toolbar > .btn, .btn-toolbar > .btn-group, .btn-toolbar > .input-group { margin-left: 5px } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { border-radius: 0 } .btn-group > .btn:first-child { margin-left: 0 } .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group > .btn-group { float: left } .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0 } .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px } .btn-group > .btn-lg + .dropdown-toggle { padding-left: 12px; padding-right: 12px } .btn-group.open .dropdown-toggle { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn-group.open .dropdown-toggle.btn-link { -webkit-box-shadow: none; box-shadow: none } .btn .caret { margin-left: 0 } .btn-lg .caret { border-width: 5px 5px 0; border-bottom-width: 0 } .dropup .btn-lg .caret { border-width: 0 5px 5px } .btn-group-vertical > .btn, .btn-group-vertical > .btn-group, .btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; max-width: 100% } .btn-group-vertical > .btn-group > .btn { float: none } .btn-group-vertical > .btn + .btn, .btn-group-vertical > .btn + .btn-group, .btn-group-vertical > .btn-group + .btn, .btn-group-vertical > .btn-group + .btn-group { margin-top: -1px; margin-left: 0 } .btn-group-vertical > .btn:not(:first-child):not(:last-child) { border-radius: 0 } .btn-group-vertical > .btn:first-child:not(:last-child) { border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn:last-child:not(:first-child) { border-bottom-left-radius: 4px; border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-justified { display: table; width: 100%; table-layout: fixed; border-collapse: separate } .btn-group-justified > .btn, .btn-group-justified > .btn-group { float: none; display: table-cell; width: 1% } .btn-group-justified > .btn-group .btn { width: 100% } .btn-group-justified > .btn-group .dropdown-menu { left: auto } [data-toggle="buttons"] > .btn input[type="radio"], [data-toggle="buttons"] > .btn-group > .btn input[type="radio"], [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; clip: rect(0, 0, 0, 0); pointer-events: none } .input-group { position: relative; display: table; border-collapse: separate } .input-group[class*="col-"] { float: none; padding-left: 0; padding-right: 0 } .input-group .form-control { position: relative; z-index: 2; float: left; width: 100%; margin-bottom: 0 } .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { height: 46px; line-height: 46px } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, textarea.input-group-lg > .input-group-btn > .btn, select[multiple].input-group-lg > .form-control, select[multiple].input-group-lg > .input-group-addon, select[multiple].input-group-lg > .input-group-btn > .btn { height: auto } .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-btn > .btn { height: 30px; line-height: 30px } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-btn > .btn, select[multiple].input-group-sm > .form-control, select[multiple].input-group-sm > .input-group-addon, select[multiple].input-group-sm > .input-group-btn > .btn { height: auto } .input-group-addon, .input-group-btn, .input-group .form-control { display: table-cell } .input-group-addon:not(:first-child):not(:last-child), .input-group-btn:not(:first-child):not(:last-child), .input-group .form-control:not(:first-child):not(:last-child) { border-radius: 0 } .input-group-addon, .input-group-btn { width: 1%; white-space: nowrap; vertical-align: middle } .input-group-addon { padding: 6px 12px; font-size: 14px; font-weight: normal; line-height: 1; color: #555; text-align: center; background-color: #eee; border: 1px solid #ccc; border-radius: 4px } .input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; border-radius: 3px } .input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; border-radius: 6px } .input-group-addon input[type="radio"], .input-group-addon input[type="checkbox"] { margin-top: 0 } .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { border-bottom-right-radius: 0; border-top-right-radius: 0 } .input-group-addon:first-child { border-right: 0 } .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { border-bottom-left-radius: 0; border-top-left-radius: 0 } .input-group-addon:last-child { border-left: 0 } .input-group-btn { position: relative; font-size: 0; white-space: nowrap } .input-group-btn > .btn { position: relative } .input-group-btn > .btn + .btn { margin-left: -1px } .input-group-btn > .btn:hover, .input-group-btn > .btn:focus, .input-group-btn > .btn:active { z-index: 2 } .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group { margin-right: -1px } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { z-index: 2; margin-left: -1px } .nav { margin-bottom: 0; padding-left: 0; list-style: none } .nav > li { position: relative; display: block } .nav > li > a { position: relative; display: block; padding: 10px 15px } .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; background-color: #eee } .nav > li.disabled > a { color: #777 } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { color: #777; text-decoration: none; background-color: transparent; cursor: not-allowed } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #eee; border-color: #337ab7 } .nav .nav-divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .nav > li > a > img { max-width: none } .nav-tabs { border-bottom: 1px solid #ddd } .nav-tabs > li { float: left; margin-bottom: -1px } .nav-tabs > li > a { margin-right: 2px; line-height: 1.42857143; border: 1px solid transparent; border-radius: 4px 4px 0 0 } .nav-tabs > li > a:hover { border-color: #eee #eee #ddd } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #555; background-color: #fff; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default } .nav-tabs.nav-justified { width: 100%; border-bottom: 0 } .nav-tabs.nav-justified > li { float: none } .nav-tabs.nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-tabs.nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-tabs.nav-justified > li { display: table-cell; width: 1% } .nav-tabs.nav-justified > li > a { margin-bottom: 0 } } .nav-tabs.nav-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border-bottom-color: #fff } } .nav-pills > li { float: left } .nav-pills > li > a { border-radius: 4px } .nav-pills > li + li { margin-left: 2px } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; background-color: #337ab7 } .nav-stacked > li { float: none } .nav-stacked > li + li { margin-top: 2px; margin-left: 0 } .nav-justified { width: 100% } .nav-justified > li { float: none } .nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-justified > li { display: table-cell; width: 1% } .nav-justified > li > a { margin-bottom: 0 } } .nav-tabs-justified { border-bottom: 0 } .nav-tabs-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border-bottom-color: #fff } } .tab-content > .tab-pane { display: none } .tab-content > .active { display: block } .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar { position: relative; min-height: 50px; margin-bottom: 20px; border: 1px solid transparent } @media (min-width: 768px) { .navbar { border-radius: 4px } } @media (min-width: 768px) { .navbar-header { float: left } } .navbar-collapse { overflow-x: visible; padding-right: 15px; padding-left: 15px; border-top: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch } .navbar-collapse.in { overflow-y: auto } @media (min-width: 768px) { .navbar-collapse { width: auto; border-top: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-collapse.collapse { display: block !important; height: auto !important; padding-bottom: 0; overflow: visible !important } .navbar-collapse.in { overflow-y: visible } .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { padding-left: 0; padding-right: 0 } } .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 340px } @media (max-device-width: 480px) and (orientation: landscape) { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 200px } } .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: -15px; margin-left: -15px } @media (min-width: 768px) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: 0; margin-left: 0 } } .navbar-static-top { z-index: 1000; border-width: 0 0 1px } @media (min-width: 768px) { .navbar-static-top { border-radius: 0 } } .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; right: 0; left: 0; z-index: 1030 } @media (min-width: 768px) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0 } } .navbar-fixed-top { top: 0; border-width: 0 0 1px } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; border-width: 1px 0 0 } .navbar-brand { float: left; padding: 15px 15px; font-size: 18px; line-height: 20px; height: 50px } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none } .navbar-brand > img { display: block } @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px } } .navbar-toggle { position: relative; float: right; margin-right: 15px; padding: 9px 10px; margin-top: 8px; margin-bottom: 8px; background-color: transparent; background-image: none; border: 1px solid transparent; border-radius: 4px } .navbar-toggle:focus { outline: 0 } .navbar-toggle .icon-bar { display: block; width: 22px; height: 2px; border-radius: 1px } .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px } @media (min-width: 768px) { .navbar-toggle { display: none } } .navbar-nav { margin: 7.5px -15px } .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; line-height: 20px } @media (max-width: 767px) { .navbar-nav .open .dropdown-menu { position: static; float: none; width: auto; margin-top: 0; background-color: transparent; border: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-nav .open .dropdown-menu > li > a, .navbar-nav .open .dropdown-menu .dropdown-header { padding: 5px 15px 5px 25px } .navbar-nav .open .dropdown-menu > li > a { line-height: 20px } .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus { background-image: none } } @media (min-width: 768px) { .navbar-nav { float: left; margin: 0 } .navbar-nav > li { float: left } .navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px } } .navbar-form { margin-left: -15px; margin-right: -15px; padding: 10px 15px; border-top: 1px solid transparent; border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); margin-top: 8px; margin-bottom: 8px } @media (min-width: 768px) { .navbar-form .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .navbar-form .form-control { display: inline-block; width: auto; vertical-align: middle } .navbar-form .form-control-static { display: inline-block } .navbar-form .input-group { display: inline-table; vertical-align: middle } .navbar-form .input-group .input-group-addon, .navbar-form .input-group .input-group-btn, .navbar-form .input-group .form-control { width: auto } .navbar-form .input-group > .form-control { width: 100% } .navbar-form .control-label { margin-bottom: 0; vertical-align: middle } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .navbar-form .radio label, .navbar-form .checkbox label { padding-left: 0 } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .navbar-form .has-feedback .form-control-feedback { top: 0 } } @media (max-width: 767px) { .navbar-form .form-group { margin-bottom: 5px } .navbar-form .form-group:last-child { margin-bottom: 0 } } @media (min-width: 768px) { .navbar-form { width: auto; border: 0; margin-left: 0; margin-right: 0; padding-top: 0; padding-bottom: 0; -webkit-box-shadow: none; box-shadow: none } } .navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; border-top-right-radius: 4px; border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .navbar-btn { margin-top: 8px; margin-bottom: 8px } .navbar-btn.btn-sm { margin-top: 10px; margin-bottom: 10px } .navbar-btn.btn-xs { margin-top: 14px; margin-bottom: 14px } .navbar-text { margin-top: 15px; margin-bottom: 15px } @media (min-width: 768px) { .navbar-text { float: left; margin-left: 15px; margin-right: 15px } } @media (min-width: 768px) { .navbar-left { float: left !important } .navbar-right { float: right !important; margin-right: -15px } .navbar-right ~ .navbar-right { margin-right: 0 } } .navbar-default { background-color: #f8f8f8; border-color: #e7e7e7 } .navbar-default .navbar-brand { color: #777 } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { color: #5e5e5e; background-color: transparent } .navbar-default .navbar-text { color: #777 } .navbar-default .navbar-nav > li > a { color: #777 } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { color: #ccc; background-color: transparent } .navbar-default .navbar-toggle { border-color: #ddd } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #ddd } .navbar-default .navbar-toggle .icon-bar { background-color: #888 } .navbar-default .navbar-collapse, .navbar-default .navbar-form { border-color: #e7e7e7 } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #e7e7e7; color: #555 } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777 } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #ccc; background-color: transparent } } .navbar-default .navbar-link { color: #777 } .navbar-default .navbar-link:hover { color: #333 } .navbar-default .btn-link { color: #777 } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { color: #333 } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { color: #ccc } .navbar-inverse { background-color: #222; border-color: #080808 } .navbar-inverse .navbar-brand { color: #9d9d9d } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-text { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { color: #444; background-color: transparent } .navbar-inverse .navbar-toggle { border-color: #333 } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { background-color: #333 } .navbar-inverse .navbar-toggle .icon-bar { background-color: #fff } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { border-color: #101010 } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background-color: #080808; color: #fff } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu .divider { background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #444; background-color: transparent } } .navbar-inverse .navbar-link { color: #9d9d9d } .navbar-inverse .navbar-link:hover { color: #fff } .navbar-inverse .btn-link { color: #9d9d9d } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { color: #fff } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { color: #444 } .breadcrumb { padding: 8px 15px; margin-bottom: 20px; list-style: none; background-color: #f5f5f5; border-radius: 4px } .breadcrumb > li { display: inline-block } .breadcrumb > li + li:before { content: "/\00a0"; padding: 0 5px; color: #ccc } .breadcrumb > .active { color: #777 } .pagination { display: inline-block; padding-left: 0; margin: 20px 0; border-radius: 4px } .pagination > li { display: inline } .pagination > li > a, .pagination > li > span { position: relative; float: left; padding: 6px 12px; line-height: 1.42857143; text-decoration: none; color: #337ab7; background-color: #fff; border: 1px solid #ddd; margin-left: -1px } .pagination > li:first-child > a, .pagination > li:first-child > span { margin-left: 0; border-bottom-left-radius: 4px; border-top-left-radius: 4px } .pagination > li:last-child > a, .pagination > li:last-child > span { border-bottom-right-radius: 4px; border-top-right-radius: 4px } .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { z-index: 3; color: #23527c; background-color: #eee; border-color: #ddd } .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7; cursor: default } .pagination > .disabled > span, .pagination > .disabled > span:hover, .pagination > .disabled > span:focus, .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { color: #777; background-color: #fff; border-color: #ddd; cursor: not-allowed } .pagination-lg > li > a, .pagination-lg > li > span { padding: 10px 16px; font-size: 18px; line-height: 1.3333333 } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; border-top-left-radius: 6px } .pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span { border-bottom-right-radius: 6px; border-top-right-radius: 6px } .pagination-sm > li > a, .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; line-height: 1.5 } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { border-bottom-left-radius: 3px; border-top-left-radius: 3px } .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span { border-bottom-right-radius: 3px; border-top-right-radius: 3px } .pager { padding-left: 0; margin: 20px 0; list-style: none; text-align: center } .pager li { display: inline } .pager li > a, .pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; border-radius: 15px } .pager li > a:hover, .pager li > a:focus { text-decoration: none; background-color: #eee } .pager .next > a, .pager .next > span { float: right } .pager .previous > a, .pager .previous > span { float: left } .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { color: #777; background-color: #fff; cursor: not-allowed } .label { display: inline; padding: .2em .6em .3em; font-size: 75%; font-weight: bold; line-height: 1; color: #fff; text-align: center; white-space: nowrap; vertical-align: baseline; border-radius: .25em } a.label:hover, a.label:focus { color: #fff; text-decoration: none; cursor: pointer } .label:empty { display: none } .btn .label { position: relative; top: -1px } .label-default { background-color: #777 } .label-default[href]:hover, .label-default[href]:focus { background-color: #5e5e5e } .label-primary { background-color: #337ab7 } .label-primary[href]:hover, .label-primary[href]:focus { background-color: #286090 } .label-success { background-color: #5cb85c } .label-success[href]:hover, .label-success[href]:focus { background-color: #449d44 } .label-info { background-color: #5bc0de } .label-info[href]:hover, .label-info[href]:focus { background-color: #31b0d5 } .label-warning { background-color: #f0ad4e } .label-warning[href]:hover, .label-warning[href]:focus { background-color: #ec971f } .label-danger { background-color: #d9534f } .label-danger[href]:hover, .label-danger[href]:focus { background-color: #c9302c } .badge { display: inline-block; min-width: 10px; padding: 3px 7px; font-size: 12px; font-weight: bold; color: #fff; line-height: 1; vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777; border-radius: 10px } .badge:empty { display: none } .btn .badge { position: relative; top: -1px } .btn-xs .badge, .btn-group-xs > .btn .badge { top: 0; padding: 1px 5px } a.badge:hover, a.badge:focus { color: #fff; text-decoration: none; cursor: pointer } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #337ab7; background-color: #fff } .list-group-item > .badge { float: right } .list-group-item > .badge + .badge { margin-right: 5px } .nav-pills > li > a > .badge { margin-left: 3px } .jumbotron { padding-top: 30px; padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eee } .jumbotron h1, .jumbotron .h1 { color: inherit } .jumbotron p { margin-bottom: 15px; font-size: 21px; font-weight: 200 } .jumbotron > hr { border-top-color: #d5d5d5 } .container .jumbotron, .container-fluid .jumbotron { border-radius: 6px } .jumbotron .container { max-width: 100% } @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; padding-bottom: 48px } .container .jumbotron, .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px } .jumbotron h1, .jumbotron .h1 { font-size: 63px } } .thumbnail { display: block; padding: 4px; margin-bottom: 20px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: border .2s ease-in-out; -o-transition: border .2s ease-in-out; transition: border .2s ease-in-out } .thumbnail > img, .thumbnail a > img { margin-left: auto; margin-right: auto } a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { border-color: #337ab7 } .thumbnail .caption { padding: 9px; color: #333 } .alert { padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 4px } .alert h4 { margin-top: 0; color: inherit } .alert .alert-link { font-weight: bold } .alert > p, .alert > ul { margin-bottom: 0 } .alert > p + p { margin-top: 5px } .alert-dismissable, .alert-dismissible { padding-right: 35px } .alert-dismissable .close, .alert-dismissible .close { position: relative; top: -2px; right: -21px; color: inherit } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #3c763d } .alert-success hr { border-top-color: #c9e2b3 } .alert-success .alert-link { color: #2b542c } .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #31708f } .alert-info hr { border-top-color: #a6e1ec } .alert-info .alert-link { color: #245269 } .alert-warning { background-color: #fcf8e3; border-color: #faebcc; color: #8a6d3b } .alert-warning hr { border-top-color: #f7e1b5 } .alert-warning .alert-link { color: #66512c } .alert-danger { background-color: #f2dede; border-color: #ebccd1; color: #a94442 } .alert-danger hr { border-top-color: #e4b9c0 } .alert-danger .alert-link { color: #843534 } @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @-o-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } .progress { overflow: hidden; height: 20px; margin-bottom: 20px; background-color: #f5f5f5; border-radius: 4px; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1) } .progress-bar { float: left; width: 0%; height: 100%; font-size: 12px; line-height: 20px; color: #fff; text-align: center; background-color: #337ab7; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width .6s ease; -o-transition: width .6s ease; transition: width .6s ease } .progress-striped .progress-bar, .progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px } .progress.active .progress-bar, .progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite } .progress-bar-success { background-color: #5cb85c } .progress-striped .progress-bar-success { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-info { background-color: #5bc0de } .progress-striped .progress-bar-info { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-warning { background-color: #f0ad4e } .progress-striped .progress-bar-warning { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-danger { background-color: #d9534f } .progress-striped .progress-bar-danger { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .media { margin-top: 15px } .media:first-child { margin-top: 0 } .media, .media-body { zoom: 1; overflow: hidden } .media-body { width: 10000px } .media-object { display: block } .media-object.img-thumbnail { max-width: none } .media-right, .media > .pull-right { padding-left: 10px } .media-left, .media > .pull-left { padding-right: 10px } .media-left, .media-right, .media-body { display: table-cell; vertical-align: top } .media-middle { vertical-align: middle } .media-bottom { vertical-align: bottom } .media-heading { margin-top: 0; margin-bottom: 5px } .media-list { padding-left: 0; list-style: none } .list-group { margin-bottom: 20px; padding-left: 0 } .list-group-item { position: relative; display: block; padding: 10px 15px; margin-bottom: -1px; background-color: #fff; border: 1px solid #ddd } .list-group-item:first-child { border-top-right-radius: 4px; border-top-left-radius: 4px } .list-group-item:last-child { margin-bottom: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px } a.list-group-item, button.list-group-item { color: #555 } a.list-group-item .list-group-item-heading, button.list-group-item .list-group-item-heading { color: #333 } a.list-group-item:hover, button.list-group-item:hover, a.list-group-item:focus, button.list-group-item:focus { text-decoration: none; color: #555; background-color: #f5f5f5 } button.list-group-item { width: 100%; text-align: left } .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { background-color: #eee; color: #777; cursor: not-allowed } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, .list-group-item.disabled:focus .list-group-item-heading { color: inherit } .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { color: #777 } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7 } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, .list-group-item.active:focus .list-group-item-heading, .list-group-item.active .list-group-item-heading > small, .list-group-item.active:hover .list-group-item-heading > small, .list-group-item.active:focus .list-group-item-heading > small, .list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading > .small, .list-group-item.active:focus .list-group-item-heading > .small { color: inherit } .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { color: #c7ddef } .list-group-item-success { color: #3c763d; background-color: #dff0d8 } a.list-group-item-success, button.list-group-item-success { color: #3c763d } a.list-group-item-success .list-group-item-heading, button.list-group-item-success .list-group-item-heading { color: inherit } a.list-group-item-success:hover, button.list-group-item-success:hover, a.list-group-item-success:focus, button.list-group-item-success:focus { color: #3c763d; background-color: #d0e9c6 } a.list-group-item-success.active, button.list-group-item-success.active, a.list-group-item-success.active:hover, button.list-group-item-success.active:hover, a.list-group-item-success.active:focus, button.list-group-item-success.active:focus { color: #fff; background-color: #3c763d; border-color: #3c763d } .list-group-item-info { color: #31708f; background-color: #d9edf7 } a.list-group-item-info, button.list-group-item-info { color: #31708f } a.list-group-item-info .list-group-item-heading, button.list-group-item-info .list-group-item-heading { color: inherit } a.list-group-item-info:hover, button.list-group-item-info:hover, a.list-group-item-info:focus, button.list-group-item-info:focus { color: #31708f; background-color: #c4e3f3 } a.list-group-item-info.active, button.list-group-item-info.active, a.list-group-item-info.active:hover, button.list-group-item-info.active:hover, a.list-group-item-info.active:focus, button.list-group-item-info.active:focus { color: #fff; background-color: #31708f; border-color: #31708f } .list-group-item-warning { color: #8a6d3b; background-color: #fcf8e3 } a.list-group-item-warning, button.list-group-item-warning { color: #8a6d3b } a.list-group-item-warning .list-group-item-heading, button.list-group-item-warning .list-group-item-heading { color: inherit } a.list-group-item-warning:hover, button.list-group-item-warning:hover, a.list-group-item-warning:focus, button.list-group-item-warning:focus { color: #8a6d3b; background-color: #faf2cc } a.list-group-item-warning.active, button.list-group-item-warning.active, a.list-group-item-warning.active:hover, button.list-group-item-warning.active:hover, a.list-group-item-warning.active:focus, button.list-group-item-warning.active:focus { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b } .list-group-item-danger { color: #a94442; background-color: #f2dede } a.list-group-item-danger, button.list-group-item-danger { color: #a94442 } a.list-group-item-danger .list-group-item-heading, button.list-group-item-danger .list-group-item-heading { color: inherit } a.list-group-item-danger:hover, button.list-group-item-danger:hover, a.list-group-item-danger:focus, button.list-group-item-danger:focus { color: #a94442; background-color: #ebcccc } a.list-group-item-danger.active, button.list-group-item-danger.active, a.list-group-item-danger.active:hover, button.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus, button.list-group-item-danger.active:focus { color: #fff; background-color: #a94442; border-color: #a94442 } .list-group-item-heading { margin-top: 0; margin-bottom: 5px } .list-group-item-text { margin-bottom: 0; line-height: 1.3 } .panel { margin-bottom: 20px; background-color: #fff; border: 1px solid transparent; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) } .panel-body { padding: 15px } .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel-heading > .dropdown .dropdown-toggle { color: inherit } .panel-title { margin-top: 0; margin-bottom: 0; font-size: 16px; color: inherit } .panel-title > a, .panel-title > small, .panel-title > .small, .panel-title > small > a, .panel-title > .small > a { color: inherit } .panel-footer { padding: 10px 15px; background-color: #f5f5f5; border-top: 1px solid #ddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .list-group, .panel > .panel-collapse > .list-group { margin-bottom: 0 } .panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item { border-width: 1px 0; border-radius: 0 } .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { border-bottom: 0; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0 } .list-group + .panel-footer { border-top-width: 0 } .panel > .table, .panel > .table-responsive > .table, .panel > .panel-collapse > .table { margin-bottom: 0 } .panel > .table caption, .panel > .table-responsive > .table caption, .panel > .panel-collapse > .table caption { padding-left: 15px; padding-right: 15px } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { border-top-right-radius: 3px } .panel > .table:last-child, .panel > .table-responsive:last-child > .table:last-child { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { border-bottom-right-radius: 3px } .panel > .panel-body + .table, .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { border-top: 1px solid #ddd } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { border-top: 0 } .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0 } .panel > .table-bordered > thead > tr > th:first-child, .panel > .table-responsive > .table-bordered > thead > tr > th:first-child, .panel > .table-bordered > tbody > tr > th:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, .panel > .table-bordered > tfoot > tr > th:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, .panel > .table-bordered > thead > tr > td:first-child, .panel > .table-responsive > .table-bordered > thead > tr > td:first-child, .panel > .table-bordered > tbody > tr > td:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, .panel > .table-bordered > tfoot > tr > td:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .panel > .table-bordered > thead > tr > th:last-child, .panel > .table-responsive > .table-bordered > thead > tr > th:last-child, .panel > .table-bordered > tbody > tr > th:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, .panel > .table-bordered > tfoot > tr > th:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, .panel > .table-bordered > thead > tr > td:last-child, .panel > .table-responsive > .table-bordered > thead > tr > td:last-child, .panel > .table-bordered > tbody > tr > td:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, .panel > .table-bordered > tfoot > tr > td:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .panel > .table-bordered > thead > tr:first-child > td, .panel > .table-responsive > .table-bordered > thead > tr:first-child > td, .panel > .table-bordered > tbody > tr:first-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, .panel > .table-bordered > thead > tr:first-child > th, .panel > .table-responsive > .table-bordered > thead > tr:first-child > th, .panel > .table-bordered > tbody > tr:first-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { border-bottom: 0 } .panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tfoot > tr:last-child > td, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, .panel > .table-bordered > tfoot > tr:last-child > th, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { border-bottom: 0 } .panel > .table-responsive { border: 0; margin-bottom: 0 } .panel-group { margin-bottom: 20px } .panel-group .panel { margin-bottom: 0; border-radius: 4px } .panel-group .panel + .panel { margin-top: 5px } .panel-group .panel-heading { border-bottom: 0 } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #ddd } .panel-group .panel-footer { border-top: 0 } .panel-group .panel-footer + .panel-collapse .panel-body { border-bottom: 1px solid #ddd } .panel-default { border-color: #ddd } .panel-default > .panel-heading { color: #333; background-color: #f5f5f5; border-color: #ddd } .panel-default > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ddd } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #333 } .panel-default > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ddd } .panel-primary { border-color: #337ab7 } .panel-primary > .panel-heading { color: #fff; background-color: #337ab7; border-color: #337ab7 } .panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #337ab7 } .panel-primary > .panel-heading .badge { color: #337ab7; background-color: #fff } .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #337ab7 } .panel-success { border-color: #d6e9c6 } .panel-success > .panel-heading { color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6 } .panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #d6e9c6 } .panel-success > .panel-heading .badge { color: #dff0d8; background-color: #3c763d } .panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #d6e9c6 } .panel-info { border-color: #bce8f1 } .panel-info > .panel-heading { color: #31708f; background-color: #d9edf7; border-color: #bce8f1 } .panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #bce8f1 } .panel-info > .panel-heading .badge { color: #d9edf7; background-color: #31708f } .panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #bce8f1 } .panel-warning { border-color: #faebcc } .panel-warning > .panel-heading { color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc } .panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #faebcc } .panel-warning > .panel-heading .badge { color: #fcf8e3; background-color: #8a6d3b } .panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #faebcc } .panel-danger { border-color: #ebccd1 } .panel-danger > .panel-heading { color: #a94442; background-color: #f2dede; border-color: #ebccd1 } .panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ebccd1 } .panel-danger > .panel-heading .badge { color: #f2dede; background-color: #a94442 } .panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ebccd1 } .embed-responsive { position: relative; display: block; height: 0; padding: 0; overflow: hidden } .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, .embed-responsive object, .embed-responsive video { position: absolute; top: 0; left: 0; bottom: 0; height: 100%; width: 100%; border: 0 } .embed-responsive-16by9 { padding-bottom: 56.25% } .embed-responsive-4by3 { padding-bottom: 75% } .well { min-height: 20px; padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #e3e3e3; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05) } .well blockquote { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15) } .well-lg { padding: 24px; border-radius: 6px } .well-sm { padding: 9px; border-radius: 3px } .close { float: right; font-size: 21px; font-weight: bold; line-height: 1; color: #000; text-shadow: 0 1px 0 #fff; opacity: .2; filter: alpha(opacity=20) } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; opacity: .5; filter: alpha(opacity=50) } button.close { padding: 0; cursor: pointer; background: transparent; border: 0; -webkit-appearance: none } .modal-open { overflow: hidden } .modal { display: none; overflow: hidden; position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1050; -webkit-overflow-scrolling: touch; outline: 0 } .modal.fade .modal-dialog { -webkit-transform: translate(0, -25%); -ms-transform: translate(0, -25%); -o-transform: translate(0, -25%); transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -ms-transform: translate(0, 0); -o-transform: translate(0, 0); transform: translate(0, 0) } .modal-open .modal { overflow-x: hidden; overflow-y: auto } .modal-dialog { position: relative; width: auto; margin: 10px } .modal-content { position: relative; background-color: #fff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); -webkit-background-clip: padding-box; background-clip: padding-box; outline: 0 } .modal-backdrop { position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1040; background-color: #000 } .modal-backdrop.fade { opacity: 0; filter: alpha(opacity=0) } .modal-backdrop.in { opacity: .5; filter: alpha(opacity=50) } .modal-header { padding: 15px; border-bottom: 1px solid #e5e5e5; min-height: 16.42857143px } .modal-header .close { margin-top: -2px } .modal-title { margin: 0; line-height: 1.42857143 } .modal-body { position: relative; padding: 15px } .modal-footer { padding: 15px; text-align: right; border-top: 1px solid #e5e5e5 } .modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0 } .modal-footer .btn-group .btn + .btn { margin-left: -1px } .modal-footer .btn-block + .btn-block { margin-left: 0 } .modal-scrollbar-measure { position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll } @media (min-width: 768px) { .modal-dialog { width: 600px; margin: 30px auto } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5) } .modal-sm { width: 300px } } @media (min-width: 992px) { .modal-lg { width: 900px } } .tooltip { position: absolute; z-index: 1070; display: block; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 12px; opacity: 0; filter: alpha(opacity=0) } .tooltip.in { opacity: .9; filter: alpha(opacity=90) } .tooltip.top { margin-top: -3px; padding: 5px 0 } .tooltip.right { margin-left: 3px; padding: 0 5px } .tooltip.bottom { margin-top: 3px; padding: 5px 0 } .tooltip.left { margin-left: -3px; padding: 0 5px } .tooltip-inner { max-width: 200px; padding: 3px 8px; color: #fff; text-align: center; background-color: #000; border-radius: 4px } .tooltip-arrow { position: absolute; width: 0; height: 0; border-color: transparent; border-style: solid } .tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-left .tooltip-arrow { bottom: 0; right: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-right .tooltip-arrow { bottom: 0; left: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; border-right-color: #000 } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; border-left-color: #000 } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-left .tooltip-arrow { top: 0; right: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-right .tooltip-arrow { top: 0; left: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .popover { position: absolute; top: 0; left: 0; z-index: 1060; display: none; max-width: 276px; padding: 1px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 14px; background-color: #fff; -webkit-background-clip: padding-box; background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) } .popover.top { margin-top: -10px } .popover.right { margin-left: 10px } .popover.bottom { margin-top: 10px } .popover.left { margin-left: -10px } .popover-title { margin: 0; padding: 8px 14px; font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; border-radius: 5px 5px 0 0 } .popover-content { padding: 9px 14px } .popover > .arrow, .popover > .arrow:after { position: absolute; display: block; width: 0; height: 0; border-color: transparent; border-style: solid } .popover > .arrow { border-width: 11px } .popover > .arrow:after { border-width: 10px; content: "" } .popover.top > .arrow { left: 50%; margin-left: -11px; border-bottom-width: 0; border-top-color: #999; border-top-color: rgba(0, 0, 0, 0.25); bottom: -11px } .popover.top > .arrow:after { content: " "; bottom: 1px; margin-left: -10px; border-bottom-width: 0; border-top-color: #fff } .popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; border-left-width: 0; border-right-color: #999; border-right-color: rgba(0, 0, 0, 0.25) } .popover.right > .arrow:after { content: " "; left: 1px; bottom: -10px; border-left-width: 0; border-right-color: #fff } .popover.bottom > .arrow { left: 50%; margin-left: -11px; border-top-width: 0; border-bottom-color: #999; border-bottom-color: rgba(0, 0, 0, 0.25); top: -11px } .popover.bottom > .arrow:after { content: " "; top: 1px; margin-left: -10px; border-top-width: 0; border-bottom-color: #fff } .popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; border-right-width: 0; border-left-color: #999; border-left-color: rgba(0, 0, 0, 0.25) } .popover.left > .arrow:after { content: " "; right: 1px; border-right-width: 0; border-left-color: #fff; bottom: -10px } .carousel { position: relative } .carousel-inner { position: relative; overflow: hidden; width: 100% } .carousel-inner > .item { display: none; position: relative; -webkit-transition: .6s ease-in-out left; -o-transition: .6s ease-in-out left; transition: .6s ease-in-out left } .carousel-inner > .item > img, .carousel-inner > .item > a > img { line-height: 1 } @media all and (transform-3d),(-webkit-transform-3d) { .carousel-inner > .item { -webkit-transition: -webkit-transform 0.6s ease-in-out; -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; perspective: 1000px } .carousel-inner > .item.next, .carousel-inner > .item.active.right { -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0 } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0 } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0 } } .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { display: block } .carousel-inner > .active { left: 0 } .carousel-inner > .next, .carousel-inner > .prev { position: absolute; top: 0; width: 100% } .carousel-inner > .next { left: 100% } .carousel-inner > .prev { left: -100% } .carousel-inner > .next.left, .carousel-inner > .prev.right { left: 0 } .carousel-inner > .active.left { left: -100% } .carousel-inner > .active.right { left: 100% } .carousel-control { position: absolute; top: 0; left: 0; bottom: 0; width: 15%; opacity: .5; filter: alpha(opacity=50); font-size: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-control.left { background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1) } .carousel-control.right { left: auto; right: 0; background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1) } .carousel-control:hover, .carousel-control:focus { outline: 0; color: #fff; text-decoration: none; opacity: .9; filter: alpha(opacity=90) } .carousel-control .icon-prev, .carousel-control .icon-next, .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; margin-top: -10px; z-index: 5; display: inline-block } .carousel-control .icon-prev, .carousel-control .glyphicon-chevron-left { left: 50%; margin-left: -10px } .carousel-control .icon-next, .carousel-control .glyphicon-chevron-right { right: 50%; margin-right: -10px } .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; height: 20px; line-height: 1; font-family: serif } .carousel-control .icon-prev:before { content: '\2039' } .carousel-control .icon-next:before { content: '\203a' } .carousel-indicators { position: absolute; bottom: 10px; left: 50%; z-index: 15; width: 60%; margin-left: -30%; padding-left: 0; list-style: none; text-align: center } .carousel-indicators li { display: inline-block; width: 10px; height: 10px; margin: 1px; text-indent: -999px; border: 1px solid #fff; border-radius: 10px; cursor: pointer; background-color: #000 \9; background-color: rgba(0, 0, 0, 0) } .carousel-indicators .active { margin: 0; width: 12px; height: 12px; background-color: #fff } .carousel-caption { position: absolute; left: 15%; right: 15%; bottom: 20px; z-index: 10; padding-top: 20px; padding-bottom: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-caption .btn { text-shadow: none } @media screen and (min-width: 768px) { .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; height: 30px; margin-top: -15px; font-size: 30px } .carousel-control .glyphicon-chevron-left, .carousel-control .icon-prev { margin-left: -15px } .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { margin-right: -15px } .carousel-caption { left: 20%; right: 20%; padding-bottom: 30px } .carousel-indicators { bottom: 20px } } .clearfix:before, .clearfix:after, .dl-horizontal dd:before, .dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, .container-fluid:after, .row:before, .row:after, .form-horizontal .form-group:before, .form-horizontal .form-group:after, .btn-toolbar:before, .btn-toolbar:after, .btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after, .nav:before, .nav:after, .navbar:before, .navbar:after, .navbar-header:before, .navbar-header:after, .navbar-collapse:before, .navbar-collapse:after, .pager:before, .pager:after, .panel-body:before, .panel-body:after, .modal-footer:before, .modal-footer:after { content: " "; display: table } .clearfix:after, .dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, .form-horizontal .form-group:after, .btn-toolbar:after, .btn-group-vertical > .btn-group:after, .nav:after, .navbar:after, .navbar-header:after, .navbar-collapse:after, .pager:after, .panel-body:after, .modal-footer:after { clear: both } .center-block { display: block; margin-left: auto; margin-right: auto } .pull-right { float: right !important } .pull-left { float: left !important } .hide { display: none !important } .show { display: block !important } .invisible { visibility: hidden } .text-hide { font: 0/0 a; color: transparent; text-shadow: none; background-color: transparent; border: 0 } .hidden { display: none !important } .affix { position: fixed } @-ms-viewport { width: device-width } .visible-xs, .visible-sm, .visible-md, .visible-lg { display: none !important } .visible-xs-block, .visible-xs-inline, .visible-xs-inline-block, .visible-sm-block, .visible-sm-inline, .visible-sm-inline-block, .visible-md-block, .visible-md-inline, .visible-md-inline-block, .visible-lg-block, .visible-lg-inline, .visible-lg-inline-block { display: none !important } @media (max-width: 767px) { .visible-xs { display: block !important } table.visible-xs { display: table !important } tr.visible-xs { display: table-row !important } th.visible-xs, td.visible-xs { display: table-cell !important } } @media (max-width: 767px) { .visible-xs-block { display: block !important } } @media (max-width: 767px) { .visible-xs-inline { display: inline !important } } @media (max-width: 767px) { .visible-xs-inline-block { display: inline-block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important } table.visible-sm { display: table !important } tr.visible-sm { display: table-row !important } th.visible-sm, td.visible-sm { display: table-cell !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-block { display: block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline { display: inline !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline-block { display: inline-block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important } table.visible-md { display: table !important } tr.visible-md { display: table-row !important } th.visible-md, td.visible-md { display: table-cell !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-block { display: block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline { display: inline !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline-block { display: inline-block !important } } @media (min-width: 1200px) { .visible-lg { display: block !important } table.visible-lg { display: table !important } tr.visible-lg { display: table-row !important } th.visible-lg, td.visible-lg { display: table-cell !important } } @media (min-width: 1200px) { .visible-lg-block { display: block !important } } @media (min-width: 1200px) { .visible-lg-inline { display: inline !important } } @media (min-width: 1200px) { .visible-lg-inline-block { display: inline-block !important } } @media (max-width: 767px) { .hidden-xs { display: none !important } } @media (min-width: 768px) and (max-width: 991px) { .hidden-sm { display: none !important } } @media (min-width: 992px) and (max-width: 1199px) { .hidden-md { display: none !important } } @media (min-width: 1200px) { .hidden-lg { display: none !important } } .visible-print { display: none !important } @media print { .visible-print { display: block !important } table.visible-print { display: table !important } tr.visible-print { display: table-row !important } th.visible-print, td.visible-print { display: table-cell !important } } .visible-print-block { display: none !important } @media print { .visible-print-block { display: block !important } } .visible-print-inline { display: none !important } @media print { .visible-print-inline { display: inline !important } } .visible-print-inline-block { display: none !important } @media print { .visible-print-inline-block { display: inline-block !important } } @media print { .hidden-print { display: none !important } }
/*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! * Generated using the Bootstrap Customizer (http://v3.bootcss.com/customize/?id=822d18dc2e4e823a577b) * Config saved to config.json and https://gist.github.com/822d18dc2e4e823a577b *//*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100% } body { margin: 0 } article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block } audio, canvas, progress, video { display: inline-block; vertical-align: baseline } audio:not([controls]) { display: none; height: 0 } [hidden], template { display: none } a { background-color: transparent } a:active, a:hover { outline: 0 } abbr[title] { border-bottom: 1px dotted } b, strong { font-weight: bold } dfn { font-style: italic } h1 { font-size: 2em; margin: 0.67em 0 } mark { background: #ff0; color: #000 } small { font-size: 80% } sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline } sup { top: -0.5em } sub { bottom: -0.25em } img { border: 0 } svg:not(:root) { overflow: hidden } figure { margin: 1em 40px } hr { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; height: 0 } pre { overflow: auto } code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em } button, input, optgroup, select, textarea { color: inherit; font: inherit; margin: 0 } button { overflow: visible } button, select { text-transform: none } button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; cursor: pointer } button[disabled], html input[disabled] { cursor: default } button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0 } input { line-height: normal } input[type="checkbox"], input[type="radio"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; padding: 0 } input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto } input[type="search"] { -webkit-appearance: textfield; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none } fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em } legend { border: 0; padding: 0 } textarea { overflow: auto } optgroup { font-weight: bold } table { border-collapse: collapse; border-spacing: 0 } td, th { padding: 0 } /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { *, *:before, *:after { background: transparent !important; color: #000 !important; -webkit-box-shadow: none !important; box-shadow: none !important; text-shadow: none !important } a, a:visited { text-decoration: underline } a[href]:after { content: " (" attr(href) ")" } abbr[title]:after { content: " (" attr(title) ")" } a[href^="#"]:after, a[href^="javascript:"]:after { content: "" } pre, blockquote { border: 1px solid #999; page-break-inside: avoid } thead { display: table-header-group } tr, img { page-break-inside: avoid } img { max-width: 100% !important } p, h2, h3 { orphans: 3; widows: 3 } h2, h3 { page-break-after: avoid } .navbar { display: none } .btn > .caret, .dropup > .btn > .caret { border-top-color: #000 !important } .label { border: 1px solid #000 } .table { border-collapse: collapse !important } .table td, .table th { background-color: #fff !important } .table-bordered th, .table-bordered td { border: 1px solid #ddd !important } } @font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg') } .glyphicon { position: relative; top: 1px; display: inline-block; font-family: 'Glyphicons Halflings'; font-style: normal; font-weight: normal; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale } .glyphicon-asterisk:before { content: "\2a" } .glyphicon-plus:before { content: "\2b" } .glyphicon-euro:before, .glyphicon-eur:before { content: "\20ac" } .glyphicon-minus:before { content: "\2212" } .glyphicon-cloud:before { content: "\2601" } .glyphicon-envelope:before { content: "\2709" } .glyphicon-pencil:before { content: "\270f" } .glyphicon-glass:before { content: "\e001" } .glyphicon-music:before { content: "\e002" } .glyphicon-search:before { content: "\e003" } .glyphicon-heart:before { content: "\e005" } .glyphicon-star:before { content: "\e006" } .glyphicon-star-empty:before { content: "\e007" } .glyphicon-user:before { content: "\e008" } .glyphicon-film:before { content: "\e009" } .glyphicon-th-large:before { content: "\e010" } .glyphicon-th:before { content: "\e011" } .glyphicon-th-list:before { content: "\e012" } .glyphicon-ok:before { content: "\e013" } .glyphicon-remove:before { content: "\e014" } .glyphicon-zoom-in:before { content: "\e015" } .glyphicon-zoom-out:before { content: "\e016" } .glyphicon-off:before { content: "\e017" } .glyphicon-signal:before { content: "\e018" } .glyphicon-cog:before { content: "\e019" } .glyphicon-trash:before { content: "\e020" } .glyphicon-home:before { content: "\e021" } .glyphicon-file:before { content: "\e022" } .glyphicon-time:before { content: "\e023" } .glyphicon-road:before { content: "\e024" } .glyphicon-download-alt:before { content: "\e025" } .glyphicon-download:before { content: "\e026" } .glyphicon-upload:before { content: "\e027" } .glyphicon-inbox:before { content: "\e028" } .glyphicon-play-circle:before { content: "\e029" } .glyphicon-repeat:before { content: "\e030" } .glyphicon-refresh:before { content: "\e031" } .glyphicon-list-alt:before { content: "\e032" } .glyphicon-lock:before { content: "\e033" } .glyphicon-flag:before { content: "\e034" } .glyphicon-headphones:before { content: "\e035" } .glyphicon-volume-off:before { content: "\e036" } .glyphicon-volume-down:before { content: "\e037" } .glyphicon-volume-up:before { content: "\e038" } .glyphicon-qrcode:before { content: "\e039" } .glyphicon-barcode:before { content: "\e040" } .glyphicon-tag:before { content: "\e041" } .glyphicon-tags:before { content: "\e042" } .glyphicon-book:before { content: "\e043" } .glyphicon-bookmark:before { content: "\e044" } .glyphicon-print:before { content: "\e045" } .glyphicon-camera:before { content: "\e046" } .glyphicon-font:before { content: "\e047" } .glyphicon-bold:before { content: "\e048" } .glyphicon-italic:before { content: "\e049" } .glyphicon-text-height:before { content: "\e050" } .glyphicon-text-width:before { content: "\e051" } .glyphicon-align-left:before { content: "\e052" } .glyphicon-align-center:before { content: "\e053" } .glyphicon-align-right:before { content: "\e054" } .glyphicon-align-justify:before { content: "\e055" } .glyphicon-list:before { content: "\e056" } .glyphicon-indent-left:before { content: "\e057" } .glyphicon-indent-right:before { content: "\e058" } .glyphicon-facetime-video:before { content: "\e059" } .glyphicon-picture:before { content: "\e060" } .glyphicon-map-marker:before { content: "\e062" } .glyphicon-adjust:before { content: "\e063" } .glyphicon-tint:before { content: "\e064" } .glyphicon-edit:before { content: "\e065" } .glyphicon-share:before { content: "\e066" } .glyphicon-check:before { content: "\e067" } .glyphicon-move:before { content: "\e068" } .glyphicon-step-backward:before { content: "\e069" } .glyphicon-fast-backward:before { content: "\e070" } .glyphicon-backward:before { content: "\e071" } .glyphicon-play:before { content: "\e072" } .glyphicon-pause:before { content: "\e073" } .glyphicon-stop:before { content: "\e074" } .glyphicon-forward:before { content: "\e075" } .glyphicon-fast-forward:before { content: "\e076" } .glyphicon-step-forward:before { content: "\e077" } .glyphicon-eject:before { content: "\e078" } .glyphicon-chevron-left:before { content: "\e079" } .glyphicon-chevron-right:before { content: "\e080" } .glyphicon-plus-sign:before { content: "\e081" } .glyphicon-minus-sign:before { content: "\e082" } .glyphicon-remove-sign:before { content: "\e083" } .glyphicon-ok-sign:before { content: "\e084" } .glyphicon-question-sign:before { content: "\e085" } .glyphicon-info-sign:before { content: "\e086" } .glyphicon-screenshot:before { content: "\e087" } .glyphicon-remove-circle:before { content: "\e088" } .glyphicon-ok-circle:before { content: "\e089" } .glyphicon-ban-circle:before { content: "\e090" } .glyphicon-arrow-left:before { content: "\e091" } .glyphicon-arrow-right:before { content: "\e092" } .glyphicon-arrow-up:before { content: "\e093" } .glyphicon-arrow-down:before { content: "\e094" } .glyphicon-share-alt:before { content: "\e095" } .glyphicon-resize-full:before { content: "\e096" } .glyphicon-resize-small:before { content: "\e097" } .glyphicon-exclamation-sign:before { content: "\e101" } .glyphicon-gift:before { content: "\e102" } .glyphicon-leaf:before { content: "\e103" } .glyphicon-fire:before { content: "\e104" } .glyphicon-eye-open:before { content: "\e105" } .glyphicon-eye-close:before { content: "\e106" } .glyphicon-warning-sign:before { content: "\e107" } .glyphicon-plane:before { content: "\e108" } .glyphicon-calendar:before { content: "\e109" } .glyphicon-random:before { content: "\e110" } .glyphicon-comment:before { content: "\e111" } .glyphicon-magnet:before { content: "\e112" } .glyphicon-chevron-up:before { content: "\e113" } .glyphicon-chevron-down:before { content: "\e114" } .glyphicon-retweet:before { content: "\e115" } .glyphicon-shopping-cart:before { content: "\e116" } .glyphicon-folder-close:before { content: "\e117" } .glyphicon-folder-open:before { content: "\e118" } .glyphicon-resize-vertical:before { content: "\e119" } .glyphicon-resize-horizontal:before { content: "\e120" } .glyphicon-hdd:before { content: "\e121" } .glyphicon-bullhorn:before { content: "\e122" } .glyphicon-bell:before { content: "\e123" } .glyphicon-certificate:before { content: "\e124" } .glyphicon-thumbs-up:before { content: "\e125" } .glyphicon-thumbs-down:before { content: "\e126" } .glyphicon-hand-right:before { content: "\e127" } .glyphicon-hand-left:before { content: "\e128" } .glyphicon-hand-up:before { content: "\e129" } .glyphicon-hand-down:before { content: "\e130" } .glyphicon-circle-arrow-right:before { content: "\e131" } .glyphicon-circle-arrow-left:before { content: "\e132" } .glyphicon-circle-arrow-up:before { content: "\e133" } .glyphicon-circle-arrow-down:before { content: "\e134" } .glyphicon-globe:before { content: "\e135" } .glyphicon-wrench:before { content: "\e136" } .glyphicon-tasks:before { content: "\e137" } .glyphicon-filter:before { content: "\e138" } .glyphicon-briefcase:before { content: "\e139" } .glyphicon-fullscreen:before { content: "\e140" } .glyphicon-dashboard:before { content: "\e141" } .glyphicon-paperclip:before { content: "\e142" } .glyphicon-heart-empty:before { content: "\e143" } .glyphicon-link:before { content: "\e144" } .glyphicon-phone:before { content: "\e145" } .glyphicon-pushpin:before { content: "\e146" } .glyphicon-usd:before { content: "\e148" } .glyphicon-gbp:before { content: "\e149" } .glyphicon-sort:before { content: "\e150" } .glyphicon-sort-by-alphabet:before { content: "\e151" } .glyphicon-sort-by-alphabet-alt:before { content: "\e152" } .glyphicon-sort-by-order:before { content: "\e153" } .glyphicon-sort-by-order-alt:before { content: "\e154" } .glyphicon-sort-by-attributes:before { content: "\e155" } .glyphicon-sort-by-attributes-alt:before { content: "\e156" } .glyphicon-unchecked:before { content: "\e157" } .glyphicon-expand:before { content: "\e158" } .glyphicon-collapse-down:before { content: "\e159" } .glyphicon-collapse-up:before { content: "\e160" } .glyphicon-log-in:before { content: "\e161" } .glyphicon-flash:before { content: "\e162" } .glyphicon-log-out:before { content: "\e163" } .glyphicon-new-window:before { content: "\e164" } .glyphicon-record:before { content: "\e165" } .glyphicon-save:before { content: "\e166" } .glyphicon-open:before { content: "\e167" } .glyphicon-saved:before { content: "\e168" } .glyphicon-import:before { content: "\e169" } .glyphicon-export:before { content: "\e170" } .glyphicon-send:before { content: "\e171" } .glyphicon-floppy-disk:before { content: "\e172" } .glyphicon-floppy-saved:before { content: "\e173" } .glyphicon-floppy-remove:before { content: "\e174" } .glyphicon-floppy-save:before { content: "\e175" } .glyphicon-floppy-open:before { content: "\e176" } .glyphicon-credit-card:before { content: "\e177" } .glyphicon-transfer:before { content: "\e178" } .glyphicon-cutlery:before { content: "\e179" } .glyphicon-header:before { content: "\e180" } .glyphicon-compressed:before { content: "\e181" } .glyphicon-earphone:before { content: "\e182" } .glyphicon-phone-alt:before { content: "\e183" } .glyphicon-tower:before { content: "\e184" } .glyphicon-stats:before { content: "\e185" } .glyphicon-sd-video:before { content: "\e186" } .glyphicon-hd-video:before { content: "\e187" } .glyphicon-subtitles:before { content: "\e188" } .glyphicon-sound-stereo:before { content: "\e189" } .glyphicon-sound-dolby:before { content: "\e190" } .glyphicon-sound-5-1:before { content: "\e191" } .glyphicon-sound-6-1:before { content: "\e192" } .glyphicon-sound-7-1:before { content: "\e193" } .glyphicon-copyright-mark:before { content: "\e194" } .glyphicon-registration-mark:before { content: "\e195" } .glyphicon-cloud-download:before { content: "\e197" } .glyphicon-cloud-upload:before { content: "\e198" } .glyphicon-tree-conifer:before { content: "\e199" } .glyphicon-tree-deciduous:before { content: "\e200" } .glyphicon-cd:before { content: "\e201" } .glyphicon-save-file:before { content: "\e202" } .glyphicon-open-file:before { content: "\e203" } .glyphicon-level-up:before { content: "\e204" } .glyphicon-copy:before { content: "\e205" } .glyphicon-paste:before { content: "\e206" } .glyphicon-alert:before { content: "\e209" } .glyphicon-equalizer:before { content: "\e210" } .glyphicon-king:before { content: "\e211" } .glyphicon-queen:before { content: "\e212" } .glyphicon-pawn:before { content: "\e213" } .glyphicon-bishop:before { content: "\e214" } .glyphicon-knight:before { content: "\e215" } .glyphicon-baby-formula:before { content: "\e216" } .glyphicon-tent:before { content: "\26fa" } .glyphicon-blackboard:before { content: "\e218" } .glyphicon-bed:before { content: "\e219" } .glyphicon-apple:before { content: "\f8ff" } .glyphicon-erase:before { content: "\e221" } .glyphicon-hourglass:before { content: "\231b" } .glyphicon-lamp:before { content: "\e223" } .glyphicon-duplicate:before { content: "\e224" } .glyphicon-piggy-bank:before { content: "\e225" } .glyphicon-scissors:before { content: "\e226" } .glyphicon-bitcoin:before { content: "\e227" } .glyphicon-btc:before { content: "\e227" } .glyphicon-xbt:before { content: "\e227" } .glyphicon-yen:before { content: "\00a5" } .glyphicon-jpy:before { content: "\00a5" } .glyphicon-ruble:before { content: "\20bd" } .glyphicon-rub:before { content: "\20bd" } .glyphicon-scale:before { content: "\e230" } .glyphicon-ice-lolly:before { content: "\e231" } .glyphicon-ice-lolly-tasted:before { content: "\e232" } .glyphicon-education:before { content: "\e233" } .glyphicon-option-horizontal:before { content: "\e234" } .glyphicon-option-vertical:before { content: "\e235" } .glyphicon-menu-hamburger:before { content: "\e236" } .glyphicon-modal-window:before { content: "\e237" } .glyphicon-oil:before { content: "\e238" } .glyphicon-grain:before { content: "\e239" } .glyphicon-sunglasses:before { content: "\e240" } .glyphicon-text-size:before { content: "\e241" } .glyphicon-text-color:before { content: "\e242" } .glyphicon-text-background:before { content: "\e243" } .glyphicon-object-align-top:before { content: "\e244" } .glyphicon-object-align-bottom:before { content: "\e245" } .glyphicon-object-align-horizontal:before { content: "\e246" } .glyphicon-object-align-left:before { content: "\e247" } .glyphicon-object-align-vertical:before { content: "\e248" } .glyphicon-object-align-right:before { content: "\e249" } .glyphicon-triangle-right:before { content: "\e250" } .glyphicon-triangle-left:before { content: "\e251" } .glyphicon-triangle-bottom:before { content: "\e252" } .glyphicon-triangle-top:before { content: "\e253" } .glyphicon-console:before { content: "\e254" } .glyphicon-superscript:before { content: "\e255" } .glyphicon-subscript:before { content: "\e256" } .glyphicon-menu-left:before { content: "\e257" } .glyphicon-menu-right:before { content: "\e258" } .glyphicon-menu-down:before { content: "\e259" } .glyphicon-menu-up:before { content: "\e260" } * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } *:before, *:after { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } html { font-size: 10px; -webkit-tap-highlight-color: rgba(0, 0, 0, 0) } body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; color: #333; background-color: #fff } input, button, select, textarea { font-family: inherit; font-size: inherit; line-height: inherit } a { color: #337ab7; text-decoration: none } a:hover, a:focus { color: #23527c; text-decoration: underline } a:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } figure { margin: 0 } img { vertical-align: middle } .img-responsive, .thumbnail > img, .thumbnail a > img, .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto } .img-rounded { border-radius: 6px } .img-thumbnail { padding: 4px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out; transition: all .2s ease-in-out; display: inline-block; max-width: 100%; height: auto } .img-circle { border-radius: 50% } hr { margin-top: 20px; margin-bottom: 20px; border: 0; border-top: 1px solid #eee } .sr-only { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0 } .sr-only-focusable:active, .sr-only-focusable:focus { position: static; width: auto; height: auto; margin: 0; overflow: visible; clip: auto } [role="button"] { cursor: pointer } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small, h1 .small, h2 .small, h3 .small, h4 .small, h5 .small, h6 .small, .h1 .small, .h2 .small, .h3 .small, .h4 .small, .h5 .small, .h6 .small { font-weight: normal; line-height: 1; color: #777 } h1, .h1, h2, .h2, h3, .h3 { margin-top: 20px; margin-bottom: 10px } h1 small, .h1 small, h2 small, .h2 small, h3 small, .h3 small, h1 .small, .h1 .small, h2 .small, .h2 .small, h3 .small, .h3 .small { font-size: 65% } h4, .h4, h5, .h5, h6, .h6 { margin-top: 10px; margin-bottom: 10px } h4 small, .h4 small, h5 small, .h5 small, h6 small, .h6 small, h4 .small, .h4 .small, h5 .small, .h5 .small, h6 .small, .h6 .small { font-size: 75% } h1, .h1 { font-size: 36px } h2, .h2 { font-size: 30px } h3, .h3 { font-size: 24px } h4, .h4 { font-size: 18px } h5, .h5 { font-size: 14px } h6, .h6 { font-size: 12px } p { margin: 0 0 10px } .lead { margin-bottom: 20px; font-size: 16px; font-weight: 300; line-height: 1.4 } @media (min-width: 768px) { .lead { font-size: 21px } } small, .small { font-size: 85% } mark, .mark { background-color: #fcf8e3; padding: .2em } .text-left { text-align: left } .text-right { text-align: right } .text-center { text-align: center } .text-justify { text-align: justify } .text-nowrap { white-space: nowrap } .text-lowercase { text-transform: lowercase } .text-uppercase { text-transform: uppercase } .text-capitalize { text-transform: capitalize } .text-muted { color: #777 } .text-primary { color: #337ab7 } a.text-primary:hover, a.text-primary:focus { color: #286090 } .text-success { color: #3c763d } a.text-success:hover, a.text-success:focus { color: #2b542c } .text-info { color: #31708f } a.text-info:hover, a.text-info:focus { color: #245269 } .text-warning { color: #8a6d3b } a.text-warning:hover, a.text-warning:focus { color: #66512c } .text-danger { color: #a94442 } a.text-danger:hover, a.text-danger:focus { color: #843534 } .bg-primary { color: #fff; background-color: #337ab7 } a.bg-primary:hover, a.bg-primary:focus { background-color: #286090 } .bg-success { background-color: #dff0d8 } a.bg-success:hover, a.bg-success:focus { background-color: #c1e2b3 } .bg-info { background-color: #d9edf7 } a.bg-info:hover, a.bg-info:focus { background-color: #afd9ee } .bg-warning { background-color: #fcf8e3 } a.bg-warning:hover, a.bg-warning:focus { background-color: #f7ecb5 } .bg-danger { background-color: #f2dede } a.bg-danger:hover, a.bg-danger:focus { background-color: #e4b9b9 } .page-header { padding-bottom: 9px; margin: 40px 0 20px; border-bottom: 1px solid #eee } ul, ol { margin-top: 0; margin-bottom: 10px } ul ul, ol ul, ul ol, ol ol { margin-bottom: 0 } .list-unstyled { padding-left: 0; list-style: none } .list-inline { padding-left: 0; list-style: none; margin-left: -5px } .list-inline > li { display: inline-block; padding-left: 5px; padding-right: 5px } dl { margin-top: 0; margin-bottom: 20px } dt, dd { line-height: 1.42857143 } dt { font-weight: bold } dd { margin-left: 0 } @media (min-width: 768px) { .dl-horizontal dt { float: left; width: 160px; clear: left; text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap } .dl-horizontal dd { margin-left: 180px } } abbr[title], abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #777 } .initialism { font-size: 90%; text-transform: uppercase } blockquote { padding: 10px 20px; margin: 0 0 20px; font-size: 17.5px; border-left: 5px solid #eee } blockquote p:last-child, blockquote ul:last-child, blockquote ol:last-child { margin-bottom: 0 } blockquote footer, blockquote small, blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; color: #777 } blockquote footer:before, blockquote small:before, blockquote .small:before { content: '\2014 \00A0' } .blockquote-reverse, blockquote.pull-right { padding-right: 15px; padding-left: 0; border-right: 5px solid #eee; border-left: 0; text-align: right } .blockquote-reverse footer:before, blockquote.pull-right footer:before, .blockquote-reverse small:before, blockquote.pull-right small:before, .blockquote-reverse .small:before, blockquote.pull-right .small:before { content: '' } .blockquote-reverse footer:after, blockquote.pull-right footer:after, .blockquote-reverse small:after, blockquote.pull-right small:after, .blockquote-reverse .small:after, blockquote.pull-right .small:after { content: '\00A0 \2014' } address { margin-bottom: 20px; font-style: normal; line-height: 1.42857143 } code, kbd, pre, samp { font-family: Menlo, Monaco, Consolas, "Courier New", monospace } code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; border-radius: 4px } kbd { padding: 2px 4px; font-size: 90%; color: #fff; background-color: #333; border-radius: 3px; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25) } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; -webkit-box-shadow: none; box-shadow: none } pre { display: block; padding: 9.5px; margin: 0 0 10px; font-size: 13px; line-height: 1.42857143; word-break: break-all; word-wrap: break-word; color: #333; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px } pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap; background-color: transparent; border-radius: 0 } .pre-scrollable { max-height: 340px; overflow-y: scroll } .container { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } @media (min-width: 768px) { .container { width: 750px } } @media (min-width: 992px) { .container { width: 970px } } @media (min-width: 1200px) { .container { width: 1170px } } .container-fluid { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } .row { margin-left: -15px; margin-right: -15px } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left } .col-xs-12 { width: 100% } .col-xs-11 { width: 91.66666667% } .col-xs-10 { width: 83.33333333% } .col-xs-9 { width: 75% } .col-xs-8 { width: 66.66666667% } .col-xs-7 { width: 58.33333333% } .col-xs-6 { width: 50% } .col-xs-5 { width: 41.66666667% } .col-xs-4 { width: 33.33333333% } .col-xs-3 { width: 25% } .col-xs-2 { width: 16.66666667% } .col-xs-1 { width: 8.33333333% } .col-xs-pull-12 { right: 100% } .col-xs-pull-11 { right: 91.66666667% } .col-xs-pull-10 { right: 83.33333333% } .col-xs-pull-9 { right: 75% } .col-xs-pull-8 { right: 66.66666667% } .col-xs-pull-7 { right: 58.33333333% } .col-xs-pull-6 { right: 50% } .col-xs-pull-5 { right: 41.66666667% } .col-xs-pull-4 { right: 33.33333333% } .col-xs-pull-3 { right: 25% } .col-xs-pull-2 { right: 16.66666667% } .col-xs-pull-1 { right: 8.33333333% } .col-xs-pull-0 { right: auto } .col-xs-push-12 { left: 100% } .col-xs-push-11 { left: 91.66666667% } .col-xs-push-10 { left: 83.33333333% } .col-xs-push-9 { left: 75% } .col-xs-push-8 { left: 66.66666667% } .col-xs-push-7 { left: 58.33333333% } .col-xs-push-6 { left: 50% } .col-xs-push-5 { left: 41.66666667% } .col-xs-push-4 { left: 33.33333333% } .col-xs-push-3 { left: 25% } .col-xs-push-2 { left: 16.66666667% } .col-xs-push-1 { left: 8.33333333% } .col-xs-push-0 { left: auto } .col-xs-offset-12 { margin-left: 100% } .col-xs-offset-11 { margin-left: 91.66666667% } .col-xs-offset-10 { margin-left: 83.33333333% } .col-xs-offset-9 { margin-left: 75% } .col-xs-offset-8 { margin-left: 66.66666667% } .col-xs-offset-7 { margin-left: 58.33333333% } .col-xs-offset-6 { margin-left: 50% } .col-xs-offset-5 { margin-left: 41.66666667% } .col-xs-offset-4 { margin-left: 33.33333333% } .col-xs-offset-3 { margin-left: 25% } .col-xs-offset-2 { margin-left: 16.66666667% } .col-xs-offset-1 { margin-left: 8.33333333% } .col-xs-offset-0 { margin-left: 0 } @media (min-width: 768px) { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left } .col-sm-12 { width: 100% } .col-sm-11 { width: 91.66666667% } .col-sm-10 { width: 83.33333333% } .col-sm-9 { width: 75% } .col-sm-8 { width: 66.66666667% } .col-sm-7 { width: 58.33333333% } .col-sm-6 { width: 50% } .col-sm-5 { width: 41.66666667% } .col-sm-4 { width: 33.33333333% } .col-sm-3 { width: 25% } .col-sm-2 { width: 16.66666667% } .col-sm-1 { width: 8.33333333% } .col-sm-pull-12 { right: 100% } .col-sm-pull-11 { right: 91.66666667% } .col-sm-pull-10 { right: 83.33333333% } .col-sm-pull-9 { right: 75% } .col-sm-pull-8 { right: 66.66666667% } .col-sm-pull-7 { right: 58.33333333% } .col-sm-pull-6 { right: 50% } .col-sm-pull-5 { right: 41.66666667% } .col-sm-pull-4 { right: 33.33333333% } .col-sm-pull-3 { right: 25% } .col-sm-pull-2 { right: 16.66666667% } .col-sm-pull-1 { right: 8.33333333% } .col-sm-pull-0 { right: auto } .col-sm-push-12 { left: 100% } .col-sm-push-11 { left: 91.66666667% } .col-sm-push-10 { left: 83.33333333% } .col-sm-push-9 { left: 75% } .col-sm-push-8 { left: 66.66666667% } .col-sm-push-7 { left: 58.33333333% } .col-sm-push-6 { left: 50% } .col-sm-push-5 { left: 41.66666667% } .col-sm-push-4 { left: 33.33333333% } .col-sm-push-3 { left: 25% } .col-sm-push-2 { left: 16.66666667% } .col-sm-push-1 { left: 8.33333333% } .col-sm-push-0 { left: auto } .col-sm-offset-12 { margin-left: 100% } .col-sm-offset-11 { margin-left: 91.66666667% } .col-sm-offset-10 { margin-left: 83.33333333% } .col-sm-offset-9 { margin-left: 75% } .col-sm-offset-8 { margin-left: 66.66666667% } .col-sm-offset-7 { margin-left: 58.33333333% } .col-sm-offset-6 { margin-left: 50% } .col-sm-offset-5 { margin-left: 41.66666667% } .col-sm-offset-4 { margin-left: 33.33333333% } .col-sm-offset-3 { margin-left: 25% } .col-sm-offset-2 { margin-left: 16.66666667% } .col-sm-offset-1 { margin-left: 8.33333333% } .col-sm-offset-0 { margin-left: 0 } } @media (min-width: 992px) { .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { float: left } .col-md-12 { width: 100% } .col-md-11 { width: 91.66666667% } .col-md-10 { width: 83.33333333% } .col-md-9 { width: 75% } .col-md-8 { width: 66.66666667% } .col-md-7 { width: 58.33333333% } .col-md-6 { width: 50% } .col-md-5 { width: 41.66666667% } .col-md-4 { width: 33.33333333% } .col-md-3 { width: 25% } .col-md-2 { width: 16.66666667% } .col-md-1 { width: 8.33333333% } .col-md-pull-12 { right: 100% } .col-md-pull-11 { right: 91.66666667% } .col-md-pull-10 { right: 83.33333333% } .col-md-pull-9 { right: 75% } .col-md-pull-8 { right: 66.66666667% } .col-md-pull-7 { right: 58.33333333% } .col-md-pull-6 { right: 50% } .col-md-pull-5 { right: 41.66666667% } .col-md-pull-4 { right: 33.33333333% } .col-md-pull-3 { right: 25% } .col-md-pull-2 { right: 16.66666667% } .col-md-pull-1 { right: 8.33333333% } .col-md-pull-0 { right: auto } .col-md-push-12 { left: 100% } .col-md-push-11 { left: 91.66666667% } .col-md-push-10 { left: 83.33333333% } .col-md-push-9 { left: 75% } .col-md-push-8 { left: 66.66666667% } .col-md-push-7 { left: 58.33333333% } .col-md-push-6 { left: 50% } .col-md-push-5 { left: 41.66666667% } .col-md-push-4 { left: 33.33333333% } .col-md-push-3 { left: 25% } .col-md-push-2 { left: 16.66666667% } .col-md-push-1 { left: 8.33333333% } .col-md-push-0 { left: auto } .col-md-offset-12 { margin-left: 100% } .col-md-offset-11 { margin-left: 91.66666667% } .col-md-offset-10 { margin-left: 83.33333333% } .col-md-offset-9 { margin-left: 75% } .col-md-offset-8 { margin-left: 66.66666667% } .col-md-offset-7 { margin-left: 58.33333333% } .col-md-offset-6 { margin-left: 50% } .col-md-offset-5 { margin-left: 41.66666667% } .col-md-offset-4 { margin-left: 33.33333333% } .col-md-offset-3 { margin-left: 25% } .col-md-offset-2 { margin-left: 16.66666667% } .col-md-offset-1 { margin-left: 8.33333333% } .col-md-offset-0 { margin-left: 0 } } @media (min-width: 1200px) { .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { float: left } .col-lg-12 { width: 100% } .col-lg-11 { width: 91.66666667% } .col-lg-10 { width: 83.33333333% } .col-lg-9 { width: 75% } .col-lg-8 { width: 66.66666667% } .col-lg-7 { width: 58.33333333% } .col-lg-6 { width: 50% } .col-lg-5 { width: 41.66666667% } .col-lg-4 { width: 33.33333333% } .col-lg-3 { width: 25% } .col-lg-2 { width: 16.66666667% } .col-lg-1 { width: 8.33333333% } .col-lg-pull-12 { right: 100% } .col-lg-pull-11 { right: 91.66666667% } .col-lg-pull-10 { right: 83.33333333% } .col-lg-pull-9 { right: 75% } .col-lg-pull-8 { right: 66.66666667% } .col-lg-pull-7 { right: 58.33333333% } .col-lg-pull-6 { right: 50% } .col-lg-pull-5 { right: 41.66666667% } .col-lg-pull-4 { right: 33.33333333% } .col-lg-pull-3 { right: 25% } .col-lg-pull-2 { right: 16.66666667% } .col-lg-pull-1 { right: 8.33333333% } .col-lg-pull-0 { right: auto } .col-lg-push-12 { left: 100% } .col-lg-push-11 { left: 91.66666667% } .col-lg-push-10 { left: 83.33333333% } .col-lg-push-9 { left: 75% } .col-lg-push-8 { left: 66.66666667% } .col-lg-push-7 { left: 58.33333333% } .col-lg-push-6 { left: 50% } .col-lg-push-5 { left: 41.66666667% } .col-lg-push-4 { left: 33.33333333% } .col-lg-push-3 { left: 25% } .col-lg-push-2 { left: 16.66666667% } .col-lg-push-1 { left: 8.33333333% } .col-lg-push-0 { left: auto } .col-lg-offset-12 { margin-left: 100% } .col-lg-offset-11 { margin-left: 91.66666667% } .col-lg-offset-10 { margin-left: 83.33333333% } .col-lg-offset-9 { margin-left: 75% } .col-lg-offset-8 { margin-left: 66.66666667% } .col-lg-offset-7 { margin-left: 58.33333333% } .col-lg-offset-6 { margin-left: 50% } .col-lg-offset-5 { margin-left: 41.66666667% } .col-lg-offset-4 { margin-left: 33.33333333% } .col-lg-offset-3 { margin-left: 25% } .col-lg-offset-2 { margin-left: 16.66666667% } .col-lg-offset-1 { margin-left: 8.33333333% } .col-lg-offset-0 { margin-left: 0 } } table { background-color: transparent } caption { padding-top: 8px; padding-bottom: 8px; color: #777; text-align: left } th { text-align: left } .table { width: 100%; max-width: 100%; margin-bottom: 20px } .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { padding: 8px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd } .table > thead > tr > th { vertical-align: bottom; border-bottom: 2px solid #ddd } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, .table > thead:first-child > tr:first-child > th, .table > caption + thead > tr:first-child > td, .table > colgroup + thead > tr:first-child > td, .table > thead:first-child > tr:first-child > td { border-top: 0 } .table > tbody + tbody { border-top: 2px solid #ddd } .table .table { background-color: #fff } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td { padding: 5px } .table-bordered { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { border-bottom-width: 2px } .table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9 } .table-hover > tbody > tr:hover { background-color: #f5f5f5 } table col[class*="col-"] { position: static; float: none; display: table-column } table td[class*="col-"], table th[class*="col-"] { position: static; float: none; display: table-cell } .table > thead > tr > td.active, .table > tbody > tr > td.active, .table > tfoot > tr > td.active, .table > thead > tr > th.active, .table > tbody > tr > th.active, .table > tfoot > tr > th.active, .table > thead > tr.active > td, .table > tbody > tr.active > td, .table > tfoot > tr.active > td, .table > thead > tr.active > th, .table > tbody > tr.active > th, .table > tfoot > tr.active > th { background-color: #f5f5f5 } .table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th { background-color: #e8e8e8 } .table > thead > tr > td.success, .table > tbody > tr > td.success, .table > tfoot > tr > td.success, .table > thead > tr > th.success, .table > tbody > tr > th.success, .table > tfoot > tr > th.success, .table > thead > tr.success > td, .table > tbody > tr.success > td, .table > tfoot > tr.success > td, .table > thead > tr.success > th, .table > tbody > tr.success > th, .table > tfoot > tr.success > th { background-color: #dff0d8 } .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6 } .table > thead > tr > td.info, .table > tbody > tr > td.info, .table > tfoot > tr > td.info, .table > thead > tr > th.info, .table > tbody > tr > th.info, .table > tfoot > tr > th.info, .table > thead > tr.info > td, .table > tbody > tr.info > td, .table > tfoot > tr.info > td, .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { background-color: #d9edf7 } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { background-color: #c4e3f3 } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > tfoot > tr > td.warning, .table > thead > tr > th.warning, .table > tbody > tr > th.warning, .table > tfoot > tr > th.warning, .table > thead > tr.warning > td, .table > tbody > tr.warning > td, .table > tfoot > tr.warning > td, .table > thead > tr.warning > th, .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { background-color: #fcf8e3 } .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc } .table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > tfoot > tr > td.danger, .table > thead > tr > th.danger, .table > tbody > tr > th.danger, .table > tfoot > tr > th.danger, .table > thead > tr.danger > td, .table > tbody > tr.danger > td, .table > tfoot > tr.danger > td, .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { background-color: #f2dede } .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc } .table-responsive { overflow-x: auto; min-height: 0.01% } @media screen and (max-width: 767px) { .table-responsive { width: 100%; margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid #ddd } .table-responsive > .table { margin-bottom: 0 } .table-responsive > .table > thead > tr > th, .table-responsive > .table > tbody > tr > th, .table-responsive > .table > tfoot > tr > th, .table-responsive > .table > thead > tr > td, .table-responsive > .table > tbody > tr > td, .table-responsive > .table > tfoot > tr > td { white-space: nowrap } .table-responsive > .table-bordered { border: 0 } .table-responsive > .table-bordered > thead > tr > th:first-child, .table-responsive > .table-bordered > tbody > tr > th:first-child, .table-responsive > .table-bordered > tfoot > tr > th:first-child, .table-responsive > .table-bordered > thead > tr > td:first-child, .table-responsive > .table-bordered > tbody > tr > td:first-child, .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .table-responsive > .table-bordered > thead > tr > th:last-child, .table-responsive > .table-bordered > tbody > tr > th:last-child, .table-responsive > .table-bordered > tfoot > tr > th:last-child, .table-responsive > .table-bordered > thead > tr > td:last-child, .table-responsive > .table-bordered > tbody > tr > td:last-child, .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .table-responsive > .table-bordered > tbody > tr:last-child > th, .table-responsive > .table-bordered > tfoot > tr:last-child > th, .table-responsive > .table-bordered > tbody > tr:last-child > td, .table-responsive > .table-bordered > tfoot > tr:last-child > td { border-bottom: 0 } } fieldset { padding: 0; margin: 0; border: 0; min-width: 0 } legend { display: block; width: 100%; padding: 0; margin-bottom: 20px; font-size: 21px; line-height: inherit; color: #333; border: 0; border-bottom: 1px solid #e5e5e5 } label { display: inline-block; max-width: 100%; margin-bottom: 5px; font-weight: bold } input[type="search"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; line-height: normal } input[type="file"] { display: block } input[type="range"] { display: block; width: 100% } select[multiple], select[size] { height: auto } input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } output { display: block; padding-top: 7px; font-size: 14px; line-height: 1.42857143; color: #555 } .form-control { display: block; width: 100%; height: 34px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s } .form-control:focus { border-color: #66afe9; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6) } .form-control::-moz-placeholder { color: #999; opacity: 1 } .form-control:-ms-input-placeholder { color: #999 } .form-control::-webkit-input-placeholder { color: #999 } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { background-color: #eee; opacity: 1 } .form-control[disabled], fieldset[disabled] .form-control { cursor: not-allowed } textarea.form-control { height: auto } input[type="search"] { -webkit-appearance: none } @media screen and (-webkit-min-device-pixel-ratio: 0) { input[type="date"].form-control, input[type="time"].form-control, input[type="datetime-local"].form-control, input[type="month"].form-control { line-height: 34px } input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, input[type="month"].input-sm, .input-group-sm input[type="date"], .input-group-sm input[type="time"], .input-group-sm input[type="datetime-local"], .input-group-sm input[type="month"] { line-height: 30px } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, input[type="month"].input-lg, .input-group-lg input[type="date"], .input-group-lg input[type="time"], .input-group-lg input[type="datetime-local"], .input-group-lg input[type="month"] { line-height: 46px } } .form-group { margin-bottom: 15px } .radio, .checkbox { position: relative; display: block; margin-top: 10px; margin-bottom: 10px } .radio label, .checkbox label { min-height: 20px; padding-left: 20px; margin-bottom: 0; font-weight: normal; cursor: pointer } .radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; margin-left: -20px; margin-top: 4px \9 } .radio + .radio, .checkbox + .checkbox { margin-top: -5px } .radio-inline, .checkbox-inline { position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; vertical-align: middle; font-weight: normal; cursor: pointer } .radio-inline + .radio-inline, .checkbox-inline + .checkbox-inline { margin-top: 0; margin-left: 10px } input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"].disabled, input[type="checkbox"].disabled, fieldset[disabled] input[type="radio"], fieldset[disabled] input[type="checkbox"] { cursor: not-allowed } .radio-inline.disabled, .checkbox-inline.disabled, fieldset[disabled] .radio-inline, fieldset[disabled] .checkbox-inline { cursor: not-allowed } .radio.disabled label, .checkbox.disabled label, fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed } .form-control-static { padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; min-height: 34px } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0 } .input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-sm { height: 30px; line-height: 30px } textarea.input-sm, select[multiple].input-sm { height: auto } .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .form-group-sm select.form-control { height: 30px; line-height: 30px } .form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control { height: auto } .form-group-sm .form-control-static { height: 30px; min-height: 32px; padding: 6px 10px; font-size: 12px; line-height: 1.5 } .input-lg { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-lg { height: 46px; line-height: 46px } textarea.input-lg, select[multiple].input-lg { height: auto } .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .form-group-lg select.form-control { height: 46px; line-height: 46px } .form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control { height: auto } .form-group-lg .form-control-static { height: 46px; min-height: 38px; padding: 11px 16px; font-size: 18px; line-height: 1.3333333 } .has-feedback { position: relative } .has-feedback .form-control { padding-right: 42.5px } .form-control-feedback { position: absolute; top: 0; right: 0; z-index: 2; display: block; width: 34px; height: 34px; line-height: 34px; text-align: center; pointer-events: none } .input-lg + .form-control-feedback, .input-group-lg + .form-control-feedback, .form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px } .input-sm + .form-control-feedback, .input-group-sm + .form-control-feedback, .form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px } .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { color: #3c763d } .has-success .form-control { border-color: #3c763d; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-success .form-control:focus { border-color: #2b542c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168 } .has-success .input-group-addon { color: #3c763d; border-color: #3c763d; background-color: #dff0d8 } .has-success .form-control-feedback { color: #3c763d } .has-warning .help-block, .has-warning .control-label, .has-warning .radio, .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline, .has-warning.radio label, .has-warning.checkbox label, .has-warning.radio-inline label, .has-warning.checkbox-inline label { color: #8a6d3b } .has-warning .form-control { border-color: #8a6d3b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-warning .form-control:focus { border-color: #66512c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b } .has-warning .input-group-addon { color: #8a6d3b; border-color: #8a6d3b; background-color: #fcf8e3 } .has-warning .form-control-feedback { color: #8a6d3b } .has-error .help-block, .has-error .control-label, .has-error .radio, .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label { color: #a94442 } .has-error .form-control { border-color: #a94442; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-error .form-control:focus { border-color: #843534; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483 } .has-error .input-group-addon { color: #a94442; border-color: #a94442; background-color: #f2dede } .has-error .form-control-feedback { color: #a94442 } .has-feedback label ~ .form-control-feedback { top: 25px } .has-feedback label.sr-only ~ .form-control-feedback { top: 0 } .help-block { display: block; margin-top: 5px; margin-bottom: 10px; color: #737373 } @media (min-width: 768px) { .form-inline .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .form-inline .form-control { display: inline-block; width: auto; vertical-align: middle } .form-inline .form-control-static { display: inline-block } .form-inline .input-group { display: inline-table; vertical-align: middle } .form-inline .input-group .input-group-addon, .form-inline .input-group .input-group-btn, .form-inline .input-group .form-control { width: auto } .form-inline .input-group > .form-control { width: 100% } .form-inline .control-label { margin-bottom: 0; vertical-align: middle } .form-inline .radio, .form-inline .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .form-inline .radio label, .form-inline .checkbox label { padding-left: 0 } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .form-inline .has-feedback .form-control-feedback { top: 0 } } .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { margin-top: 0; margin-bottom: 0; padding-top: 7px } .form-horizontal .radio, .form-horizontal .checkbox { min-height: 27px } .form-horizontal .form-group { margin-left: -15px; margin-right: -15px } @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; margin-bottom: 0; padding-top: 7px } } .form-horizontal .has-feedback .form-control-feedback { right: 15px } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { padding-top: 14.333333px; font-size: 18px } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; font-size: 12px } } .btn { display: inline-block; margin-bottom: 0; font-weight: normal; text-align: center; vertical-align: middle; -ms-touch-action: manipulation; touch-action: manipulation; cursor: pointer; background-image: none; border: 1px solid transparent; white-space: nowrap; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none } .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:active.focus, .btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } .btn:hover, .btn:focus, .btn.focus { color: #333; text-decoration: none } .btn:active, .btn.active { outline: 0; background-image: none; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; opacity: .65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none } a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none } .btn-default { color: #333; background-color: #fff; border-color: #ccc } .btn-default:focus, .btn-default.focus { color: #333; background-color: #e6e6e6; border-color: #8c8c8c } .btn-default:hover { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active:hover, .btn-default.active:hover, .open > .dropdown-toggle.btn-default:hover, .btn-default:active:focus, .btn-default.active:focus, .open > .dropdown-toggle.btn-default:focus, .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus { color: #333; background-color: #d4d4d4; border-color: #8c8c8c } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { background-image: none } .btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, fieldset[disabled] .btn-default.focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { background-color: #fff; border-color: #ccc } .btn-default .badge { color: #fff; background-color: #333 } .btn-primary { color: #fff; background-color: #337ab7; border-color: #2e6da4 } .btn-primary:focus, .btn-primary.focus { color: #fff; background-color: #286090; border-color: #122b40 } .btn-primary:hover { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active:hover, .btn-primary.active:hover, .open > .dropdown-toggle.btn-primary:hover, .btn-primary:active:focus, .btn-primary.active:focus, .open > .dropdown-toggle.btn-primary:focus, .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus { color: #fff; background-color: #204d74; border-color: #122b40 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { background-image: none } .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary.focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #337ab7; border-color: #2e6da4 } .btn-primary .badge { color: #337ab7; background-color: #fff } .btn-success { color: #fff; background-color: #5cb85c; border-color: #4cae4c } .btn-success:focus, .btn-success.focus { color: #fff; background-color: #449d44; border-color: #255625 } .btn-success:hover { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active:hover, .btn-success.active:hover, .open > .dropdown-toggle.btn-success:hover, .btn-success:active:focus, .btn-success.active:focus, .open > .dropdown-toggle.btn-success:focus, .btn-success:active.focus, .btn-success.active.focus, .open > .dropdown-toggle.btn-success.focus { color: #fff; background-color: #398439; border-color: #255625 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { background-image: none } .btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, .btn-success.disabled.focus, .btn-success[disabled].focus, fieldset[disabled] .btn-success.focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { background-color: #5cb85c; border-color: #4cae4c } .btn-success .badge { color: #5cb85c; background-color: #fff } .btn-info { color: #fff; background-color: #5bc0de; border-color: #46b8da } .btn-info:focus, .btn-info.focus { color: #fff; background-color: #31b0d5; border-color: #1b6d85 } .btn-info:hover { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active:hover, .btn-info.active:hover, .open > .dropdown-toggle.btn-info:hover, .btn-info:active:focus, .btn-info.active:focus, .open > .dropdown-toggle.btn-info:focus, .btn-info:active.focus, .btn-info.active.focus, .open > .dropdown-toggle.btn-info.focus { color: #fff; background-color: #269abc; border-color: #1b6d85 } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { background-image: none } .btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, .btn-info.disabled.focus, .btn-info[disabled].focus, fieldset[disabled] .btn-info.focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { background-color: #5bc0de; border-color: #46b8da } .btn-info .badge { color: #5bc0de; background-color: #fff } .btn-warning { color: #fff; background-color: #f0ad4e; border-color: #eea236 } .btn-warning:focus, .btn-warning.focus { color: #fff; background-color: #ec971f; border-color: #985f0d } .btn-warning:hover { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active:hover, .btn-warning.active:hover, .open > .dropdown-toggle.btn-warning:hover, .btn-warning:active:focus, .btn-warning.active:focus, .open > .dropdown-toggle.btn-warning:focus, .btn-warning:active.focus, .btn-warning.active.focus, .open > .dropdown-toggle.btn-warning.focus { color: #fff; background-color: #d58512; border-color: #985f0d } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { background-image: none } .btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled.focus, .btn-warning[disabled].focus, fieldset[disabled] .btn-warning.focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { background-color: #f0ad4e; border-color: #eea236 } .btn-warning .badge { color: #f0ad4e; background-color: #fff } .btn-danger { color: #fff; background-color: #d9534f; border-color: #d43f3a } .btn-danger:focus, .btn-danger.focus { color: #fff; background-color: #c9302c; border-color: #761c19 } .btn-danger:hover { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active:hover, .btn-danger.active:hover, .open > .dropdown-toggle.btn-danger:hover, .btn-danger:active:focus, .btn-danger.active:focus, .open > .dropdown-toggle.btn-danger:focus, .btn-danger:active.focus, .btn-danger.active.focus, .open > .dropdown-toggle.btn-danger.focus { color: #fff; background-color: #ac2925; border-color: #761c19 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { background-image: none } .btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled.focus, .btn-danger[disabled].focus, fieldset[disabled] .btn-danger.focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { background-color: #d9534f; border-color: #d43f3a } .btn-danger .badge { color: #d9534f; background-color: #fff } .btn-link { color: #337ab7; font-weight: normal; border-radius: 0 } .btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; -webkit-box-shadow: none; box-shadow: none } .btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent } .btn-link:hover, .btn-link:focus { color: #23527c; text-decoration: underline; background-color: transparent } .btn-link[disabled]:hover, fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { color: #777; text-decoration: none } .btn-lg, .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-block { display: block; width: 100% } .btn-block + .btn-block { margin-top: 5px } input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { width: 100% } .fade { opacity: 0; -webkit-transition: opacity .15s linear; -o-transition: opacity .15s linear; transition: opacity .15s linear } .fade.in { opacity: 1 } .collapse { display: none } .collapse.in { display: block } tr.collapse.in { display: table-row } tbody.collapse.in { display: table-row-group } .collapsing { position: relative; height: 0; overflow: hidden; -webkit-transition-property: height, visibility; -o-transition-property: height, visibility; transition-property: height, visibility; -webkit-transition-duration: .35s; -o-transition-duration: .35s; transition-duration: .35s; -webkit-transition-timing-function: ease; -o-transition-timing-function: ease; transition-timing-function: ease } .caret { display: inline-block; width: 0; height: 0; margin-left: 2px; vertical-align: middle; border-top: 4px dashed; border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent } .dropup, .dropdown { position: relative } .dropdown-toggle:focus { outline: 0 } .dropdown-menu { position: absolute; top: 100%; left: 0; z-index: 1000; display: none; float: left; min-width: 160px; padding: 5px 0; margin: 2px 0 0; list-style: none; font-size: 14px; text-align: left; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); -webkit-background-clip: padding-box; background-clip: padding-box } .dropdown-menu.pull-right { right: 0; left: auto } .dropdown-menu .divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.42857143; color: #333; white-space: nowrap } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; color: #262626; background-color: #f5f5f5 } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { color: #fff; text-decoration: none; outline: 0; background-color: #337ab7 } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #777 } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); cursor: not-allowed } .open > .dropdown-menu { display: block } .open > a { outline: 0 } .dropdown-menu-right { left: auto; right: 0 } .dropdown-menu-left { left: 0; right: auto } .dropdown-header { display: block; padding: 3px 20px; font-size: 12px; line-height: 1.42857143; color: #777; white-space: nowrap } .dropdown-backdrop { position: fixed; left: 0; right: 0; bottom: 0; top: 0; z-index: 990 } .pull-right > .dropdown-menu { right: 0; left: auto } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px dashed; border-bottom: 4px solid \9; content: "" } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 2px } @media (min-width: 768px) { .navbar-right .dropdown-menu { left: auto; right: 0 } .navbar-right .dropdown-menu-left { left: 0; right: auto } } .btn-group, .btn-group-vertical { position: relative; display: inline-block; vertical-align: middle } .btn-group > .btn, .btn-group-vertical > .btn { position: relative; float: left } .btn-group > .btn:hover, .btn-group-vertical > .btn:hover, .btn-group > .btn:focus, .btn-group-vertical > .btn:focus, .btn-group > .btn:active, .btn-group-vertical > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn.active { z-index: 2 } .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, .btn-group .btn-group + .btn-group { margin-left: -1px } .btn-toolbar { margin-left: -5px } .btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left } .btn-toolbar > .btn, .btn-toolbar > .btn-group, .btn-toolbar > .input-group { margin-left: 5px } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { border-radius: 0 } .btn-group > .btn:first-child { margin-left: 0 } .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group > .btn-group { float: left } .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0 } .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px } .btn-group > .btn-lg + .dropdown-toggle { padding-left: 12px; padding-right: 12px } .btn-group.open .dropdown-toggle { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn-group.open .dropdown-toggle.btn-link { -webkit-box-shadow: none; box-shadow: none } .btn .caret { margin-left: 0 } .btn-lg .caret { border-width: 5px 5px 0; border-bottom-width: 0 } .dropup .btn-lg .caret { border-width: 0 5px 5px } .btn-group-vertical > .btn, .btn-group-vertical > .btn-group, .btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; max-width: 100% } .btn-group-vertical > .btn-group > .btn { float: none } .btn-group-vertical > .btn + .btn, .btn-group-vertical > .btn + .btn-group, .btn-group-vertical > .btn-group + .btn, .btn-group-vertical > .btn-group + .btn-group { margin-top: -1px; margin-left: 0 } .btn-group-vertical > .btn:not(:first-child):not(:last-child) { border-radius: 0 } .btn-group-vertical > .btn:first-child:not(:last-child) { border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn:last-child:not(:first-child) { border-bottom-left-radius: 4px; border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-justified { display: table; width: 100%; table-layout: fixed; border-collapse: separate } .btn-group-justified > .btn, .btn-group-justified > .btn-group { float: none; display: table-cell; width: 1% } .btn-group-justified > .btn-group .btn { width: 100% } .btn-group-justified > .btn-group .dropdown-menu { left: auto } [data-toggle="buttons"] > .btn input[type="radio"], [data-toggle="buttons"] > .btn-group > .btn input[type="radio"], [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; clip: rect(0, 0, 0, 0); pointer-events: none } .input-group { position: relative; display: table; border-collapse: separate } .input-group[class*="col-"] { float: none; padding-left: 0; padding-right: 0 } .input-group .form-control { position: relative; z-index: 2; float: left; width: 100%; margin-bottom: 0 } .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { height: 46px; line-height: 46px } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, textarea.input-group-lg > .input-group-btn > .btn, select[multiple].input-group-lg > .form-control, select[multiple].input-group-lg > .input-group-addon, select[multiple].input-group-lg > .input-group-btn > .btn { height: auto } .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-btn > .btn { height: 30px; line-height: 30px } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-btn > .btn, select[multiple].input-group-sm > .form-control, select[multiple].input-group-sm > .input-group-addon, select[multiple].input-group-sm > .input-group-btn > .btn { height: auto } .input-group-addon, .input-group-btn, .input-group .form-control { display: table-cell } .input-group-addon:not(:first-child):not(:last-child), .input-group-btn:not(:first-child):not(:last-child), .input-group .form-control:not(:first-child):not(:last-child) { border-radius: 0 } .input-group-addon, .input-group-btn { width: 1%; white-space: nowrap; vertical-align: middle } .input-group-addon { padding: 6px 12px; font-size: 14px; font-weight: normal; line-height: 1; color: #555; text-align: center; background-color: #eee; border: 1px solid #ccc; border-radius: 4px } .input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; border-radius: 3px } .input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; border-radius: 6px } .input-group-addon input[type="radio"], .input-group-addon input[type="checkbox"] { margin-top: 0 } .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { border-bottom-right-radius: 0; border-top-right-radius: 0 } .input-group-addon:first-child { border-right: 0 } .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { border-bottom-left-radius: 0; border-top-left-radius: 0 } .input-group-addon:last-child { border-left: 0 } .input-group-btn { position: relative; font-size: 0; white-space: nowrap } .input-group-btn > .btn { position: relative } .input-group-btn > .btn + .btn { margin-left: -1px } .input-group-btn > .btn:hover, .input-group-btn > .btn:focus, .input-group-btn > .btn:active { z-index: 2 } .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group { margin-right: -1px } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { z-index: 2; margin-left: -1px } .nav { margin-bottom: 0; padding-left: 0; list-style: none } .nav > li { position: relative; display: block } .nav > li > a { position: relative; display: block; padding: 10px 15px } .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; background-color: #eee } .nav > li.disabled > a { color: #777 } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { color: #777; text-decoration: none; background-color: transparent; cursor: not-allowed } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #eee; border-color: #337ab7 } .nav .nav-divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .nav > li > a > img { max-width: none } .nav-tabs { border-bottom: 1px solid #ddd } .nav-tabs > li { float: left; margin-bottom: -1px } .nav-tabs > li > a { margin-right: 2px; line-height: 1.42857143; border: 1px solid transparent; border-radius: 4px 4px 0 0 } .nav-tabs > li > a:hover { border-color: #eee #eee #ddd } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #555; background-color: #fff; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default } .nav-tabs.nav-justified { width: 100%; border-bottom: 0 } .nav-tabs.nav-justified > li { float: none } .nav-tabs.nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-tabs.nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-tabs.nav-justified > li { display: table-cell; width: 1% } .nav-tabs.nav-justified > li > a { margin-bottom: 0 } } .nav-tabs.nav-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border-bottom-color: #fff } } .nav-pills > li { float: left } .nav-pills > li > a { border-radius: 4px } .nav-pills > li + li { margin-left: 2px } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; background-color: #337ab7 } .nav-stacked > li { float: none } .nav-stacked > li + li { margin-top: 2px; margin-left: 0 } .nav-justified { width: 100% } .nav-justified > li { float: none } .nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-justified > li { display: table-cell; width: 1% } .nav-justified > li > a { margin-bottom: 0 } } .nav-tabs-justified { border-bottom: 0 } .nav-tabs-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border-bottom-color: #fff } } .tab-content > .tab-pane { display: none } .tab-content > .active { display: block } .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar { position: relative; min-height: 50px; margin-bottom: 20px; border: 1px solid transparent } @media (min-width: 768px) { .navbar { border-radius: 4px } } @media (min-width: 768px) { .navbar-header { float: left } } .navbar-collapse { overflow-x: visible; padding-right: 15px; padding-left: 15px; border-top: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch } .navbar-collapse.in { overflow-y: auto } @media (min-width: 768px) { .navbar-collapse { width: auto; border-top: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-collapse.collapse { display: block !important; height: auto !important; padding-bottom: 0; overflow: visible !important } .navbar-collapse.in { overflow-y: visible } .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { padding-left: 0; padding-right: 0 } } .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 340px } @media (max-device-width: 480px) and (orientation: landscape) { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 200px } } .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: -15px; margin-left: -15px } @media (min-width: 768px) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: 0; margin-left: 0 } } .navbar-static-top { z-index: 1000; border-width: 0 0 1px } @media (min-width: 768px) { .navbar-static-top { border-radius: 0 } } .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; right: 0; left: 0; z-index: 1030 } @media (min-width: 768px) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0 } } .navbar-fixed-top { top: 0; border-width: 0 0 1px } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; border-width: 1px 0 0 } .navbar-brand { float: left; padding: 15px 15px; font-size: 18px; line-height: 20px; height: 50px } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none } .navbar-brand > img { display: block } @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px } } .navbar-toggle { position: relative; float: right; margin-right: 15px; padding: 9px 10px; margin-top: 8px; margin-bottom: 8px; background-color: transparent; background-image: none; border: 1px solid transparent; border-radius: 4px } .navbar-toggle:focus { outline: 0 } .navbar-toggle .icon-bar { display: block; width: 22px; height: 2px; border-radius: 1px } .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px } @media (min-width: 768px) { .navbar-toggle { display: none } } .navbar-nav { margin: 7.5px -15px } .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; line-height: 20px } @media (max-width: 767px) { .navbar-nav .open .dropdown-menu { position: static; float: none; width: auto; margin-top: 0; background-color: transparent; border: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-nav .open .dropdown-menu > li > a, .navbar-nav .open .dropdown-menu .dropdown-header { padding: 5px 15px 5px 25px } .navbar-nav .open .dropdown-menu > li > a { line-height: 20px } .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus { background-image: none } } @media (min-width: 768px) { .navbar-nav { float: left; margin: 0 } .navbar-nav > li { float: left } .navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px } } .navbar-form { margin-left: -15px; margin-right: -15px; padding: 10px 15px; border-top: 1px solid transparent; border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); margin-top: 8px; margin-bottom: 8px } @media (min-width: 768px) { .navbar-form .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .navbar-form .form-control { display: inline-block; width: auto; vertical-align: middle } .navbar-form .form-control-static { display: inline-block } .navbar-form .input-group { display: inline-table; vertical-align: middle } .navbar-form .input-group .input-group-addon, .navbar-form .input-group .input-group-btn, .navbar-form .input-group .form-control { width: auto } .navbar-form .input-group > .form-control { width: 100% } .navbar-form .control-label { margin-bottom: 0; vertical-align: middle } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .navbar-form .radio label, .navbar-form .checkbox label { padding-left: 0 } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .navbar-form .has-feedback .form-control-feedback { top: 0 } } @media (max-width: 767px) { .navbar-form .form-group { margin-bottom: 5px } .navbar-form .form-group:last-child { margin-bottom: 0 } } @media (min-width: 768px) { .navbar-form { width: auto; border: 0; margin-left: 0; margin-right: 0; padding-top: 0; padding-bottom: 0; -webkit-box-shadow: none; box-shadow: none } } .navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; border-top-right-radius: 4px; border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .navbar-btn { margin-top: 8px; margin-bottom: 8px } .navbar-btn.btn-sm { margin-top: 10px; margin-bottom: 10px } .navbar-btn.btn-xs { margin-top: 14px; margin-bottom: 14px } .navbar-text { margin-top: 15px; margin-bottom: 15px } @media (min-width: 768px) { .navbar-text { float: left; margin-left: 15px; margin-right: 15px } } @media (min-width: 768px) { .navbar-left { float: left !important } .navbar-right { float: right !important; margin-right: -15px } .navbar-right ~ .navbar-right { margin-right: 0 } } .navbar-default { background-color: #f8f8f8; border-color: #e7e7e7 } .navbar-default .navbar-brand { color: #777 } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { color: #5e5e5e; background-color: transparent } .navbar-default .navbar-text { color: #777 } .navbar-default .navbar-nav > li > a { color: #777 } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { color: #ccc; background-color: transparent } .navbar-default .navbar-toggle { border-color: #ddd } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #ddd } .navbar-default .navbar-toggle .icon-bar { background-color: #888 } .navbar-default .navbar-collapse, .navbar-default .navbar-form { border-color: #e7e7e7 } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #e7e7e7; color: #555 } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777 } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #ccc; background-color: transparent } } .navbar-default .navbar-link { color: #777 } .navbar-default .navbar-link:hover { color: #333 } .navbar-default .btn-link { color: #777 } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { color: #333 } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { color: #ccc } .navbar-inverse { background-color: #222; border-color: #080808 } .navbar-inverse .navbar-brand { color: #9d9d9d } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-text { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { color: #444; background-color: transparent } .navbar-inverse .navbar-toggle { border-color: #333 } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { background-color: #333 } .navbar-inverse .navbar-toggle .icon-bar { background-color: #fff } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { border-color: #101010 } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background-color: #080808; color: #fff } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu .divider { background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #444; background-color: transparent } } .navbar-inverse .navbar-link { color: #9d9d9d } .navbar-inverse .navbar-link:hover { color: #fff } .navbar-inverse .btn-link { color: #9d9d9d } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { color: #fff } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { color: #444 } .breadcrumb { padding: 8px 15px; margin-bottom: 20px; list-style: none; background-color: #f5f5f5; border-radius: 4px } .breadcrumb > li { display: inline-block } .breadcrumb > li + li:before { content: "/\00a0"; padding: 0 5px; color: #ccc } .breadcrumb > .active { color: #777 } .pagination { display: inline-block; padding-left: 0; margin: 20px 0; border-radius: 4px } .pagination > li { display: inline } .pagination > li > a, .pagination > li > span { position: relative; float: left; padding: 6px 12px; line-height: 1.42857143; text-decoration: none; color: #337ab7; background-color: #fff; border: 1px solid #ddd; margin-left: -1px } .pagination > li:first-child > a, .pagination > li:first-child > span { margin-left: 0; border-bottom-left-radius: 4px; border-top-left-radius: 4px } .pagination > li:last-child > a, .pagination > li:last-child > span { border-bottom-right-radius: 4px; border-top-right-radius: 4px } .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { z-index: 3; color: #23527c; background-color: #eee; border-color: #ddd } .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7; cursor: default } .pagination > .disabled > span, .pagination > .disabled > span:hover, .pagination > .disabled > span:focus, .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { color: #777; background-color: #fff; border-color: #ddd; cursor: not-allowed } .pagination-lg > li > a, .pagination-lg > li > span { padding: 10px 16px; font-size: 18px; line-height: 1.3333333 } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; border-top-left-radius: 6px } .pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span { border-bottom-right-radius: 6px; border-top-right-radius: 6px } .pagination-sm > li > a, .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; line-height: 1.5 } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { border-bottom-left-radius: 3px; border-top-left-radius: 3px } .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span { border-bottom-right-radius: 3px; border-top-right-radius: 3px } .pager { padding-left: 0; margin: 20px 0; list-style: none; text-align: center } .pager li { display: inline } .pager li > a, .pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; border-radius: 15px } .pager li > a:hover, .pager li > a:focus { text-decoration: none; background-color: #eee } .pager .next > a, .pager .next > span { float: right } .pager .previous > a, .pager .previous > span { float: left } .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { color: #777; background-color: #fff; cursor: not-allowed } .label { display: inline; padding: .2em .6em .3em; font-size: 75%; font-weight: bold; line-height: 1; color: #fff; text-align: center; white-space: nowrap; vertical-align: baseline; border-radius: .25em } a.label:hover, a.label:focus { color: #fff; text-decoration: none; cursor: pointer } .label:empty { display: none } .btn .label { position: relative; top: -1px } .label-default { background-color: #777 } .label-default[href]:hover, .label-default[href]:focus { background-color: #5e5e5e } .label-primary { background-color: #337ab7 } .label-primary[href]:hover, .label-primary[href]:focus { background-color: #286090 } .label-success { background-color: #5cb85c } .label-success[href]:hover, .label-success[href]:focus { background-color: #449d44 } .label-info { background-color: #5bc0de } .label-info[href]:hover, .label-info[href]:focus { background-color: #31b0d5 } .label-warning { background-color: #f0ad4e } .label-warning[href]:hover, .label-warning[href]:focus { background-color: #ec971f } .label-danger { background-color: #d9534f } .label-danger[href]:hover, .label-danger[href]:focus { background-color: #c9302c } .badge { display: inline-block; min-width: 10px; padding: 3px 7px; font-size: 12px; font-weight: bold; color: #fff; line-height: 1; vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777; border-radius: 10px } .badge:empty { display: none } .btn .badge { position: relative; top: -1px } .btn-xs .badge, .btn-group-xs > .btn .badge { top: 0; padding: 1px 5px } a.badge:hover, a.badge:focus { color: #fff; text-decoration: none; cursor: pointer } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #337ab7; background-color: #fff } .list-group-item > .badge { float: right } .list-group-item > .badge + .badge { margin-right: 5px } .nav-pills > li > a > .badge { margin-left: 3px } .jumbotron { padding-top: 30px; padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eee } .jumbotron h1, .jumbotron .h1 { color: inherit } .jumbotron p { margin-bottom: 15px; font-size: 21px; font-weight: 200 } .jumbotron > hr { border-top-color: #d5d5d5 } .container .jumbotron, .container-fluid .jumbotron { border-radius: 6px } .jumbotron .container { max-width: 100% } @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; padding-bottom: 48px } .container .jumbotron, .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px } .jumbotron h1, .jumbotron .h1 { font-size: 63px } } .thumbnail { display: block; padding: 4px; margin-bottom: 20px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: border .2s ease-in-out; -o-transition: border .2s ease-in-out; transition: border .2s ease-in-out } .thumbnail > img, .thumbnail a > img { margin-left: auto; margin-right: auto } a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { border-color: #337ab7 } .thumbnail .caption { padding: 9px; color: #333 } .alert { padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 4px } .alert h4 { margin-top: 0; color: inherit } .alert .alert-link { font-weight: bold } .alert > p, .alert > ul { margin-bottom: 0 } .alert > p + p { margin-top: 5px } .alert-dismissable, .alert-dismissible { padding-right: 35px } .alert-dismissable .close, .alert-dismissible .close { position: relative; top: -2px; right: -21px; color: inherit } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #3c763d } .alert-success hr { border-top-color: #c9e2b3 } .alert-success .alert-link { color: #2b542c } .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #31708f } .alert-info hr { border-top-color: #a6e1ec } .alert-info .alert-link { color: #245269 } .alert-warning { background-color: #fcf8e3; border-color: #faebcc; color: #8a6d3b } .alert-warning hr { border-top-color: #f7e1b5 } .alert-warning .alert-link { color: #66512c } .alert-danger { background-color: #f2dede; border-color: #ebccd1; color: #a94442 } .alert-danger hr { border-top-color: #e4b9c0 } .alert-danger .alert-link { color: #843534 } @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @-o-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } .progress { overflow: hidden; height: 20px; margin-bottom: 20px; background-color: #f5f5f5; border-radius: 4px; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1) } .progress-bar { float: left; width: 0%; height: 100%; font-size: 12px; line-height: 20px; color: #fff; text-align: center; background-color: #337ab7; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width .6s ease; -o-transition: width .6s ease; transition: width .6s ease } .progress-striped .progress-bar, .progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px } .progress.active .progress-bar, .progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite } .progress-bar-success { background-color: #5cb85c } .progress-striped .progress-bar-success { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-info { background-color: #5bc0de } .progress-striped .progress-bar-info { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-warning { background-color: #f0ad4e } .progress-striped .progress-bar-warning { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-danger { background-color: #d9534f } .progress-striped .progress-bar-danger { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .media { margin-top: 15px } .media:first-child { margin-top: 0 } .media, .media-body { zoom: 1; overflow: hidden } .media-body { width: 10000px } .media-object { display: block } .media-object.img-thumbnail { max-width: none } .media-right, .media > .pull-right { padding-left: 10px } .media-left, .media > .pull-left { padding-right: 10px } .media-left, .media-right, .media-body { display: table-cell; vertical-align: top } .media-middle { vertical-align: middle } .media-bottom { vertical-align: bottom } .media-heading { margin-top: 0; margin-bottom: 5px } .media-list { padding-left: 0; list-style: none } .list-group { margin-bottom: 20px; padding-left: 0 } .list-group-item { position: relative; display: block; padding: 10px 15px; margin-bottom: -1px; background-color: #fff; border: 1px solid #ddd } .list-group-item:first-child { border-top-right-radius: 4px; border-top-left-radius: 4px } .list-group-item:last-child { margin-bottom: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px } a.list-group-item, button.list-group-item { color: #555 } a.list-group-item .list-group-item-heading, button.list-group-item .list-group-item-heading { color: #333 } a.list-group-item:hover, button.list-group-item:hover, a.list-group-item:focus, button.list-group-item:focus { text-decoration: none; color: #555; background-color: #f5f5f5 } button.list-group-item { width: 100%; text-align: left } .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { background-color: #eee; color: #777; cursor: not-allowed } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, .list-group-item.disabled:focus .list-group-item-heading { color: inherit } .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { color: #777 } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7 } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, .list-group-item.active:focus .list-group-item-heading, .list-group-item.active .list-group-item-heading > small, .list-group-item.active:hover .list-group-item-heading > small, .list-group-item.active:focus .list-group-item-heading > small, .list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading > .small, .list-group-item.active:focus .list-group-item-heading > .small { color: inherit } .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { color: #c7ddef } .list-group-item-success { color: #3c763d; background-color: #dff0d8 } a.list-group-item-success, button.list-group-item-success { color: #3c763d } a.list-group-item-success .list-group-item-heading, button.list-group-item-success .list-group-item-heading { color: inherit } a.list-group-item-success:hover, button.list-group-item-success:hover, a.list-group-item-success:focus, button.list-group-item-success:focus { color: #3c763d; background-color: #d0e9c6 } a.list-group-item-success.active, button.list-group-item-success.active, a.list-group-item-success.active:hover, button.list-group-item-success.active:hover, a.list-group-item-success.active:focus, button.list-group-item-success.active:focus { color: #fff; background-color: #3c763d; border-color: #3c763d } .list-group-item-info { color: #31708f; background-color: #d9edf7 } a.list-group-item-info, button.list-group-item-info { color: #31708f } a.list-group-item-info .list-group-item-heading, button.list-group-item-info .list-group-item-heading { color: inherit } a.list-group-item-info:hover, button.list-group-item-info:hover, a.list-group-item-info:focus, button.list-group-item-info:focus { color: #31708f; background-color: #c4e3f3 } a.list-group-item-info.active, button.list-group-item-info.active, a.list-group-item-info.active:hover, button.list-group-item-info.active:hover, a.list-group-item-info.active:focus, button.list-group-item-info.active:focus { color: #fff; background-color: #31708f; border-color: #31708f } .list-group-item-warning { color: #8a6d3b; background-color: #fcf8e3 } a.list-group-item-warning, button.list-group-item-warning { color: #8a6d3b } a.list-group-item-warning .list-group-item-heading, button.list-group-item-warning .list-group-item-heading { color: inherit } a.list-group-item-warning:hover, button.list-group-item-warning:hover, a.list-group-item-warning:focus, button.list-group-item-warning:focus { color: #8a6d3b; background-color: #faf2cc } a.list-group-item-warning.active, button.list-group-item-warning.active, a.list-group-item-warning.active:hover, button.list-group-item-warning.active:hover, a.list-group-item-warning.active:focus, button.list-group-item-warning.active:focus { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b } .list-group-item-danger { color: #a94442; background-color: #f2dede } a.list-group-item-danger, button.list-group-item-danger { color: #a94442 } a.list-group-item-danger .list-group-item-heading, button.list-group-item-danger .list-group-item-heading { color: inherit } a.list-group-item-danger:hover, button.list-group-item-danger:hover, a.list-group-item-danger:focus, button.list-group-item-danger:focus { color: #a94442; background-color: #ebcccc } a.list-group-item-danger.active, button.list-group-item-danger.active, a.list-group-item-danger.active:hover, button.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus, button.list-group-item-danger.active:focus { color: #fff; background-color: #a94442; border-color: #a94442 } .list-group-item-heading { margin-top: 0; margin-bottom: 5px } .list-group-item-text { margin-bottom: 0; line-height: 1.3 } .panel { margin-bottom: 20px; background-color: #fff; border: 1px solid transparent; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) } .panel-body { padding: 15px } .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel-heading > .dropdown .dropdown-toggle { color: inherit } .panel-title { margin-top: 0; margin-bottom: 0; font-size: 16px; color: inherit } .panel-title > a, .panel-title > small, .panel-title > .small, .panel-title > small > a, .panel-title > .small > a { color: inherit } .panel-footer { padding: 10px 15px; background-color: #f5f5f5; border-top: 1px solid #ddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .list-group, .panel > .panel-collapse > .list-group { margin-bottom: 0 } .panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item { border-width: 1px 0; border-radius: 0 } .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { border-bottom: 0; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0 } .list-group + .panel-footer { border-top-width: 0 } .panel > .table, .panel > .table-responsive > .table, .panel > .panel-collapse > .table { margin-bottom: 0 } .panel > .table caption, .panel > .table-responsive > .table caption, .panel > .panel-collapse > .table caption { padding-left: 15px; padding-right: 15px } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { border-top-right-radius: 3px } .panel > .table:last-child, .panel > .table-responsive:last-child > .table:last-child { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { border-bottom-right-radius: 3px } .panel > .panel-body + .table, .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { border-top: 1px solid #ddd } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { border-top: 0 } .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0 } .panel > .table-bordered > thead > tr > th:first-child, .panel > .table-responsive > .table-bordered > thead > tr > th:first-child, .panel > .table-bordered > tbody > tr > th:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, .panel > .table-bordered > tfoot > tr > th:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, .panel > .table-bordered > thead > tr > td:first-child, .panel > .table-responsive > .table-bordered > thead > tr > td:first-child, .panel > .table-bordered > tbody > tr > td:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, .panel > .table-bordered > tfoot > tr > td:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .panel > .table-bordered > thead > tr > th:last-child, .panel > .table-responsive > .table-bordered > thead > tr > th:last-child, .panel > .table-bordered > tbody > tr > th:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, .panel > .table-bordered > tfoot > tr > th:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, .panel > .table-bordered > thead > tr > td:last-child, .panel > .table-responsive > .table-bordered > thead > tr > td:last-child, .panel > .table-bordered > tbody > tr > td:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, .panel > .table-bordered > tfoot > tr > td:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .panel > .table-bordered > thead > tr:first-child > td, .panel > .table-responsive > .table-bordered > thead > tr:first-child > td, .panel > .table-bordered > tbody > tr:first-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, .panel > .table-bordered > thead > tr:first-child > th, .panel > .table-responsive > .table-bordered > thead > tr:first-child > th, .panel > .table-bordered > tbody > tr:first-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { border-bottom: 0 } .panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tfoot > tr:last-child > td, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, .panel > .table-bordered > tfoot > tr:last-child > th, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { border-bottom: 0 } .panel > .table-responsive { border: 0; margin-bottom: 0 } .panel-group { margin-bottom: 20px } .panel-group .panel { margin-bottom: 0; border-radius: 4px } .panel-group .panel + .panel { margin-top: 5px } .panel-group .panel-heading { border-bottom: 0 } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #ddd } .panel-group .panel-footer { border-top: 0 } .panel-group .panel-footer + .panel-collapse .panel-body { border-bottom: 1px solid #ddd } .panel-default { border-color: #ddd } .panel-default > .panel-heading { color: #333; background-color: #f5f5f5; border-color: #ddd } .panel-default > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ddd } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #333 } .panel-default > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ddd } .panel-primary { border-color: #337ab7 } .panel-primary > .panel-heading { color: #fff; background-color: #337ab7; border-color: #337ab7 } .panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #337ab7 } .panel-primary > .panel-heading .badge { color: #337ab7; background-color: #fff } .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #337ab7 } .panel-success { border-color: #d6e9c6 } .panel-success > .panel-heading { color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6 } .panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #d6e9c6 } .panel-success > .panel-heading .badge { color: #dff0d8; background-color: #3c763d } .panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #d6e9c6 } .panel-info { border-color: #bce8f1 } .panel-info > .panel-heading { color: #31708f; background-color: #d9edf7; border-color: #bce8f1 } .panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #bce8f1 } .panel-info > .panel-heading .badge { color: #d9edf7; background-color: #31708f } .panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #bce8f1 } .panel-warning { border-color: #faebcc } .panel-warning > .panel-heading { color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc } .panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #faebcc } .panel-warning > .panel-heading .badge { color: #fcf8e3; background-color: #8a6d3b } .panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #faebcc } .panel-danger { border-color: #ebccd1 } .panel-danger > .panel-heading { color: #a94442; background-color: #f2dede; border-color: #ebccd1 } .panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ebccd1 } .panel-danger > .panel-heading .badge { color: #f2dede; background-color: #a94442 } .panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ebccd1 } .embed-responsive { position: relative; display: block; height: 0; padding: 0; overflow: hidden } .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, .embed-responsive object, .embed-responsive video { position: absolute; top: 0; left: 0; bottom: 0; height: 100%; width: 100%; border: 0 } .embed-responsive-16by9 { padding-bottom: 56.25% } .embed-responsive-4by3 { padding-bottom: 75% } .well { min-height: 20px; padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #e3e3e3; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05) } .well blockquote { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15) } .well-lg { padding: 24px; border-radius: 6px } .well-sm { padding: 9px; border-radius: 3px } .close { float: right; font-size: 21px; font-weight: bold; line-height: 1; color: #000; text-shadow: 0 1px 0 #fff; opacity: .2; filter: alpha(opacity=20) } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; opacity: .5; filter: alpha(opacity=50) } button.close { padding: 0; cursor: pointer; background: transparent; border: 0; -webkit-appearance: none } .modal-open { overflow: hidden } .modal { display: none; overflow: hidden; position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1050; -webkit-overflow-scrolling: touch; outline: 0 } .modal.fade .modal-dialog { -webkit-transform: translate(0, -25%); -ms-transform: translate(0, -25%); -o-transform: translate(0, -25%); transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -ms-transform: translate(0, 0); -o-transform: translate(0, 0); transform: translate(0, 0) } .modal-open .modal { overflow-x: hidden; overflow-y: auto } .modal-dialog { position: relative; width: auto; margin: 10px } .modal-content { position: relative; background-color: #fff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); -webkit-background-clip: padding-box; background-clip: padding-box; outline: 0 } .modal-backdrop { position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1040; background-color: #000 } .modal-backdrop.fade { opacity: 0; filter: alpha(opacity=0) } .modal-backdrop.in { opacity: .5; filter: alpha(opacity=50) } .modal-header { padding: 15px; border-bottom: 1px solid #e5e5e5; min-height: 16.42857143px } .modal-header .close { margin-top: -2px } .modal-title { margin: 0; line-height: 1.42857143 } .modal-body { position: relative; padding: 15px } .modal-footer { padding: 15px; text-align: right; border-top: 1px solid #e5e5e5 } .modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0 } .modal-footer .btn-group .btn + .btn { margin-left: -1px } .modal-footer .btn-block + .btn-block { margin-left: 0 } .modal-scrollbar-measure { position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll } @media (min-width: 768px) { .modal-dialog { width: 600px; margin: 30px auto } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5) } .modal-sm { width: 300px } } @media (min-width: 992px) { .modal-lg { width: 900px } } .tooltip { position: absolute; z-index: 1070; display: block; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 12px; opacity: 0; filter: alpha(opacity=0) } .tooltip.in { opacity: .9; filter: alpha(opacity=90) } .tooltip.top { margin-top: -3px; padding: 5px 0 } .tooltip.right { margin-left: 3px; padding: 0 5px } .tooltip.bottom { margin-top: 3px; padding: 5px 0 } .tooltip.left { margin-left: -3px; padding: 0 5px } .tooltip-inner { max-width: 200px; padding: 3px 8px; color: #fff; text-align: center; background-color: #000; border-radius: 4px } .tooltip-arrow { position: absolute; width: 0; height: 0; border-color: transparent; border-style: solid } .tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-left .tooltip-arrow { bottom: 0; right: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-right .tooltip-arrow { bottom: 0; left: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; border-right-color: #000 } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; border-left-color: #000 } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-left .tooltip-arrow { top: 0; right: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-right .tooltip-arrow { top: 0; left: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .popover { position: absolute; top: 0; left: 0; z-index: 1060; display: none; max-width: 276px; padding: 1px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 14px; background-color: #fff; -webkit-background-clip: padding-box; background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) } .popover.top { margin-top: -10px } .popover.right { margin-left: 10px } .popover.bottom { margin-top: 10px } .popover.left { margin-left: -10px } .popover-title { margin: 0; padding: 8px 14px; font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; border-radius: 5px 5px 0 0 } .popover-content { padding: 9px 14px } .popover > .arrow, .popover > .arrow:after { position: absolute; display: block; width: 0; height: 0; border-color: transparent; border-style: solid } .popover > .arrow { border-width: 11px } .popover > .arrow:after { border-width: 10px; content: "" } .popover.top > .arrow { left: 50%; margin-left: -11px; border-bottom-width: 0; border-top-color: #999; border-top-color: rgba(0, 0, 0, 0.25); bottom: -11px } .popover.top > .arrow:after { content: " "; bottom: 1px; margin-left: -10px; border-bottom-width: 0; border-top-color: #fff } .popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; border-left-width: 0; border-right-color: #999; border-right-color: rgba(0, 0, 0, 0.25) } .popover.right > .arrow:after { content: " "; left: 1px; bottom: -10px; border-left-width: 0; border-right-color: #fff } .popover.bottom > .arrow { left: 50%; margin-left: -11px; border-top-width: 0; border-bottom-color: #999; border-bottom-color: rgba(0, 0, 0, 0.25); top: -11px } .popover.bottom > .arrow:after { content: " "; top: 1px; margin-left: -10px; border-top-width: 0; border-bottom-color: #fff } .popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; border-right-width: 0; border-left-color: #999; border-left-color: rgba(0, 0, 0, 0.25) } .popover.left > .arrow:after { content: " "; right: 1px; border-right-width: 0; border-left-color: #fff; bottom: -10px } .carousel { position: relative } .carousel-inner { position: relative; overflow: hidden; width: 100% } .carousel-inner > .item { display: none; position: relative; -webkit-transition: .6s ease-in-out left; -o-transition: .6s ease-in-out left; transition: .6s ease-in-out left } .carousel-inner > .item > img, .carousel-inner > .item > a > img { line-height: 1 } @media all and (transform-3d),(-webkit-transform-3d) { .carousel-inner > .item { -webkit-transition: -webkit-transform 0.6s ease-in-out; -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; perspective: 1000px } .carousel-inner > .item.next, .carousel-inner > .item.active.right { -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0 } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0 } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0 } } .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { display: block } .carousel-inner > .active { left: 0 } .carousel-inner > .next, .carousel-inner > .prev { position: absolute; top: 0; width: 100% } .carousel-inner > .next { left: 100% } .carousel-inner > .prev { left: -100% } .carousel-inner > .next.left, .carousel-inner > .prev.right { left: 0 } .carousel-inner > .active.left { left: -100% } .carousel-inner > .active.right { left: 100% } .carousel-control { position: absolute; top: 0; left: 0; bottom: 0; width: 15%; opacity: .5; filter: alpha(opacity=50); font-size: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-control.left { background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1) } .carousel-control.right { left: auto; right: 0; background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1) } .carousel-control:hover, .carousel-control:focus { outline: 0; color: #fff; text-decoration: none; opacity: .9; filter: alpha(opacity=90) } .carousel-control .icon-prev, .carousel-control .icon-next, .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; margin-top: -10px; z-index: 5; display: inline-block } .carousel-control .icon-prev, .carousel-control .glyphicon-chevron-left { left: 50%; margin-left: -10px } .carousel-control .icon-next, .carousel-control .glyphicon-chevron-right { right: 50%; margin-right: -10px } .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; height: 20px; line-height: 1; font-family: serif } .carousel-control .icon-prev:before { content: '\2039' } .carousel-control .icon-next:before { content: '\203a' } .carousel-indicators { position: absolute; bottom: 10px; left: 50%; z-index: 15; width: 60%; margin-left: -30%; padding-left: 0; list-style: none; text-align: center } .carousel-indicators li { display: inline-block; width: 10px; height: 10px; margin: 1px; text-indent: -999px; border: 1px solid #fff; border-radius: 10px; cursor: pointer; background-color: #000 \9; background-color: rgba(0, 0, 0, 0) } .carousel-indicators .active { margin: 0; width: 12px; height: 12px; background-color: #fff } .carousel-caption { position: absolute; left: 15%; right: 15%; bottom: 20px; z-index: 10; padding-top: 20px; padding-bottom: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-caption .btn { text-shadow: none } @media screen and (min-width: 768px) { .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; height: 30px; margin-top: -15px; font-size: 30px } .carousel-control .glyphicon-chevron-left, .carousel-control .icon-prev { margin-left: -15px } .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { margin-right: -15px } .carousel-caption { left: 20%; right: 20%; padding-bottom: 30px } .carousel-indicators { bottom: 20px } } .clearfix:before, .clearfix:after, .dl-horizontal dd:before, .dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, .container-fluid:after, .row:before, .row:after, .form-horizontal .form-group:before, .form-horizontal .form-group:after, .btn-toolbar:before, .btn-toolbar:after, .btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after, .nav:before, .nav:after, .navbar:before, .navbar:after, .navbar-header:before, .navbar-header:after, .navbar-collapse:before, .navbar-collapse:after, .pager:before, .pager:after, .panel-body:before, .panel-body:after, .modal-footer:before, .modal-footer:after { content: " "; display: table } .clearfix:after, .dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, .form-horizontal .form-group:after, .btn-toolbar:after, .btn-group-vertical > .btn-group:after, .nav:after, .navbar:after, .navbar-header:after, .navbar-collapse:after, .pager:after, .panel-body:after, .modal-footer:after { clear: both } .center-block { display: block; margin-left: auto; margin-right: auto } .pull-right { float: right !important } .pull-left { float: left !important } .hide { display: none !important } .show { display: block !important } .invisible { visibility: hidden } .text-hide { font: 0/0 a; color: transparent; text-shadow: none; background-color: transparent; border: 0 } .hidden { display: none !important } .affix { position: fixed } @-ms-viewport { width: device-width } .visible-xs, .visible-sm, .visible-md, .visible-lg { display: none !important } .visible-xs-block, .visible-xs-inline, .visible-xs-inline-block, .visible-sm-block, .visible-sm-inline, .visible-sm-inline-block, .visible-md-block, .visible-md-inline, .visible-md-inline-block, .visible-lg-block, .visible-lg-inline, .visible-lg-inline-block { display: none !important } @media (max-width: 767px) { .visible-xs { display: block !important } table.visible-xs { display: table !important } tr.visible-xs { display: table-row !important } th.visible-xs, td.visible-xs { display: table-cell !important } } @media (max-width: 767px) { .visible-xs-block { display: block !important } } @media (max-width: 767px) { .visible-xs-inline { display: inline !important } } @media (max-width: 767px) { .visible-xs-inline-block { display: inline-block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important } table.visible-sm { display: table !important } tr.visible-sm { display: table-row !important } th.visible-sm, td.visible-sm { display: table-cell !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-block { display: block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline { display: inline !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline-block { display: inline-block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important } table.visible-md { display: table !important } tr.visible-md { display: table-row !important } th.visible-md, td.visible-md { display: table-cell !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-block { display: block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline { display: inline !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline-block { display: inline-block !important } } @media (min-width: 1200px) { .visible-lg { display: block !important } table.visible-lg { display: table !important } tr.visible-lg { display: table-row !important } th.visible-lg, td.visible-lg { display: table-cell !important } } @media (min-width: 1200px) { .visible-lg-block { display: block !important } } @media (min-width: 1200px) { .visible-lg-inline { display: inline !important } } @media (min-width: 1200px) { .visible-lg-inline-block { display: inline-block !important } } @media (max-width: 767px) { .hidden-xs { display: none !important } } @media (min-width: 768px) and (max-width: 991px) { .hidden-sm { display: none !important } } @media (min-width: 992px) and (max-width: 1199px) { .hidden-md { display: none !important } } @media (min-width: 1200px) { .hidden-lg { display: none !important } } .visible-print { display: none !important } @media print { .visible-print { display: block !important } table.visible-print { display: table !important } tr.visible-print { display: table-row !important } th.visible-print, td.visible-print { display: table-cell !important } } .visible-print-block { display: none !important } @media print { .visible-print-block { display: block !important } } .visible-print-inline { display: none !important } @media print { .visible-print-inline { display: inline !important } } .visible-print-inline-block { display: none !important } @media print { .visible-print-inline-block { display: inline-block !important } } @media print { .hidden-print { display: none !important } }
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./.github/workflows/release.yml
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven name: publish sdks on: workflow_dispatch: inputs: repository: description: 'Maven Repository(snapshots or releases)' required: true default: 'snapshots' jobs: publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Set up Maven Central Repository uses: actions/setup-java@v1 with: java-version: 7 server-id: ${{ github.event.inputs.repository }} server-username: MAVEN_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Apache Maven Central run: mvn clean deploy -pl apollo-client,apollo-mockserver,apollo-openapi -am -DskipTests=true "-Dreleases.repo=https://oss.sonatype.org/service/local/staging/deploy/maven2" "-Dsnapshots.repo=https://oss.sonatype.org/content/repositories/snapshots" env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven name: publish sdks on: workflow_dispatch: inputs: repository: description: 'Maven Repository(snapshots or releases)' required: true default: 'snapshots' jobs: publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Set up Maven Central Repository uses: actions/setup-java@v1 with: java-version: 7 server-id: ${{ github.event.inputs.repository }} server-username: MAVEN_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Apache Maven Central run: mvn clean deploy -pl apollo-client,apollo-mockserver,apollo-openapi -am -DskipTests=true "-Dreleases.repo=https://oss.sonatype.org/service/local/staging/deploy/maven2" "-Dsnapshots.repo=https://oss.sonatype.org/content/repositories/snapshots" env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-1
apolloconfig/apollo
3,878
add history query.
## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
Accelerator96
2021-08-06T12:54:42Z
2021-08-13T03:06:53Z
2e2919d21c4590212b6b471075f81749e4606c26
9e0b1ee9a9984ed021714e4474ce44e44738a04c
add history query.. ## What's the purpose of this PR 添加了通过配置的key对变更历史的查询 ## Which issue(s) this PR fixes: Fixes #3195 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/PrivilegeRepository.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.repository; import com.ctrip.framework.apollo.biz.entity.Privilege; import org.springframework.data.repository.PagingAndSortingRepository; import java.util.List; public interface PrivilegeRepository extends PagingAndSortingRepository<Privilege, Long> { List<Privilege> findByNamespaceId(long namespaceId); List<Privilege> findByNamespaceIdAndPrivilType(long namespaceId, String privilType); Privilege findByNamespaceIdAndNameAndPrivilType(long namespaceId, String name, String privilType); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.repository; import com.ctrip.framework.apollo.biz.entity.Privilege; import org.springframework.data.repository.PagingAndSortingRepository; import java.util.List; public interface PrivilegeRepository extends PagingAndSortingRepository<Privilege, Long> { List<Privilege> findByNamespaceId(long namespaceId); List<Privilege> findByNamespaceIdAndPrivilType(long namespaceId, String privilType); Privilege findByNamespaceIdAndNameAndPrivilType(long namespaceId, String name, String privilType); }
-1