From d66ac5deed82bac9fdec5197ab68c90198536611 Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Tue, 2 May 2017 23:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E3=80=81?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E3=80=81=E9=80=80=E5=87=BA=E3=80=81=E6=89=BE?= =?UTF-8?q?=E5=9B=9E=E5=AF=86=E7=A0=81=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/controller/AppController.java | 7 --- .../web/controller/SignController.java | 46 +++++++++++++++++++ .../src/main/resources/config.properties | 1 + .../main/resources/profiles/dev.properties | 1 + .../main/resources/profiles/prod.properties | 1 + .../main/resources/profiles/test.properties | 1 + 6 files changed, 50 insertions(+), 7 deletions(-) delete mode 100644 zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/home/controller/AppController.java create mode 100644 zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/web/controller/SignController.java diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/home/controller/AppController.java b/zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/home/controller/AppController.java deleted file mode 100644 index 19f271cf..00000000 --- a/zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/home/controller/AppController.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zheng.ucenter.home.controller; - -public class AppController { - - - -} \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/web/controller/SignController.java b/zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/web/controller/SignController.java new file mode 100644 index 00000000..28d95d67 --- /dev/null +++ b/zheng-ucenter/zheng-ucenter-web/src/main/java/com/zheng/ucenter/web/controller/SignController.java @@ -0,0 +1,46 @@ +package com.zheng.ucenter.web.controller; + +import com.zheng.common.base.BaseController; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 注册控制器 + * Created by shuzheng on 2017/5/2. + */ +@Controller +public class SignController extends BaseController { + + private static Logger _log = LoggerFactory.getLogger(SignController.class); + + @RequestMapping(value = "/signup", method = RequestMethod.GET) + public String signup(Model model) { + + return thymeleaf("/reg"); + } + + @RequestMapping(value = "/signin", method = RequestMethod.GET) + public String signin(Model model) { + + return thymeleaf("/login"); + } + + @RequestMapping(value = "/signout", method = RequestMethod.GET) + @ResponseBody + public String index(Model model) { + + return "signout"; + } + + @RequestMapping(value = "/password_reset", method = RequestMethod.GET) + public String password_reset(Model model) { + + return thymeleaf("/password"); + } + +} \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties index 70dfcbf0..a82d15f4 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties @@ -1,2 +1,3 @@ env=${profile.env} +app.name=${app.name} zheng-ui.path=${zheng-ui.path} \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties index e30c2d2e..0aec291d 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties @@ -1,2 +1,3 @@ profile.env=dev +app.name=zheng-ucenter-web zheng-ui.path=http://ui.zhangshuzheng.cn:1000 \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties index 80747345..e9faedf8 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties @@ -1,2 +1,3 @@ profile.env=prod +app.name=zheng-ucenter-web zheng-ui.path=http://ui.zhangshuzheng.cn:1000 \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties index b471f883..51f65d9c 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties @@ -1,2 +1,3 @@ profile.env=test +app.name=zheng-ucenter-web zheng-ui.path=http://ui.zhangshuzheng.cn:1000 \ No newline at end of file