guo00guo před 4 roky
rodič
revize
b4b8ea8d3a
23 změnil soubory, kde provedl 185 přidání a 197 odebrání
  1. 1 1
      mooctest-user-server/pom.xml
  2. 1 1
      mooctest-user-server/src/main/java/cn/iselab/mooctest/user/constants/VerifyConstants.java
  3. 2 2
      mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/MailServiceImpl.java
  4. 5 4
      mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/PageController.java
  5. 13 4
      mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/UserLogicImpl.java
  6. 125 147
      mooctest-user-server/src/main/resources/application.yaml
  7. 2 2
      mooctest-user-server/src/main/resources/bootstrap.yaml
  8. 2 2
      mooctest-user-server/src/main/resources/templates/common/common_head.html
  9. 1 1
      mooctest-user-server/src/main/resources/templates/email/arrears_mail.html
  10. 1 1
      mooctest-user-server/src/main/resources/templates/email/verify_mail.html
  11. 1 1
      mooctest-user-server/src/main/resources/templates/forget_password.html
  12. 1 1
      mooctest-user-server/src/main/resources/templates/forget_password_email.html
  13. 1 1
      mooctest-user-server/src/main/resources/templates/forget_password_mobile.html
  14. 1 1
      mooctest-user-server/src/main/resources/templates/forget_password_reset.html
  15. 1 1
      mooctest-user-server/src/main/resources/templates/index.html
  16. 8 8
      mooctest-user-server/src/main/resources/templates/login.html
  17. 2 2
      mooctest-user-server/src/main/resources/templates/mobile_login.html
  18. 11 11
      mooctest-user-server/src/main/resources/templates/register.html
  19. 1 1
      mooctest-user-server/src/main/resources/templates/reset_email.html
  20. 1 1
      mooctest-user-server/src/main/resources/templates/reset_mobile.html
  21. 1 1
      mooctest-user-server/src/main/resources/templates/reset_password.html
  22. 2 2
      mooctest-user-server/src/main/resources/templates/third_party_bind.html
  23. 1 1
      mooctest-user-server/src/main/resources/templates/upload_card_info.html

+ 1 - 1
mooctest-user-server/pom.xml

@@ -199,7 +199,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.11</version>
+            <version>5.1.17</version>
         </dependency>
 
         <dependency>

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

@@ -5,7 +5,7 @@ package cn.iselab.mooctest.user.constants;
  * @Date: 2018.12.28 13:10
  */
 public class VerifyConstants {
-    public static final String SENDER_NAME = "众测服务平台";
+    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";

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

@@ -85,7 +85,7 @@ public class MailServiceImpl implements MailService {
         Context context = new Context();
         context.setVariable("verifyCode", code);
         String emailContent = templateEngine.process("email/verify_mail", context);
-        sendHtmlEmail(sender,receiver, "【验证码-众测服务平台】", emailContent);
+        sendHtmlEmail(sender,receiver, "【验证码-群智服务平台】", emailContent);
     }
 
     @Override
@@ -101,7 +101,7 @@ public class MailServiceImpl implements MailService {
             MimeMessageHelper helper = new MimeMessageHelper(message,true);
             helper.setFrom(mailProperties.getUsername(), VerifyConstants.SENDER_NAME);
             helper.setTo(receivers);
-            helper.setSubject("【众测服务平台】短信服务欠费通知");
+            helper.setSubject("【群智服务平台】短信服务欠费通知");
             helper.setText(emailContent, true);
         } catch (UnsupportedEncodingException e) {
             logger.error("设置发件人名称时编码出错", e);

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

@@ -63,10 +63,10 @@ public class PageController extends BaseController{
         }
         HttpSession session = request.getSession();
         session.setAttribute("redirectURL", redirectUrl);
-        LOG.info("RedirectUrl" + redirectUrl);
+        LOG.info("RedirectUrl: " + redirectUrl);
         if (session.getAttribute("userId") != null){
             LOG.info("用户已登录!用户ID"+session.getAttribute("userId"));
-            return "redirect:"+redirectUrl;
+            return "redirect: "+redirectUrl;
         }
         return "login";
     }
@@ -77,16 +77,17 @@ public class PageController extends BaseController{
         String password = EncryptionUtil.encryptMD5(user.getPassword());
         user.setPassword(password);
         result = userLogic.checkPWD(user);
-        if (result.getStatus() == ResponseStatus.SUCCESS) {
+        if (result.getStatus().equals(ResponseStatus.SUCCESS)) {
             HttpSession session = request.getSession();
             session.setAttribute("userId", ((UserDTO)result.getData()).getId()+"");
             session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
             // return "redirect:http://www.mooctest.net/api/test/login";
-            LOG.info((String)session.getAttribute("redirectURL"));
+            LOG.info("(String)session.getAttribute(redirectURL) " + (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("userId: "+ session.getAttribute("userId"));
             return "redirect:" + afterLogin;
         }
         else{

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

@@ -23,6 +23,7 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.apache.zookeeper.Op;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.mail.MessagingException;
@@ -73,6 +74,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     private BankAccountInfoService bankAccountInfoService;
     private String userId;
 
+    @Value("${feature.email}")
+    private Boolean emailService;
+
     @Override
     public UserDTO getUserByEmail(String s) {
         User user = userService.findByEmail(s);
@@ -291,12 +295,17 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
                 return result;
             }
 
-            if(! verifyCodeService.validateVerifyCode("email", userVO.getEmail(), userVO.getVerifyCode())){
-                result.init(ResponseStatus.FAILED, "请确认验证码输入正确", userVO);
-                LOG.error(result.getMsg());
-                return result;
+            if(emailService){
+                // 具有邮箱服务
+                if(! verifyCodeService.validateVerifyCode("email", userVO.getEmail(), userVO.getVerifyCode())){
+                    result.init(ResponseStatus.FAILED, "请确认验证码输入正确", userVO);
+                    LOG.error(result.getMsg());
+                    return result;
+                }
             }
 
+
+
             try{
                 userVO.setPassword(EncryptionUtil.encryptMD5(userVO.getPassword()));
                 userVO.setAvailability(1);

+ 125 - 147
mooctest-user-server/src/main/resources/application.yaml

@@ -1,147 +1,125 @@
-#spring.profiles.active: dev
-#
-#spring:
-#    cache:
-#        guava:
-#            spec: expireAfterWrite=30s
-#    datasource:
-#        driver-class-name: com.mysql.jdbc.Driver
-#        # Keep the connection alive if idle for a long time (needed in production)
-#        testWhileIdle: true
-#        validationQuery: SELECT 1
-#    # Show or not log for each sql query
-#    jpa:
-#        show-sql: true
-#    # Hibernate ddl auto (create, create-drop, update)
-#    hibernate:
-#        ddl-auto: validate
-#        #hbm2ddl.auto: update
-#        # Naming strategy
-#        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-#    # The SQL dialect makes Hibernate generate better SQL for the chosen database
-#    properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
-#    thymeleaf:
-#        content-type: text/html
-#        mode: LEGACYHTML5
-#        suffix: .html
-#        prefix: classpath:/templates/
-#        encoding: UTF-8
-#        cache: false
-##        enabled: true
-##    session:``
-##        stroe-type: redis
-#
-#wechat:
-#    appId: wx60f06d61f21804be
-#    appSecret: f84db4dc62377926624093b49ac3be1f
-#
-#github:
-#    clientId: 4e8e65b7e3bdeee9229b
-#    clientSecret: a77f1ea04c6f370ec2ad295e29f307565658f8c3
-#
-#mybatis:
-#    typeAliasesPackage: cn.iselab.mooctest.user.model
-#    configuration:
-#        map-underscore-to-camel-case: true
-#
-#---
-## 开发环境
-#spring:
-#    profiles: dev
-#    datasource:
-#        driverClassName: com.mysql.jdbc.Driver
-#        url: jdbc:mysql://111.231.143.6:3306/mooctest_user_service?useUnicode=yes&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-#        username: root
-#        password: xuexiaobo.
-#
-#    dubbo:
-#        application.name: user-service-provider
-#        registry.address: zookeeper://101.37.175.111:2181
-#        protocol.name: dubbo
-#        protocol.port: 20900
-##        protocol.host: 127.0.0.1
-#        scan: cn.iselab.mooctest.user.rpc
-#        monitor.protocal: registry
-#        provider.timeout: 120000
-#        provider.retries: 0
-#
-#    redis:
-#        host: 114.55.91.27
-#        port: 6379
-#        pool:
-#            max-idle: 8
-#            min-idle: 0
-#            max-wait: -1
-#            max-active: 8
-#        database: 2
-##        host: localhost
-##        host: 111.231.143.6
-#
-#mail:
-#    host: smtp.126.com
-#    username: diors_po@126.com
-#    password: xxb19970213
-#    default-encoding: UTF-8
-#
-#
-#
-#server:
-#    port: 8081
-#
-#logging.config: classpath:log4j2.yaml
-#
-#---
-## 测试服务环境
-#spring:
-#    profiles: test
-#    datasource:
-#        url: jdbc:mysql://101.37.175.111:3306/mooctest_user?useUnicode=yes&characterEncoding=UTF-8 # please modify manually
-#        username: mooctest # please modify manually
-#        password: secr3t! # please modify manually
-#
-#    dubbo:
-#        application.name: user-service-provider
-#        registry.address: zookeeper://101.37.175.111:2181
-#        protocol.name: dubbo
-#        protocol.port: 20900
-#        protocol.host: 101.37.175.111
-#        scan: cn.iselab.mooctest.user.rpc
-#        monitor.protocal: registry
-#        provider.timeout: 300000
-#        provider.retries: 0
-#
-#server:
-#    port: 8191
-#
-#logging.config: classpath:log4j2.test.yaml
-#logging.access.directory: /home/share/log
-#
-#spring.jpa.show-sql: false
-#
-#---
-## 线上服务环境
-#spring:
-#    profiles: online
-#    datasource:
-#        url: jdbc:mysql://10.24.153.13:3306/mooctest_user?useUnicode=yes&characterEncoding=UTF-8
-#        username: mooctest
-#        password: secr3t!
-#
-#    dubbo:
-#        application.name: user-service-provider
-#        registry.address: zookeeper://118.178.131.206:2181
-#        protocol.name: dubbo
-#        protocol.port: 20890
-#        protocol.host: 114.55.91.83
-#        scan: cn.iselab.mooctest.user.rpc
-#        monitor.protocal: registry
-#        provider.timeout: 120000
-#        provider.retries: 0
-#
-#server:
-#    port: 8191
-#
-#logging.config: classpath:log4j2.online.yaml
-#logging.access.directory: /home/share/log
-#
-#spring.jpa.show-sql: false
+spring.profiles.active: private-cloud-localhost
+server:
+  port: 8081
+
+default:
+  goto: http://127.0.0.1
+  login: http://127.0.0.1:8081/page/login
+
+feature:
+  email: false
+
+foo:
+  bar
+github:
+  clientId: 4e8e65b7e3bdeee9229b
+  clientSecret: a77f1ea04c6f370ec2ad295e29f307565658f8c3
+loggin:
+  access:
+    directory: /home/share/log
+  config: classpath:log4j2.test.yaml
+mail:
+  default-encoding: UTF-8
+  host: smtp.126.com
+  password: xxb19970213
+  username: diors_po@126.com
+mobile:
+  accountSid: 8a216da872fe1ebf0173047c1477033e
+  accountToken: 953f4acac52546ae88a350c93d257b9d
+  appId: 8a216da872fe1ebf0173047c15830345
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+  typeAliasesPackage: cn.iselab.mooctest.user.model
+oss:
+  accessKeyId: LTAI4FdrT3HsfdR5edBVN7ws
+  accessKeySecret: yroxrpm46DzTyzHrLBZzS3MRNIicP6
+  bucketName: mooctest-user-server
+  endPoint: http://oss-cn-shanghai.aliyuncs.com
+
+---
+spring:
+  profiles: private-cloud
+  cache:
+    guava:
+      spec:
+        expireAfterWrite: 30s
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    testWhileIdle: true
+    validationQuery: SELECT 1
+    url: jdbc:mysql://mysql:3306/mooctest_user?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: Customs2019
+  hibernate:
+    ddl-auto: validate
+    naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+    properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
+  jpa:
+    show-sql: true
+
+  redis:
+    host: redis
+    password:
+    pool:
+      max-active: 8
+      max-idle: 8
+      max-wait: -1
+      min-idle: 0
+    port: 6379
+
+  thymeleaf:
+    cache: false
+    content-type: text/html
+    encoding: UTF-8
+    mode: LEGACYHTML5
+    prefix: classpath:/templates/
+    suffix: .html
+website:
+  domainName: 127.0.0.1
+wecaht:
+  appSecret: f84db4dc62377926624093b49ac3be1f
+  appId: wx60f06d61f21804be
+---
+spring:
+  profiles: private-cloud-localhost
+  cache:
+    guava:
+      spec:
+        expireAfterWrite: 30s
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    testWhileIdle: true
+    validationQuery: SELECT 1
+    url: jdbc:mysql://127.0.0.1:3306/mooctest_user?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: Customs2019
+  hibernate:
+    ddl-auto: validate
+    naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+    properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
+  jpa:
+    show-sql: true
+
+  redis:
+    host: 127.0.0.1
+    password:
+    pool:
+      max-active: 8
+      max-idle: 8
+      max-wait: -1
+      min-idle: 0
+    port: 6379
+
+  thymeleaf:
+    cache: false
+    content-type: text/html
+    encoding: UTF-8
+    mode: LEGACYHTML5
+    prefix: classpath:/templates/
+    suffix: .html
+website:
+  domainName: 127.0.0.1
+wecaht:
+  appSecret: f84db4dc62377926624093b49ac3be1f
+  appId: wx60f06d61f21804be

+ 2 - 2
mooctest-user-server/src/main/resources/bootstrap.yaml

@@ -1,4 +1,4 @@
-spring.profiles.active: localhost
+#spring.profiles.active: private
 #spring.profiles.active: crowd
 #spring.profiles.active: crowdprod
 spring:
@@ -6,7 +6,7 @@ spring:
     name: mooctest-user-server
   cloud:
     zookeeper:
-      enabled: true  # true:开启zookeeper外部化配置, false:读取本地配置;
+      enabled: false  # true:开启zookeeper外部化配置, false:读取本地配置;
       connect-string: 101.37.175.111:2181
       config:
         root: /config

+ 2 - 2
mooctest-user-server/src/main/resources/templates/common/common_head.html

@@ -2,8 +2,8 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
 <head th:fragment="head(title)">
     <meta charset="UTF-8">
-    <title th:text="${title}">众测服务平台</title>
-    <!--<title>众测服务平台</title>-->
+    <title th:text="${title}">群智服务平台</title>
+    <!--<title>群智服务平台</title>-->
     <link rel="stylesheet" type="text/css" th:href="@{/vendor/bootstrap/css/bootstrap.min.css}">
     <link rel="stylesheet" type="text/css" th:href="@{/fonts/font-awesome-4.7.0/css/font-awesome.min.css}">
     <link rel="stylesheet" type="text/css" th:href="@{/fonts/iconic/css/material-design-iconic-font.min.css}">

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

@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>【众测服务平台】通知邮件</title>
+    <title>【群智服务平台】通知邮件</title>
 </head>
 <body>
 尊敬的管理员:<br>

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

@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>【众测服务平台】验证邮件</title>
+    <title>【群智服务平台】验证邮件</title>
 </head>
 <body>
 尊敬的用户:<br>

+ 1 - 1
mooctest-user-server/src/main/resources/templates/forget_password.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="" />
 

+ 1 - 1
mooctest-user-server/src/main/resources/templates/forget_password_email.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="" />
 

+ 1 - 1
mooctest-user-server/src/main/resources/templates/forget_password_mobile.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="" />
 

+ 1 - 1
mooctest-user-server/src/main/resources/templates/forget_password_reset.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="" />
 

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

@@ -27,7 +27,7 @@
 						<img style="width: 80px;" th:src="@{/images/mooctest.png}" >
 					</div>
 
-					<span class="login100-form-title p-b-30">众测服务平台</span>
+					<span class="login100-form-title p-b-30">群智服务平台</span>
 
 					<div class="wrap-input100 validate-input m-b-23" data-validate="请输入用户名">
 						<span class="label-input100">邮箱</span>

+ 8 - 8
mooctest-user-server/src/main/resources/templates/login.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="" />
 
@@ -27,7 +27,7 @@
                     <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
                 </div>
 
-                <span class="login100-form-title p-b-30">众测服务平台</span>
+                <span class="login100-form-title p-b-30">群智服务平台</span>
 
                 <div class="wrap-input100 validate-input m-b-23" data-validate="请输入用户名">
                     <span class="label-input100">邮箱</span>
@@ -42,12 +42,12 @@
                 </div>
 
                 <div p-t-8 p-b-20>
-                    <div class="text-left" style="float: left;">
-                        <a href="/page/mobile/login">手机登录</a>
-                    </div>
-                    <div class="text-right" style="float: right;">
-                        <a href="/page/forgetPassword/email">忘记密码?</a>
-                    </div>
+<!--                    <div class="text-left" style="float: left;">-->
+<!--                        <a href="/page/mobile/login">手机登录</a>-->
+<!--                    </div>-->
+<!--                    <div class="text-right" style="float: right;">-->
+<!--                        <a href="/page/forgetPassword/email">忘记密码?</a>-->
+<!--                    </div>-->
                 </div>
                 <div class="text-center p-t-6 p-b-20">
                     <span style="color: red" th:text="${result==null}?'&nbsp;':${result.msg}"></span>

+ 2 - 2
mooctest-user-server/src/main/resources/templates/mobile_login.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="" />
 
@@ -27,7 +27,7 @@
                     <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
                 </div>
 
-                <span class="login100-form-title p-b-30">众测服务平台</span>
+                <span class="login100-form-title p-b-30">群智服务平台</span>
 
                 <div class="wrap-input100 validate-input m-b-23" data-validate="请输入手机号">
                     <span class="label-input100">手机号</span>

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

@@ -27,7 +27,7 @@
                     <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
                 </div>
 
-                <span class="login100-form-title p-b-5">众测服务平台</span>
+                <span class="login100-form-title p-b-5">群智服务平台</span>
 
                 <div class="wrap-input100 validate-input" data-validate="请输入邮箱">
                     <!--<span class="label-input100">邮箱</span>-->
@@ -53,20 +53,20 @@
                     <span class="focus-input100" data-symbol="&#xf190;"></span>
                 </div>
 
-                <div class="wrap-input100 validate-input " data-validate="请输入验证码">
-                    <input class="input100" type="text" name="verifyCode" placeholder="请输入验证码" required="验证码不可为空">
-                    <span class="focus-input100" data-symbol="&#xf13a;"></span>
-                </div>
+<!--                <div class="wrap-input100 validate-input " data-validate="请输入验证码">-->
+<!--                    <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" th:text="${result==null}?'&nbsp;':${result.msg}"></span>
                 </div>
 
-                <div class="container-login100-form-btn" style="width: 50%; float: left;">
-                    <div class="wrap-login100-form-btn">
-                        <div class="login100-form-bgbtn"></div>
-                        <button type="button"  id="sendVerify" class="login100-form-btn" onclick="sendEmail(this)" >获取验证码</button>
-                    </div>
-                </div>
+<!--                <div class="container-login100-form-btn" style="width: 50%; float: left;">-->
+<!--                    <div class="wrap-login100-form-btn">-->
+<!--                        <div class="login100-form-bgbtn"></div>-->
+<!--                        <button type="button"  id="sendVerify" class="login100-form-btn" onclick="sendEmail(this)" >获取验证码</button>-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="container-login100-form-btn">
                     <div class="wrap-login100-form-btn">
                         <div class="login100-form-bgbtn"></div>

+ 1 - 1
mooctest-user-server/src/main/resources/templates/reset_email.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="" />
 

+ 1 - 1
mooctest-user-server/src/main/resources/templates/reset_mobile.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="" />
 

+ 1 - 1
mooctest-user-server/src/main/resources/templates/reset_password.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="" />
 

+ 2 - 2
mooctest-user-server/src/main/resources/templates/third_party_bind.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="" />
 
@@ -28,7 +28,7 @@
                     <img  style="width: 80px; border-radius: 50%;" th:src="${headImg}" >
                 </div>
 
-                <span class="login100-form-title p-b-30" th:text="${thirdPartyName}">众测服务平台</span>
+                <span class="login100-form-title p-b-30" th:text="${thirdPartyName}">群智服务平台</span>
                 <input id="thirdPartyName" name="thirdPartyName" type="hidden" th:value="${thirdPartyName}">
                 <input id="thirdPartyId" name="thirdPartyId" type="hidden" th:value="${thirdPartyId}">
                 <input id="from" name="from" type="hidden" th:value="${from}">

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

@@ -5,7 +5,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="" />