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 0000000..31662f6 Binary files /dev/null and b/tamguo-bms/src/main/resources/static/images/favicon.png differ 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 @@ + 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 @@ - +