From e2007fc4f4d5128c572a094a5ac72461bad6d526 Mon Sep 17 00:00:00 2001
From: Ahoo Wang <ahoowang@qq.com>
Date: Sun, 7 Apr 2024 13:42:08 +0800
Subject: [PATCH] feat(dashboard): add favicon.ico

---
 cosky-dashboard/src/favicon.ico                 | Bin 0 -> 15406 bytes
 cosky-dashboard/src/index.html                  |   1 +
 .../redis/ConsistencyRedisServiceDiscovery.kt   |  16 +++++++---------
 3 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 cosky-dashboard/src/favicon.ico

diff --git a/cosky-dashboard/src/favicon.ico b/cosky-dashboard/src/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..26fcd08e24239884a93288f57c22e4fbfb5bc078
GIT binary patch
literal 15406
zcmeI2S#Xrc5y#hwt5SY(kp~`=qEb%EkK`q9N%_^UNmgJ;f)jE$wi6u3RO~o0#3s&R
z$2pw%zyy~QCk9C%0YVsah{GJ_G+;pD5+HF{AjByo0qXpJ(>v0~YFA!qS6W=oRPE09
z%{SBC)7{h4(><xwZK+SE#*9g+9+!IH_EhRCsZ?s*IDfzUv#HcvwT&O2`TnI;YU9{c
z>TdPX5RLG5RRtBRNsqUxikGdjqRA@L-Tu>a^@Nx7EG)T;zTKg5vsL%%XL)|Tg7YeU
zlTdgUzO{MA<bW0W_QA-&%+W6|9R{t?Ae`g%8;s_BaC-x<oG<zM3~XQZq*?PCvrT`7
z2IuptUzu%v*{trzW}E+Nw&DqWo8W!c{KjFdd)92F+Ic^<!|eQVv-Q7gvgMC;+qolV
z4KvMJ-!nV1(yaZU*_lRvKe0_PUo^XP%Ix$mv&O~Ve*T!*2bDdxdPaAk2bsMy-HiS%
zn*{s!X7Bx7xZYR&H?xZ;%#Ll)nE8UUo3Wzrg>G9gsma<8m~DRzdd!yp+-U^fp0@;V
zi`pLZId7Y7w)lr;tDo|@);-u1c(C(zeQz*3^!CmCf(F{@&kvp@bqn63ufvsJMxQf!
zdo%1Lo?Oq;<EX>JUzGl4^ze?19uKCAy%}2jbU)G%Ytb^^*J{@KMc2fu*soMIc4nM@
z_vnXxDz@00lkc?o759aCR;9PfE}XHd^tJHw=dJqwn%2ietDk&lvH0S6tNz9ptvWqN
zc&^-}W4UA>+q~}_#zr_pt%L5&uXtYb>?s&;#NStIY*oc`z#0mETa>;_c=rq+Z?=66
zu<j~^2CJU<W#Mfr9qv9_+JHS64Z^8;j|lE)L)zeNE*gXvTTw!u_su)v&eQ?N0DZ{l
zNmk!{Fp6xKUMG1F)>u(`K2&<NE)r`~yq}}r=*&IhkxhXI*s3AfmN<SWHTx|4^_l%<
z8~*6?#71FLv6n-EHJrXDx0@Z*9{&En%&vEvEt={yV9&AH!+|-JG5824<-c@av{3LJ
z7JeuAdg8tI63HH4t7WrUN3;7e_+7Q%H9IW7spE)$TlR?4z2IAB2bRj8IwZK7+r~d-
zbf?0{<Bu$TSl{H29ePK8+vD=TR{IYh?Z$QYo9Z9(eGK2|#x=969qt?LTWEIWtlrN%
zy^V|92kN=({@pp@rL^t!cb<3u*Q|OHPfjy_-nqkO$K{*#_If+CbP48-9+yQ&^VzU}
z?ydIko8)6gzSc}JyL{TLv)$X;J`hc3oDcYs$gxuM1t)a%T=93>8AsXt7jN5N<L~u9
zG28J^e}4B5X1m^$477*ids6UkBYtXl4__Al!1)S4k8hL?Kksv@{hry9ABh&tC*aqZ
zi>-R@lwUZ*?Cb%T5Bg8RZ>|5SKO;YI<2!77)!XnZllY;xTXSQ+=<cbVE=&5X`>kN<
zJN`0dZ<UXQ-_X)7-s6A6duXH_T;_c)i9g6L`YlTyP(SGe@(K9G*GLCAn(E|Zuh&`N
zmHu{kkN#1R^TH|qZO2@*Ygfg4`R1G_&|_dVH}w0-=*spv%ztafZxpYE8`%Nt(n*(f
zHa{Xw)aW+_+3gT4&IYtc{vKPGpjGY3vGJL;j}71*I<IxPzCqiEd;B~S`)1dyL1fcd
z>ud4MzJ44$!-MQG+3(oCU;||fS+h0wOU`fjd5Cq*xhi{1@|`o=iLGv1SmW^<&zyVW
zd#)P$oAFbFf0?V#$hL+3C+tD^xMkdb0}a8~&7&u!=7W4<a3+gnRaXBCTHNm*VgFM;
zZgSq)&*k*LBQ26e>CYc|{O*V|yAJvg&Q3+1zg({e_}kg|^1ZunJdE=vXV!#|n-6}W
z?e3?_UWPMvp7S?xKJ2+{YN2pH>HUb45PZ2`zf#0W1ZF_7nKM77y={zDfBg$q_04;w
z+q1Oy*Xg%kzYh5T9!KH1GTkT{E>+tzp)X??D;NU+k8p!E+;h8hn0UZ+(OGNr(<k&i
z_`W*udutdA3}6Z72$LPa+glSqm)X}_M0XJ}oXmU!jEds{<{RnHkHj3zQn!h}V{Kmg
zQTYQGhQaFsWfNcvhj0mJspeu;6Td2$%k(Rr-vjk1dv4%ZrnU05V(AZjUyz<Ec&GIn
zEY6!vL$UAR0;dk-!;^#6-}@PxH{lWK_+`N<mY(5`za-q#pk*ks$mshtjcqR@?QzcS
zfsaFwgJ?!)n0tg#-WnZ{9)FY!0^hZ6L^rxuUYZBuKOOAIAaW4RWA($%jOJP`luytE
zZOZoMF8YS;9Ss{<D9zdZdf0<<QE%G&Ms{y1l|E{ZlMj%bgZndOh&2z?@oawQe&-C4
z@R!^dlMganc%whA1)7mT@PY9GOW})^avtQpcmK!Zn#3fD9aT?sc{r`p`}}u&;8Nl)
z7S^KgD^9mt@j}HjiPaLb?mTC<c2>VWL32ENRHj>RDf)@u5pyS2PW*3|V!Wn!EwR#t
z-;OdkkvKQ?&#PG8m0~<J61OETPt3XZ1`%1s-#_$w5ya-f!<mosToNboedbRbo;dG{
zUwAA(_8}I^-4XId<VMJs#BZ?%Ki`1SFrz=O6Tee)KLt3|_xbomirLfm?VpJ*^jvXl
z@-y5YA<w~G6iU}cGx7#Yv_3emawd&%StD(V@gh57!2GUC?}({G5BU^g?_C$f7rrUy
z!5tXZT7*H&Jqd%n$oZpY+g|DK1AV|?{K{V{A0*maHhK=_a+}|EA)mn=8g!q#FbC^J
zymW~8Gr5cA2F+n=o$xjW+{>nk-b>6-eL6j_0UeA*hR70p6!IA4?Z{mLkGnnOAjlJt
zlc12xVa-8jls|k#_BE1OEaa%LGtfp(2bzJ&I|bYqPxiM#<M!EtD>>||Y7B7#WOY<|
z2nx9Zat%?(&==MaITvys&=Tob`?TX^9CHRwpjG|I=b(G^;r<Zxkf$TRg3iP_?V0Cu
zgznXnF*!u;8ihG%7<@)P%rTBxFTEs}aP{03(SOaz8C+;lXBBcMNqs;ssx-e1&$&Kb
z?=su+lIsGx16|atE&9MiayGmEozWMK1sAy}@RMT!Cj6sxN<S#%?%vg!;vN_D99iY<
z<WFj*D6jI6%ZAoN%hhMH&xsff-{BpF`~>;QsL!!xU7<tJ0Dr*4x<Hq>X9XSH=W5;J
zaQ4@FANuW??{f<Di;uwM4i_cx{nxI0$R3#W4=eZif`3OhSySi%ce^O$#-QKt=_t;m
z^+bM&!aBzmM7m>*%#W`1K8#=axbk){Iv<0r-tTf|9kDjhF>qjGB5%;$_0Kx&!z&yX
z|K!og1(KhP{2|9fL2mJW9r;kcBV%kyh><B)294aKqo7C3H`1M~$ybKFpmYXVK;u5a
z+_%8*x5d8bD?C{HjN@|1X3)%>=(pt`-im$b(!8)c*cJ4VJTWk0K`$9Y&3Z=nfQ{`T
z-p4ogX4WS;=+!e4^h<vuUDV8>xglfQGzWMabDYV3tX=p-foJFydL8>Lf7ES7TsO%7
zisryw1oV)89kRRF&zM7lue70itWmf9vqE3=gRvBHZ_ID!T&InE^2#S&pMi@`vwx7c
z$5+9AMY^bg#U2CQ*b#E{XPbQ8#5sUJ=2?*+aLCC<{{T4jL9c)p;0w>1r(Jh=kFnJ7
zP45j)xqOfT`wsb5a+a)3<O@$@-@$5VIJ(YxLEf471JZH!kA@izW5Fa}v-Dz*jO~NL
z&Hje}KpZ&6Uy%>8fp6#;b`QH1b(Q;_*)Vdw!!Onb`iLE^dr<PI_5G1Mqj3y220Y;F
zv$x`7{62Wy8feD{js7!tX|X@Z6W^8fgnov544v-J3=Xp&H}<2W+4tc9tH*VSJG&7E
zYc$wk&4IfMvAvKw`p?Ah<M{>H$bfSKx=8N);BvQb_*-#LE(pGK6?i*e_x*-@4uN*H
zC&$;z-a>n{OUZBfo)hPna0c^Oe#=d8^NqbF+KIRO`7zKR@(~~3^Lv;Bd5IB??H9Z*
zZ`Q8?@>cvLPoBf`6SsK$N-;M0ovTRyKi=^}#YQu^mRmD^OKf?N_-&L4vFbACEwa}D
zvHXvWpZC#^9LT-gD)|d?Fa_{E(oY@oM~o|H9)r9Ed>mr_D9$63M=D?b4m}<s-y`kG
znp~#jFuM6u<!qBQ6!V;s1GaVK^VcCqUfTS1a_%9|LHxZ^K1eBI)(%7QaKX&VOC<4@
z@_E4hjp4+9Idiz*KC1UOl6>fkzsLJCoag*Z>T$6U-w1bT6ypeYYB+1_j!ov=RHpkg
N$vOQ0`IF6o{{h2c9<l%c

literal 0
HcmV?d00001

diff --git a/cosky-dashboard/src/index.html b/cosky-dashboard/src/index.html
index 3d553684..ff9295a3 100644
--- a/cosky-dashboard/src/index.html
+++ b/cosky-dashboard/src/index.html
@@ -7,6 +7,7 @@
         content="High-performance, low-cost microservice governance platform. Service Discovery and Configuration Service.">
   <base href="/dashboard/">
 <!--  <base href="/">-->
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
diff --git a/cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/redis/ConsistencyRedisServiceDiscovery.kt b/cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/redis/ConsistencyRedisServiceDiscovery.kt
index 0169b512..0a149dd9 100644
--- a/cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/redis/ConsistencyRedisServiceDiscovery.kt
+++ b/cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/redis/ConsistencyRedisServiceDiscovery.kt
@@ -117,15 +117,13 @@ class ConsistencyRedisServiceDiscovery(
         require(instanceId.isNotBlank()) { "instanceId must not be blank!" }
         val namespacedServiceId = NamespacedServiceId(namespace, serviceId)
         val instancesMono = serviceMapInstances[namespacedServiceId]
-        return if (instancesMono == null) {
-            delegate.getInstance(namespace, serviceId, instanceId)
-        } else {
-            instancesMono
-                .flatMapIterable(Function.identity())
-                .switchIfEmpty(delegate.getInstance(namespace, serviceId, instanceId))
-                .filter { it.instanceId == instanceId }
-                .next()
-        }
+            ?: return delegate.getInstance(namespace, serviceId, instanceId)
+
+        return instancesMono
+            .flatMapIterable(Function.identity())
+            .switchIfEmpty(delegate.getInstance(namespace, serviceId, instanceId))
+            .filter { it.instanceId == instanceId }
+            .next()
     }
 
     override fun getInstance(namespace: String, serviceId: String, instanceId: String): Mono<ServiceInstance> {