|
|
@@ -16,6 +16,7 @@ import cn.iselab.mooctest.user.web.logic.ThirdPartyLogic;
|
|
|
import cn.iselab.mooctest.user.web.logic.UserLogic;
|
|
|
import cn.iselab.mooctest.user.web.logic.WechatLogic;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.Model;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -44,6 +45,9 @@ public class PageController extends BaseController{
|
|
|
@Autowired
|
|
|
WechatLogic wechatLogic;
|
|
|
|
|
|
+ @Value("${redirect.url}")
|
|
|
+ private String redirectUrl;
|
|
|
+
|
|
|
|
|
|
@RequestMapping(value = UrlConstants.PAGE + "login", method = RequestMethod.GET)
|
|
|
public String login(@RequestParam(value = "redirect", required = false)String redirect, HttpServletRequest request){
|
|
|
@@ -83,12 +87,12 @@ public class PageController extends BaseController{
|
|
|
session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
|
|
|
// return "redirect:http://www.mooctest.net/api/test/login";
|
|
|
LOG.info("(String)session.getAttribute(redirectURL) " + (String)session.getAttribute("redirectURL"));
|
|
|
- String afterLogin = session.getAttribute("redirectURL")==null?
|
|
|
- UrlConstants.DEFAULT_GOTO:(String)session.getAttribute("redirectURL");
|
|
|
+// String afterLogin = session.getAttribute("redirectURL")==null?
|
|
|
+// UrlConstants.DEFAULT_GOTO:(String)session.getAttribute("redirectURL");
|
|
|
userLogic.recordLoginAction(request, ((UserDTO)result.getData()).getId() , "password");
|
|
|
- LOG.info("redirectURL: "+afterLogin);
|
|
|
+ LOG.info("redirectURL: "+redirectUrl);
|
|
|
LOG.info("userId: "+ session.getAttribute("userId"));
|
|
|
- return "redirect:" + afterLogin;
|
|
|
+ return "redirect:" + redirectUrl;
|
|
|
}
|
|
|
else{
|
|
|
model.addAttribute("result", result);
|
