Parcourir la source

添加短信发送工具

薛晓波 il y a 6 ans
Parent
commit
26924f9a25

+ 12 - 0
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/constants/VerifyConstants.java

@@ -0,0 +1,12 @@
+package cn.iselab.mooctest.user.constants;
+
+/**
+ * @Author: xuexb
+ * @Date: 2018.12.28 13:10
+ */
+public class VerifyConstants {
+    public static final String SENDER_NAME = "慕测科技";
+    public static final long TIME_OUT = 1000 * 60 * 5;
+    public static final String SMS_VERI_TEMPLATE_ID = "73686";
+    // public static final String SMS_VERI_TIMEOUT = "30";
+}

+ 1 - 1
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/VerifyCode.java

@@ -27,7 +27,7 @@ public class VerifyCode {
     @Column(name = "type")
     private String type;
 
-    @Column(name = "recevier")
+    @Column(name = "receiver")
     private String receiver;
 
     @Column(name = "create_time")

+ 3 - 6
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/MailServiceImpl.java

@@ -1,15 +1,12 @@
 package cn.iselab.mooctest.user.service.impl;
 
+import cn.iselab.mooctest.user.constants.VerifyConstants;
 import cn.iselab.mooctest.user.service.MailService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.MailException;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.springframework.mail.javamail.MimeMailMessage;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 import org.thymeleaf.TemplateEngine;
@@ -51,7 +48,7 @@ public class MailServiceImpl implements MailService {
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message,true);
         try {
-            helper.setFrom(sender, "慕测科技");
+            helper.setFrom(sender, VerifyConstants.SENDER_NAME);
         } catch (UnsupportedEncodingException e) {
             logger.error("设置发件人名称出错", e);
         }
@@ -66,7 +63,7 @@ public class MailServiceImpl implements MailService {
     @Override
     public void sendVerifyEmail(String sender, String receiver, String code) throws MessagingException {
         Context context = new Context();
-        context.setVariable("verifyCode", "2333");
+        context.setVariable("verifyCode", code);
         String emailContent = templateEngine.process("email/verify_mail", context);
         sendHtmlEmail(sender,receiver, "【验证码-慕测科技】", emailContent);
     }

+ 83 - 0
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/util/MSUtil.java

@@ -0,0 +1,83 @@
+package cn.iselab.mooctest.user.util;
+
+import cn.iselab.mooctest.user.constants.VerifyConstants;
+import com.cloopen.rest.sdk.CCPRestSmsSDK;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+
+/**
+ * @Author: xuexb
+ * @Date: 2018.12.28 13:02
+ */
+public class MSUtil {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MSUtil.class);
+
+    /**
+     * @param receiver
+     * @return null if failed vericode if success
+     */
+    public static String sendSmsVerification(String receiver, String veriCode) {
+
+        // send short message by invoking SDK
+        HashMap<String, Object> result = sendSMSSDK(receiver, VerifyConstants.SMS_VERI_TEMPLATE_ID, veriCode, "10");
+
+        // Check return result to see if process success
+        if ("000000".equals(result.get("statusCode"))) {
+            // success
+
+            return (String)result.get("statusCode");
+        } else {
+            // fail, output stats code and message
+            LOG.error("[SMS] Sending short message to " + receiver + " failed.");
+            LOG.error("[SMS] SMS Error code=" + result.get("statusCode") + "  with information= "
+                    + result.get("statusMsg"));
+
+            return (String)result.get("statusCode");
+        }
+    }
+
+    private static HashMap<String, Object> sendSMSSDK(String receiver, String templateID, String... args) {
+        HashMap<String, Object> result = null;
+
+        // Initialize SDK
+        CCPRestSmsSDK restAPI = new CCPRestSmsSDK();
+
+        // Initialize remote server and port
+        // * Sandbox: restAPI.init("sandboxapp.cloopen.com", "8883");
+        // * Production: restAPI.init("app.cloopen.com", "8883");
+        restAPI.init("app.cloopen.com", "8883");
+
+        // Initialize ACCOUNT SID & AUTH TOKEN
+        // * Can be found by viewing developer's account in `Console` on
+        // * website(http://www.yuntongxun.com)
+        restAPI.setAccount("aaf98f89521b91a301522abe22af1760", "356fff5595a14e32a2bc2856cc0f0f5a");
+
+        // Initialize Target
+        // * Can be found in Console:
+        // * "Application - application list - specific app"
+        restAPI.setAppId("8a48b551522ff931015234f9a0c10e53");
+
+        // Send SMS
+        // * @Parameters
+        // * @Parameter(0)
+        // * phone number of receiver(split by ',', can support at most 100
+        // numbers)
+        // * @Parameter(1)
+        // * template id(by default 1), can be found in `Console`
+        // * @Parameter(2)
+        // * An array consists of {verify_code, timeout}
+        result = restAPI.sendTemplateSMS(receiver, templateID, args);
+
+        LOG.error("[SMS] SMS Verification result=" + result);
+
+        return result;
+    }
+
+    public static String generateRandomVeriCode() {
+        int veriCode = (int) Math.round(100000 + Math.random() * 899999);
+        return String.valueOf(veriCode);
+    }
+}

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

@@ -6,6 +6,7 @@ import cn.iselab.mooctest.user.constants.UrlConstants;
 import cn.iselab.mooctest.user.data.Callback;
 import cn.iselab.mooctest.user.data.ResponseResult;
 import cn.iselab.mooctest.user.util.EncryptionUtil;
+import cn.iselab.mooctest.user.web.data.UserVO;
 import cn.iselab.mooctest.user.web.logic.UserLogic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -71,12 +72,18 @@ public class PageController extends BaseController{
 
     @RequestMapping(value = UrlConstants.PAGE + "register", method = RequestMethod.GET)
     public String register(){
-        return null;
+        return "register";
     }
 
     @RequestMapping(value = UrlConstants.PAGE + "doregister", method = RequestMethod.POST)
-    public String doRegister(Model model, UserDTO userDTO, HttpServletRequest request){
-        return null;
+    public String doRegister(Model model, UserVO userVO, HttpServletRequest request){
+        ResponseResult<UserDTO> result = new ResponseResult<>();
+        result = userLogic.registerAccount(userVO);
+        if (result.getStatus() != ResponseStatus.SUCCESS){
+            model.addAttribute("result", result);
+            return "register";
+        }
+        return "success_page";
     }
 
     @RequestMapping("error-404")

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

@@ -4,7 +4,10 @@ import cn.iselab.mooctest.rpc.user.data.UserDTO;
 import cn.iselab.mooctest.user.constants.ResponseStatus;
 import cn.iselab.mooctest.user.data.Callback;
 import cn.iselab.mooctest.user.data.ResponseResult;
+import cn.iselab.mooctest.user.model.VerifyCode;
 import cn.iselab.mooctest.user.service.MailService;
+import cn.iselab.mooctest.user.service.VerifyCodeService;
+import cn.iselab.mooctest.user.util.MSUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -14,6 +17,7 @@ import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 import java.rmi.MarshalledObject;
+import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +31,9 @@ public class TestController extends BaseController{
     @Autowired
     MailService mailService;
 
+    @Autowired
+    VerifyCodeService verifyCodeService;
+
     @RequestMapping(value = "/test/first", method = RequestMethod.GET)
     public Map<String, Object> firstResp(HttpServletRequest request){
         Map<String, Object> map = new HashMap<>();
@@ -85,5 +92,22 @@ public class TestController extends BaseController{
         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");
+        Long id = verifyCodeService.saveVerifyCode(verifyCode).getId();
+        return "id===="+id;
+    }
+
+    @RequestMapping(value = "/test/mobilecode", method = RequestMethod.GET)
+    public void mobileCode(){
+        MSUtil.sendSmsVerification("18013976047", "123456");
+    }
+
 
 }

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

@@ -75,11 +75,11 @@ public class UserController extends BaseController {
         return result;
     }
 
-    @RequestMapping(value = UrlConstants.API + "mail/verify", method = RequestMethod.POST)
-    public ResponseResult<Object> sendVerifyEmail(UserDTO userDTO){
-        ResponseResult<Object> result = new ResponseResult<>();
-
-        return null;
+    @RequestMapping(value = UrlConstants.API + "verify/mail", method = RequestMethod.POST)
+    public ResponseResult<String> sendVerifyEmail(UserDTO userDTO){
+        ResponseResult<String> result = new ResponseResult<>();
+        result = userLogic.sendVerifyEmail(userDTO);
+        return result;
     }
 
 

+ 18 - 0
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/data/UserVO.java

@@ -0,0 +1,18 @@
+package cn.iselab.mooctest.user.web.data;
+
+import cn.iselab.mooctest.rpc.user.data.UserDTO;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: xuexb
+ * @Date: 2018.12.28 14:02
+ */
+@Data
+public class UserVO extends UserDTO {
+   private String verifyCode;
+
+   private String password2;
+}

+ 2 - 1
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/UserLogic.java

@@ -3,6 +3,7 @@ package cn.iselab.mooctest.user.web.logic;
 import cn.iselab.mooctest.rpc.user.data.UserDTO;
 import cn.iselab.mooctest.user.constants.ResponseStatus;
 import cn.iselab.mooctest.user.data.ResponseResult;
+import cn.iselab.mooctest.user.web.data.UserVO;
 
 import java.util.List;
 
@@ -36,7 +37,7 @@ public interface UserLogic {
 
     List<UserDTO> findByEmails(List<String> emails);
 
-    ResponseResult<UserDTO> registerAccount(UserDTO userDTO);
+    ResponseResult<UserDTO> registerAccount(UserVO userVO);
 
     ResponseResult<String> sendVerifyEmail(UserDTO userDTO);
 

+ 65 - 23
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/UserLogicImpl.java

@@ -1,13 +1,20 @@
 package cn.iselab.mooctest.user.web.logic.impl;
 
 import cn.iselab.mooctest.rpc.user.data.UserDTO;
+import cn.iselab.mooctest.user.configure.MailProperties;
+import cn.iselab.mooctest.user.constants.VerifyConstants;
 import cn.iselab.mooctest.user.constants.ResponseStatus;
 import cn.iselab.mooctest.user.data.ResponseResult;
 import cn.iselab.mooctest.user.model.User;
 import cn.iselab.mooctest.user.model.UserIntegral;
+import cn.iselab.mooctest.user.model.VerifyCode;
 import cn.iselab.mooctest.user.service.IntegralService;
+import cn.iselab.mooctest.user.service.MailService;
 import cn.iselab.mooctest.user.service.UserService;
+import cn.iselab.mooctest.user.service.VerifyCodeService;
 import cn.iselab.mooctest.user.util.EncryptionUtil;
+import cn.iselab.mooctest.user.util.MSUtil;
+import cn.iselab.mooctest.user.web.data.UserVO;
 import cn.iselab.mooctest.user.web.exception.HttpBadRequestException;
 import cn.iselab.mooctest.user.web.logic.BaseLogic;
 import cn.iselab.mooctest.user.web.logic.UserLogic;
@@ -16,6 +23,7 @@ import org.apache.commons.validator.routines.EmailValidator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.mail.MessagingException;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -35,6 +43,15 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Autowired
     private IntegralService integralService;
 
+    @Autowired
+    private MailService mailService;
+
+    @Autowired
+    private VerifyCodeService verifyCodeService;
+
+    @Autowired
+    private MailProperties mailProperties;
+
     @Override
     public UserDTO getUserByEmail(String s) {
         User user = userService.findByEmail(s);
@@ -222,33 +239,48 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     }
 
     @Override
-    public ResponseResult<UserDTO> registerAccount(UserDTO userDTO) {
+    public ResponseResult<UserDTO> registerAccount(UserVO userVO) {
         ResponseResult<UserDTO> result = new ResponseResult<>();
-        if(!userDTO.getEmail().trim().isEmpty() && !userDTO.getPassword().trim().isEmpty()) {
-            if(userService.findByEmail(userDTO.getEmail()) != null){
-                result.init(ResponseStatus.FAILED, "该邮箱已被注册", userDTO);
+        if(!userVO.getEmail().trim().isEmpty() && !userVO.getPassword().trim().isEmpty()) {
+            if(userService.findByEmail(userVO.getEmail()) != null){
+                result.init(ResponseStatus.FAILED, "该邮箱已被注册", userVO);
+                LOG.error(result.getMsg());
+                return result;
+            }
+            if (!EmailValidator.getInstance().isValid(userVO.getEmail())){
+                result.init(ResponseStatus.FAILED, "注册邮箱非法", userVO);
+                LOG.error(result.getMsg());
+                return result;
+            }
+            if (userVO.getName().length()>50 || userVO.getName().length()<2){
+                result.init(ResponseStatus.FAILED, "姓名长度非法,应在2~50位", userVO);
                 LOG.error(result.getMsg());
                 return result;
             }
-            if (!EmailValidator.getInstance().isValid(userDTO.getEmail())){
-                result.init(ResponseStatus.FAILED, "注册邮箱非法", userDTO);
+            if (userVO.getPassword().length() > 16 || userVO.getPassword().length() < 6){
+                result.init(ResponseStatus.FAILED, "密码长度非法,应在6~16位", userVO);
                 LOG.error(result.getMsg());
                 return result;
             }
-            if (userDTO.getName().length()>50 || userDTO.getName().length()<2){
-                result.init(ResponseStatus.FAILED, "姓名长度非法,应在2~50位", userDTO);
+            if (! userVO.getPassword2().trim().equals(userVO.getPassword())){
+                result.init(ResponseStatus.FAILED, "两次密码不一致,请重新输入", userVO);
                 LOG.error(result.getMsg());
                 return result;
             }
-            if (userDTO.getPassword().length() > 16 || userDTO.getPassword().length() < 6){
-                result.init(ResponseStatus.FAILED, "密码长度非法,应在6~16位", userDTO);
+
+            if(! verifyCodeService.validateVerifyCode("email", userVO.getEmail(), userVO.getVerifyCode())){
+                result.init(ResponseStatus.FAILED, "请确认验证码输入正确", userVO);
                 LOG.error(result.getMsg());
                 return result;
             }
+
             try{
-                User user = userWrapper.unwrap(userDTO);
-                user.setAvailability(0);
-                user.setPassword(EncryptionUtil.encryptMD5(user.getPassword()));
+                userVO.setPassword(EncryptionUtil.encryptMD5(userVO.getPassword()));
+                userVO.setAvailability(1);
+                userVO.setCreateTime(new Timestamp(System.currentTimeMillis()).getTime());
+                userVO.setManualCheckValid(true);
+                User user = userWrapper.unwrap(userVO);
+
                 userService.register(user);
                 result.init(ResponseStatus.SUCCESS, "注册成功!请前往登录!", userWrapper.wrap(user));
             }catch (Exception e){
@@ -258,7 +290,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
             }
 
         }else{
-            result.init(ResponseStatus.FAILED, "帐号和密码不可为空", userDTO);
+            result.init(ResponseStatus.FAILED, "帐号和密码不可为空", userVO);
             LOG.error(result.getMsg());
             return result;
         }
@@ -279,16 +311,26 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
             LOG.error(result.getMsg());
             return result;
         }
-        if (userDTO.getName().length()>50 || userDTO.getName().length()<2){
-            result.init(ResponseStatus.FAILED, "姓名长度非法,应在2~50位", userDTO.getName());
-            LOG.error(result.getMsg());
-            return result;
-        }
-        if (userDTO.getPassword().length() > 16 || userDTO.getPassword().length() < 6){
-            result.init(ResponseStatus.FAILED, "密码长度非法,应在6~16位", userDTO.getPassword());
-            LOG.error(result.getMsg());
+
+        VerifyCode verifyCode = new VerifyCode();
+        verifyCode.setType("email");
+        verifyCode.setReceiver(receiver);
+        verifyCode.setCode(MSUtil.generateRandomVeriCode());
+        verifyCode.setCreateTime(new Timestamp(System.currentTimeMillis()));
+        verifyCode.setExpiredTime(new Timestamp(System.currentTimeMillis()+ VerifyConstants.TIME_OUT));
+
+        try {
+            mailService.sendVerifyEmail(mailProperties.getUsername(),
+                    verifyCode.getReceiver(),
+                    verifyCode.getCode());
+        } catch (MessagingException e) {
+            result.init(ResponseStatus.FAILED, "邮件发送出错,请检查邮箱是否正确", receiver);
+            LOG.error(result.getMsg(),e);
             return result;
         }
-        return null;
+        verifyCodeService.saveVerifyCode(verifyCode);
+        result.init(ResponseStatus.SUCCESS, "邮件发送成功!", receiver);
+        LOG.info(result.getMsg()+"-Email: " + receiver + "-code: "+ verifyCode.getCode());
+        return result;
     }
 }

+ 21 - 3
mooctest-user-server/src/main/resources/static/js/main.js

@@ -65,7 +65,25 @@
 
         $(thisAlert).removeClass('alert-validate');
     }
-    
-    
 
-})(jQuery);
+
+
+})(jQuery);
+
+var countdown = 60;
+
+function settime(obj) {
+    if (countdown == 0) {
+        obj.removeAttribute("disabled");
+        obj.innerText="获取验证码";
+        countdown = 60;
+        return;
+    } else {
+        obj.setAttribute("disabled", true);
+        obj.innerText="重新发送(" + countdown + ")";
+        countdown--;
+    }
+    setTimeout(function() {
+            settime(obj) }
+        ,1000)
+}

+ 1 - 1
mooctest-user-server/src/main/resources/templates/login.html

@@ -78,7 +78,7 @@
                 </div>
 
                 <div class="flex-col-c p-t-10">
-                    <a href="javascript:" class="txt2">立即注册</a>
+                    <a href="/page/register" class="txt2">立即注册</a>
                 </div>
             </form>
         </div>

+ 10 - 0
mooctest-user-server/src/main/resources/templates/mobile_login.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+
+</body>
+</html>

+ 26 - 22
mooctest-user-server/src/main/resources/templates/register.html

@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>慕测统一登录</title>
+    <title>注册账号</title>
     <meta name="keywords" content="" />
     <meta name="description" content="" />
 
@@ -37,7 +37,7 @@
 
                 <div class="wrap-input100 validate-input " data-validate="请输入姓名">
                     <!--<span class="label-input100">姓名</span>-->
-                    <input class="input100" type="text" name="username" placeholder="请输入姓名" required="邮箱不可为空">
+                    <input class="input100" type="text" name="name" placeholder="请输入姓名" required="邮箱不可为空">
                     <span class="focus-input100" data-symbol="&#xf197;"></span>
                 </div>
 
@@ -54,11 +54,11 @@
                 </div>
 
                 <div class="wrap-input100 validate-input " data-validate="请输入验证码">
-                    <input class="input100" type="text" name="username" placeholder="请输入验证码" required="验证码不可为空">
+                    <input class="input100" type="text" name="verifyCode" placeholder="请输入验证码" required="验证码不可为空">
                     <span class="focus-input100" data-symbol="&#xf13a;"></span>
                 </div>
                 <div class="text-center p-t-6 p-b-8">
-                    <span id="info" style="color: red">sssss</span>
+                    <span id="info" style="color: red" th:text="${result==null}?'&nbsp;':${result.msg}"></span>
                 </div>
 
                 <div class="container-login100-form-btn" style="width: 50%; float: left;">
@@ -85,17 +85,20 @@
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
 <script type="text/javascript">
-var countdown = 60;
 function sendEmail(obj) {
     var email = $("#email").val();
     if (email == null || email.trim() == "") {
         document.getElementById("info").innerText = "邮箱不能为空";
-
         return;
     }
+    if (!email.match(/^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{1,5}|[0-9]{1,3})(\]?)$/)){
+        document.getElementById("info").innerText = "邮箱格式不正确,请重新输入";
+        return
+    }
+
     var data = {"email":email};
     $.ajax({
-        url:"/test/mail",
+        url:"/api/verify/mail",
         type:"POST",
         data:data,
         timeout: 3000,
@@ -105,26 +108,27 @@ function sendEmail(obj) {
                 alert("发送失败, 原因:"+result.msg);
             }else{
                 alert("发送成功,请前往邮箱查收!");
+                document.getElementById("info").innerHTML = "&nbsp;"
                 settime(obj);
             }
         }
     })
 }
-function settime(obj) {
-    if (countdown == 0) {
-        obj.removeAttribute("disabled");
-        obj.innerText="获取验证码";
-        countdown = 60;
-        return;
-    } else {
-        obj.setAttribute("disabled", true);
-        obj.innerText="重新发送(" + countdown + ")";
-        countdown--;
-    }
-    setTimeout(function() {
-            settime(obj) }
-        ,1000)
-}
+<!--function settime(obj) {-->
+    <!--if (countdown == 0) {-->
+        <!--obj.removeAttribute("disabled");-->
+        <!--obj.innerText="获取验证码";-->
+        <!--countdown = 60;-->
+        <!--return;-->
+    <!--} else {-->
+        <!--obj.setAttribute("disabled", true);-->
+        <!--obj.innerText="重新发送(" + countdown + ")";-->
+        <!--countdown&#45;&#45;;-->
+    <!--}-->
+    <!--setTimeout(function() {-->
+            <!--settime(obj) }-->
+        <!--,1000)-->
+<!--}-->
 </script>
 </body>
 </html>

+ 1 - 1
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;" th:text="${message==null}?'恭喜您注册成功!可以前往登录啦!':${message}"></span>
 </div>
 <div th:replace="common/common_foot::foot"></div>
 </body>