From da9f42b2ef1811f2bcb35124064e123a16dfef1d Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Thu, 15 Nov 2018 17:30:20 +0800
Subject: [PATCH] fix bug

---
 .../java/com/tamguo/config/web/WebConfig.java |   2 +-
 .../tamguo/interceptor/MemberInterceptor.java |   8 ++------
 .../src/main/resources/application.properties |   1 -
 .../main/resources/static/images/favicon.png  | Bin 0 -> 7524 bytes
 .../templates/member/book/compare.html        |   1 +
 .../resources/templates/member/book/edit.html |   2 +-
 .../templates/member/book/history.html        |   1 +
 .../main/resources/static/images/favicon.png  | Bin 3176 -> 7524 bytes
 8 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 tamguo-bms/src/main/resources/static/images/favicon.png

diff --git a/tamguo-bms/src/main/java/com/tamguo/config/web/WebConfig.java b/tamguo-bms/src/main/java/com/tamguo/config/web/WebConfig.java
index 27b0699..15347d5 100644
--- a/tamguo-bms/src/main/java/com/tamguo/config/web/WebConfig.java
+++ b/tamguo-bms/src/main/java/com/tamguo/config/web/WebConfig.java
@@ -24,6 +24,6 @@ public class WebConfig implements WebMvcConfigurer {
     
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(memberInterceptor).addPathPatterns("/member/**");
+	//	registry.addInterceptor(memberInterceptor).addPathPatterns("/member/**");
 	}
 }
diff --git a/tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java b/tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java
index 411e506..60e547c 100644
--- a/tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java
+++ b/tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java
@@ -4,7 +4,6 @@ import java.net.URLEncoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -20,9 +19,6 @@ public class MemberInterceptor extends HandlerInterceptorAdapter{
 	/** 登录URL */
 	private String loginUrl = DEFAULT_LOGIN_URL;
 	
-	@Value("${tiku.admin.name}")
-	private String tDomainName;
-	
 	/**
 	 * 请求前处理
 	 * 
@@ -48,9 +44,9 @@ public class MemberInterceptor extends HandlerInterceptorAdapter{
 			} else {
 				if (request.getMethod().equalsIgnoreCase("GET")) {
 					String redirectUrl = request.getQueryString() != null ? request.getRequestURI() + "?" + request.getQueryString() : request.getRequestURI();
-					response.sendRedirect(tDomainName + request.getContextPath() + loginUrl + "?" + REDIRECT_URL_PARAMETER_NAME + "=" + URLEncoder.encode(redirectUrl, "UTF-8"));
+					response.sendRedirect(request.getContextPath() + loginUrl + "?" + REDIRECT_URL_PARAMETER_NAME + "=" + URLEncoder.encode(redirectUrl, "UTF-8"));
 				} else {
-					response.sendRedirect(tDomainName + request.getContextPath() + loginUrl);
+					response.sendRedirect(request.getContextPath() + loginUrl);
 				}
 				return false;
 			}
diff --git a/tamguo-bms/src/main/resources/application.properties b/tamguo-bms/src/main/resources/application.properties
index 8508fca..804550b 100644
--- a/tamguo-bms/src/main/resources/application.properties
+++ b/tamguo-bms/src/main/resources/application.properties
@@ -1,6 +1,5 @@
 domain.name=http://localhost:8083/
 admin.domain.name=http://localhost:8083/
-tiku.admin.name=https://www.tamguo.com/
 server.port=8083
 jasypt.encryptor.password=tamguo
 
diff --git a/tamguo-bms/src/main/resources/static/images/favicon.png b/tamguo-bms/src/main/resources/static/images/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..31662f6fa3892d65d9606a8b535198dc8d26991a
GIT binary patch
literal 7524
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

literal 0
HcmV?d00001

diff --git a/tamguo-bms/src/main/resources/templates/member/book/compare.html b/tamguo-bms/src/main/resources/templates/member/book/compare.html
index cca96d3..b1ee25a 100644
--- a/tamguo-bms/src/main/resources/templates/member/book/compare.html
+++ b/tamguo-bms/src/main/resources/templates/member/book/compare.html
@@ -11,6 +11,7 @@
     <link type="text/css" rel="stylesheet" th:href="${domainName + 'mergely/lib/codemirror.css'}" />
     <link type="text/css" rel="stylesheet" th:href="${domainName + 'mergely/lib/mergely.css'}" />
     <link type='text/css' rel='stylesheet' th:href="${domainName + 'mergely/editor/editor.css'}" />
+    <link type="favicon" rel="shortcut icon" th:href="${domainName + 'images/favicon.png'}" />
 
     <script type="text/javascript" th:src="${domainName + 'jquery/1.12.4/jquery.min.js'}"></script>
     <script type="text/javascript" th:src="${domainName + 'mergely/editor/lib/wicked-ui.js'}"></script>
diff --git a/tamguo-bms/src/main/resources/templates/member/book/edit.html b/tamguo-bms/src/main/resources/templates/member/book/edit.html
index 7aa0be3..b592c1d 100644
--- a/tamguo-bms/src/main/resources/templates/member/book/edit.html
+++ b/tamguo-bms/src/main/resources/templates/member/book/edit.html
@@ -52,7 +52,7 @@
     <link th:href="${domainName + 'webuploader/webuploader.css'}" rel="stylesheet">
     <link th:href="${domainName + 'css/markdown.css'}" rel="stylesheet">
     <link th:href="${domainName + 'css/markdown.preview.css'}" rel="stylesheet">
-    
+    <link type="favicon" rel="shortcut icon" th:href="${domainName + 'images/favicon.png'}" />
     <style type="text/css">
         .text{
             font-size: 12px;
diff --git a/tamguo-bms/src/main/resources/templates/member/book/history.html b/tamguo-bms/src/main/resources/templates/member/book/history.html
index 7ec8f4a..2e7bff2 100644
--- a/tamguo-bms/src/main/resources/templates/member/book/history.html
+++ b/tamguo-bms/src/main/resources/templates/member/book/history.html
@@ -9,6 +9,7 @@
     <meta name="author" content="SmartWiki" />
     <title>历史版本 - Tamguo</title>
     <link th:href="${domainName + 'bootstrap/css/bootstrap.min.css'}" rel="stylesheet">
+    <link type="favicon" rel="shortcut icon" th:href="${domainName + 'images/favicon.png'}" />
     <script th:src="${domainName + 'jquery/1.12.4/jquery.min.js'}"></script>
     <style type="text/css">
         .container{margin: 5px auto;}
diff --git a/tamguo-tms/src/main/resources/static/images/favicon.png b/tamguo-tms/src/main/resources/static/images/favicon.png
index 13af7ccec224bbb9b7a296b58748c7e2887036de..31662f6fa3892d65d9606a8b535198dc8d26991a 100644
GIT binary patch
literal 7524
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

literal 3176
zcmeHKXH-+!77iF70g(tw6}ghon~H*{lq)rK5FI2m1wjx(H7KE&fQm9g=tY_sk&b{A
z0|a$Y5EYaXL`XoYfDl1?2`|2x`SG5!*34S(@B4A?KKGt|_S*ZD@B8j;YfEE(UU6Os
z1j3ItF|cLZwjT|~&3=~Im*+qrJJrwzpxssH+3d(d`bEjsA<u@6-U*MxOC2gISL$ne
zP|QGVB|OT1kA}LmNJmv3ADWAGe(>pS172{?4bdaEZWqW~&z|W@&q=;DzgX!{s6MPN
zs`XlnLU9UVT81sf&C#1yvVw9~R<f9rcxuJ>PS(e3jNHj<;W>Tb)X5NwK>$J!gZH@Z
z;DEg~hkzd?5tsDXW<Np?u?&HB!TgEj05>~B7+_*3{_b!$+lp%%or#7J?Z_XL)$c<7
z*>EzNBw*%Xn?SV-$nY~;Zy^7IRH5!9`j8f*$<@*XH&tKcV@#I@+ReA*VC?W0;vzZ}
zCp`1HoDL4}Mq`l5G8BLZRTc-iqZOR>%mZzOYn=AtLh>bQPh6#5((6(C^_hMmR;6_P
z>gP7%p#0Q)K8H>7LC*e%ORc;m&YU1NaWVGyPa7yFC;KZ<1##`Adk8&}?Db<{@hpN^
zPi)*CITJaH!P6VPnGXWXS!oT-<`|)t8K-U`@^&147k!)Fp!%)-AO*%*^C_#2ypEUX
znScgZA)pEuE>E5o0>k360G;0+!(k(J++f(v^FoLgKYrrs&fjE#m?3fKyx2_(Jw)?S
z*ogYhd)I-8%ZL_FQ4J1olLo|e9`xZPu9kTzwizmI>~g8Wbzh565Ik-%+^5@AcMk0=
zAM7IUW0bzFc9a7Ol5G8kaaQ|51euO6?OB5nfrpG|vpFY;fJwuOebM*bP|&oAFra;n
z?TTYo+D;;2#N^N&b@&C?2yc~p@6tw^%SKB4lZMk{lUA<V<zF$`;tWK~UiUQ$>;B$*
zAy^-y%<Xt%SO2_~dh!~-$4vkx=r@Y<HiC^LVb`6NEfG?IHtZ^sj1jr#KSH7N7&rLg
zibn-zolKj~!A#ctr$QF~D_IvQ7>K+M=(M|oSSpS{Z4CHK7CX7p6@xn&VTY8PX1z6e
z3<qNFTBC`j&Ji~wuD;RgK08$7Y2T0=+MO!~*WiFw?k<2IrcVWUE8<=DeTZvieDgFS
zT0lUbXfL9B+Sv?LH=VV(FhChiK>isG0ft2fuveaG@x2w8*|>GqQFkpRn4NN%oFF$(
zXuPSzU>;3MrfjywQM@;1Q^@BXSH?t{EX;N>)w_%}ynNBBM2BW_od>m4mrA4JQyfTY
z^xE-pry+-B!tJX$QVjB&ipKj}@t|dn^_KrK?taTaqhWFO_xlP_Gus_3e_2K-<H4sy
zrAHoAidAv0318V#AufW|99`=<$-_LM75cS<JE@(eC(M#afhE@ZqM&G*m5%zTX8iD=
zzJ3TZ;mA@&^r8~lVrcHNMc&KjurBFBg%Ev`T_E$<lHBwl+I#vWf4qy)#bysYl^ls)
zZzAVnK5OkVBH5+G5>4lV!O|?8fNBlU=i5(-9H^C$4R`hK=TfREVg~MyG6$>$Rz=-k
zz`N$OvEykDq$$Q6qtdhT7+8Au79dOw;ckt{6ah<jA!BY-90hfPzI(cSWYrv1l1n|V
z(`?n}SVJ&VR;}EWlrQQ@vv1rL_-ViVhZ!IXpf+2mRU)9^rZ4RnK?s#{FdnphJ%6Oa
zaBe$F3-sViG%M{Fyc`;7Nh*l(sNW%HqNrtwh}|b=a$Luf6pT~<bqtC&Y=<YB#tF4Z
zYsLzp@RDQY-OfB(w4y$6+O1gX+JW#QZ9Y59k*Vx;CN`^YJ26Kqgz6oumT{OGF_vd1
zW%1@6V~$0A)AdS2^ksLWPFI0I7hibE?PjW}oH=5wJF!aOn|q|nvRUY*%^^gXY546M
zz=37!F4QZowFI(nH#E$qD+>KwOW+hKiy+u1PS9R)T<%Rm8dt~nb_6#lzCaU!vZW;a
zxVfwUMpaXBe3>6&V+VSu?djLjQG`3KO_an#curt=9O`ck;M<-RfqKzoS<Na?L`!RX
zwf+AF4B($PE$ZJ06Sc$4C1F}bBYoHpb&<KKviM4A>c&U~cK-S7o5+&&FLDxy)dDh8
z!~zE1nbR|z(OnspI4jV+@K(xWHKi!hw4ECC^qY&LA?XhGeSVrY>l(?dRd?mk{4bGJ
znhFfXsqy^D^j>2U%&BmApXElIFU}!LTh$PD$g&0sD%NWul`}fY8&1RLl>fN@zi0KA
zxR*IWEM-bL1Z;Jnb1`!ttsbw<lmx$kg0&{=$>fKlofou~r>5ln+qaa3i3a_~)j6&8
zz)<Sqk{9=os=`J`=?lMcVRxtP_jlf90XLZW(eRU3n0qyww8K^_#cp~GC1r-I(FoCB
z9B%<8<;UQcQ}p<TVpFn#ezfhEvO%K%?K58{0`3UxTHK%gIo$ryg%#8F`qRkx%5mXn
zv(l5xdI!X!b~Lrhyz{dT%O#iaWei5=!)$|j6dk0%%~zU{nQ1~Tj~uPp*gU-ZC$#>r
zP5I06{}Jr}KhWP(<IihU(7+{jqI?}wv6k#$QmEo6+dJ{Zzq5nR1%}a_R7}Fh_@~<V
zbRM1+?AR*w4(hx#o+H^HKwK?kZ{#YLlZZ+xm5KM+)`Px|J;Z)7Ah`!K^i(TD<IOUM
zu8-)Tf59hjePDC7x!Ex-*}K#X4P5Pm36;#*nA)M-RzPQ@oZ7N5pL~MN->d_F^7qe4
z{wxGCQDAL3CT~DPIjeS^A!7Vwv{G|3Bf(Wj4<T_s5qd7@bq0kQ<Y|Qo@5?zq8&RxZ
zp}ji8oMzMPz&(`7SzK%C%TM**3$afk@mK8XbT=tRmOWd4%s>AL9$4%%^wQJY&@Vo8
zg0|T8*=ANdy{Vdj*~1AN36Wld&YLB@$FloEM*j&Ze{*^*xH9SrSNdOyEK7bjOL*_a
zSs{7#f__qFSpH*pUI8(fQq(ge|3jO^Ve6~*>a#V`K+f!!u-#<%oP>-v<3p;ovLIm+
zRi+SnDxtY|j29iLDvns<`=R+ncuRDgk5vKvdj!x94o6VaBBzFh(Yi|Hh3NbbT(5I@
z_bG}CE}gI(wn67Iul9QJ8i}CpEqJ4K6M`+Eu5a&`L0QPD6N%J5nqoCfEed#)8Z=k0
zTy4)tZeS=(3Gs90BqY;sVJ6}3QcG|5r{AKaph+j6Y0G<IqVnWqd^;W>#ONRdlwH{k
zQrui7YkApK3~HR#<URl+29HuZd@a}t>#1)6cIPPsbm~=j_CO|^=mH1K>7vm9tn2Q^
z@w%gI*Rk3R${`qAlu4{y!Cq#&zV=nW;)Y<0GR?V}K^ogNalm8x6~K;;9qfBrR^&|_
z<BrSoW@}LI#f&quf_fwa|D7e=9MB@8+;bPDIiP50>*Jq>3ELb!(<rc?pl-wdgMgq7
LEe*;~xf1^cU_r^x