fix

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/PageController.java

@@ -49,25 +49,6 @@ public class PageController extends BaseController{
 
     @RequestMapping(value = UrlConstants.PAGE + "login", method = RequestMethod.GET)
     public String login(@RequestParam(value = "redirect", required = false)String redirect, HttpServletRequest request){
-//        System.out.println(System.currentTimeMillis());
-//        String afterLogin = null;
-//        if(callback.getRedirectURL()!=null && callback.getRedirectURL().trim().length()>0){
-//            if(!callback.getRedirectURL().startsWith("http"))
-//                callback.setRedirectURL("http://"+callback);
-//            afterLogin = callback.getRedirectURL();
-//        }else if (request.getSession().getAttribute("RedirectURL")!=null){
-//            afterLogin = (String) request.getSession().getAttribute("RedirectURL");
-//        }
-//        else if(callback.getDefaultURL()!=null)
-//            afterLogin = callback.getDefaultURL();
-//        LOG.info("RedirectURL---" + afterLogin);
-//        HttpSession session = request.getSession();
-//        session.setAttribute("redirectURL", afterLogin);
-//        if(session.getAttribute("userId")!=null){
-//            LOG.info("用户已登录!用户ID"+session.getAttribute("userId").toString());
-//            return "redirect:"+afterLogin;
-//        }
-//        return "login";
         LOG.info("redirect:" + redirect);
         String redirectUrl = "";
         try {
@@ -147,13 +128,14 @@ public class PageController extends BaseController{
             model.addAttribute("result", result);
             return "register";
         }
+        model.addAttribute("href", "http://user.mooctest.net:8081/page/login");
         return "success_page";
     }
 
     @RequestMapping(value = UrlConstants.PAGE + "login/github", method = RequestMethod.GET)
     public String loginByGithub(@RequestParam("code")String code, Model model, HttpServletRequest request){
         ResponseResult<Object> result = new ResponseResult<>();
-        System.out.println("code: " + code);
+        LOG.info("code: " + code);
         result = thirdPartyLogic.loginByGithub(code, request);
         if (result.getStatus()==ResponseStatus.NOTFOUND){
             UserInfo userInfo = (UserInfo) result.getData();
@@ -175,7 +157,7 @@ public class PageController extends BaseController{
 
     @RequestMapping(value = UrlConstants.PAGE + "login/wechat", method = RequestMethod.GET)
     public String loginByWechat(@RequestParam("code")String code, Model model, HttpServletRequest request){
-        System.out.println("wechat_code: " + code);
+        LOG.info("wechat_code: " + code);
         UserWechatDTO userWechatDTO = wechatLogic.getUserByCode(code);
         if(userWechatDTO.getType()==UserWechatDTO.NEW){
             model.addAttribute("headImg",userWechatDTO.getUserInfo().getHeadimgurl());
@@ -199,7 +181,7 @@ public class PageController extends BaseController{
     @RequestMapping(value = UrlConstants.PAGE + "thirdParty/bind", method = RequestMethod.POST)
     public String thirdPartyBind(UserVO userVO, Model model, HttpServletRequest request){
         UserVO user = userVO;
-        System.out.println(userVO.toString());
+        LOG.info(userVO.toString());
         user.setPassword(EncryptionUtil.encryptMD5(user.getPassword()));
         ResponseResult<UserDTO> result = userLogic.checkPWD(user);
         if (result.getStatus()!=ResponseStatus.SUCCESS){
@@ -227,7 +209,7 @@ public class PageController extends BaseController{
             userThirdParty.setUserId(userToBind.getId());
             userThirdParty.setType(userVO.getFrom());
             userThirdParty.setIsDelete(0);
-            System.out.println(userThirdParty.getUserId()+"--"+userThirdParty.getThirdPartyIdentity()+"---"+userThirdParty.getType());
+            LOG.info(userThirdParty.getUserId()+"--"+userThirdParty.getThirdPartyIdentity()+"---"+userThirdParty.getType());
             thirdPartyAuthService.save(userThirdParty);
         }
         HttpSession session = request.getSession();

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/TestController.java

@@ -66,7 +66,7 @@ public class TestController extends BaseController{
     @RequestMapping(value = "/test/mail", method = RequestMethod.POST)
     public ResponseResult<Object> sendMail(UserDTO userDTO){
         ResponseResult<Object> result = new ResponseResult<>();
-        System.out.println("\nreceiver: "+userDTO.getEmail()+"\n");
+        LOG.info("\nreceiver: "+userDTO.getEmail()+"\n");
         try {
             mailService.sendVerifyEmail("diors_po@126.com", "171256175@qq.com", "1234");
             result.init(ResponseStatus.SUCCESS, "发送成功", null);
@@ -97,19 +97,11 @@ public class TestController extends BaseController{
         return new ModelAndView("register");
     }
 
-    @RequestMapping(value = "/test/get", method = RequestMethod.POST)
-    public String test(Callback afterLogin){
-        System.out.println("\nafterLogin====="+afterLogin.getRedirectURL()+"\n");
-        System.out.println("\nafterLogin====="+afterLogin.getDefaultURL()+"\n");
-
-        return afterLogin.getRedirectURL();
-    }
 
     @RequestMapping(value = "/test/veirycode", method = RequestMethod.PUT)
     public String testCode(@RequestBody VerifyCode verifyCode){
         String type = verifyCode.getType();
         String receiver = verifyCode.getReceiver();
-        System.out.println("type="+type+"; receiver="+receiver);
         verifyCode.setCreateTime(new Timestamp(System.currentTimeMillis()));
         verifyCode.setExpiredTime(new Timestamp(System.currentTimeMillis()+10000));
         verifyCode.setCode("123321");
@@ -156,7 +148,6 @@ public class TestController extends BaseController{
 
     @RequestMapping(value = "/test/upload/bankinfo", method = RequestMethod.POST)
     public String doUpload(BankAccountInfoVO infoVO){
-        System.out.println("info: "+infoVO.getBank_card_number()+","+infoVO.getBank_info());
         String str = ossUtil.upload(infoVO.getID_card_back(), OSSUtil.FileDirType.BANKINFO);
         return str;
     }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/UserController.java

@@ -56,7 +56,6 @@ public class UserController extends BaseController {
 
     @RequestMapping(value = UrlConstants.API + "login", method = RequestMethod.POST)
     public ResponseResult<UserDTO> checkLogin(@RequestBody UserDTO user, HttpServletRequest request, HttpServletResponse response){
-        // System.out.println("password"+user.getPassword());
         String password = EncryptionUtil.encryptMD5(user.getPassword());
         user.setPassword(password);
         ResponseResult<UserDTO> result = userLogic.checkPWD(user);

mooctest-user-server/src/main/resources/templates/success_page.html

@@ -5,7 +5,7 @@
 <body>
 <div class="p-t-100" style="text-align: center;">
     <img th:src="@{/images/icons/success.png}">&nbsp;&nbsp;&nbsp;&nbsp;
-    <span class="font-weight-bold" style="font-size: 30px;" th:text="${message==null}?'恭喜您注册成功！可以前往登录啦！':${message}"></span>
+    <span class="font-weight-bold" style="font-size: 30px;" ><a class="font-weight-bold" style="font-size: 30px;" th:href="${href==null}?'#':${href}" th:text="${message==null}?'恭喜您注册成功！点击前往登录！':${message}"></a></span>
 </div>
 <div th:replace="common/common_foot::foot"></div>
 </body>