From b033fa0e5f8d3488da87ddef6b88af8796dad37f Mon Sep 17 00:00:00 2001 From: tamguo Date: Fri, 23 Nov 2018 10:11:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tamguo/config/web/ThymeleafConfig.java | 1 + .../tamguo/interceptor/MemberInterceptor.java | 2 +- .../src/main/resources/application.properties | 4 +- .../main/resources/static/images/avatar.png | Bin 0 -> 7921 bytes .../src/main/resources/templates/index.html | 46 +++++++++++++++--- .../java/com/tamguo/web/LoginController.java | 11 +++-- .../src/main/resources/templates/login.html | 1 + 7 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 tamguo-bms/src/main/resources/static/images/avatar.png diff --git a/tamguo-bms/src/main/java/com/tamguo/config/web/ThymeleafConfig.java b/tamguo-bms/src/main/java/com/tamguo/config/web/ThymeleafConfig.java index cb46b3f..7c7be0b 100644 --- a/tamguo-bms/src/main/java/com/tamguo/config/web/ThymeleafConfig.java +++ b/tamguo-bms/src/main/java/com/tamguo/config/web/ThymeleafConfig.java @@ -24,6 +24,7 @@ public class ThymeleafConfig implements EnvironmentAware{ vars.put("domainName", env.getProperty("domain.name")); vars.put("adminDomain", env.getProperty("admin.domain.name")); vars.put("memberDomain", env.getProperty("member.domain.name")); + vars.put("tamguoDomain", env.getProperty("tamguo.domain.name")); vars.put("PAPER_TYPE_ZHENTI", SystemConstant.ZHENGTI_PAPER_ID); vars.put("PAPER_TYPE_MONI", SystemConstant.MONI_PAPER_ID); vars.put("PAPER_TYPE_YATI", SystemConstant.YATI_PAPER_ID); 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 0a1382d..c26a535 100644 --- a/tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java +++ b/tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java @@ -20,7 +20,7 @@ public class MemberInterceptor extends HandlerInterceptorAdapter{ /** 登录URL */ private String loginUrl = DEFAULT_LOGIN_URL; - @Value("${tamguo.admin.name}") + @Value("${tamguo.domain.name}") private String tamguoDomainName; /** diff --git a/tamguo-bms/src/main/resources/application.properties b/tamguo-bms/src/main/resources/application.properties index e79e229..42ce0b2 100644 --- a/tamguo-bms/src/main/resources/application.properties +++ b/tamguo-bms/src/main/resources/application.properties @@ -1,7 +1,7 @@ domain.name=https://book.tamguo.com/ admin.domain.name=https://admin.tamguo.com/ -tamguo.admin.name=https://www.tamguo.com/ -member.domain.name=https://member.tamguo.com/ +tamguo.domain.name=https://www.tamguo.com/ +member.domain.name=http://member.tamguo.com/ cookie.domian.name=tamguo.com server.port=8083 jasypt.encryptor.password=tamguo diff --git a/tamguo-bms/src/main/resources/static/images/avatar.png b/tamguo-bms/src/main/resources/static/images/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..616985e178d9b7c773857aebae90d9978f205a52 GIT binary patch literal 7921 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 -