平台名称通过用户服务的数据库获取

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

@@ -10,5 +10,4 @@ public class VerifyConstants {
     public static final String SMS_VERI_TEMPLATE_ID = "73686";
     // public static final String SMS_VERI_TIMEOUT = "30";
     public static final long MOBILE_VERIFICATION_INTERVAL = 60 * 1000;
-
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/ConfigurationDao.java

@@ -0,0 +1,17 @@
+package cn.iselab.mooctest.user.mapper;
+
+import cn.iselab.mooctest.user.model.BankAccountInfo;
+import cn.iselab.mooctest.user.model.Configuration;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.CrudRepository;
+
+import javax.transaction.Transactional;
+
+/**
+ * @Description: 配置项
+ * @Author: guochao
+ */
+@Transactional
+public interface ConfigurationDao extends CrudRepository<Configuration, Long>, JpaSpecificationExecutor<Configuration> {
+    Configuration findByName(String name);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/Configuration.java

@@ -0,0 +1,27 @@
+package cn.iselab.mooctest.user.model;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-09-15 20:52
+ */
+@Data
+@Entity
+@Table(name = "configuration")
+public class Configuration {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "value")
+    private String value;
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/ConfigurationService.java

@@ -0,0 +1,15 @@
+package cn.iselab.mooctest.user.service;
+
+import cn.iselab.mooctest.user.model.Configuration;
+import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
+
+
+/**
+ * @author guochao
+ */
+public interface ConfigurationService {
+
+    String getPlatformNameConfiguration() throws ConfigurationNotExistException;
+
+}
+

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/ConfigurationServiceImpl.java

@@ -0,0 +1,30 @@
+package cn.iselab.mooctest.user.service.impl;
+
+import cn.iselab.mooctest.user.mapper.ConfigurationDao;
+import cn.iselab.mooctest.user.model.Configuration;
+import cn.iselab.mooctest.user.service.ConfigurationService;
+import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author guochao
+ */
+@Service
+public class ConfigurationServiceImpl implements ConfigurationService {
+    @Autowired
+    private ConfigurationDao configurationDao;
+
+    @Override
+    public String getPlatformNameConfiguration() throws ConfigurationNotExistException {
+        try{
+            Configuration configuration = configurationDao.findByName("platformName");
+            return configuration.getValue();
+        }catch (Exception e){
+            throw new ConfigurationNotExistException("数据库中无平台名称platformName的配置项");
+        }
+
+    }
+}
+

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

@@ -2,7 +2,9 @@ package cn.iselab.mooctest.user.service.impl;
 
 import cn.iselab.mooctest.user.configure.MailProperties;
 import cn.iselab.mooctest.user.constants.VerifyConstants;
+import cn.iselab.mooctest.user.service.ConfigurationService;
 import cn.iselab.mooctest.user.service.MailService;
+import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,9 @@ public class MailServiceImpl implements MailService {
 
     private static ArrayList<String> adminEmails = new ArrayList<>();
 
+    @Autowired
+    private ConfigurationService configurationService;
+
     // static {
     //     adminEmails.add("zychen@nju.edu.cn");
     //     adminEmails.add("chrong.fang@gmail.com");
@@ -64,10 +69,11 @@ public class MailServiceImpl implements MailService {
 
     @Override
     public void sendHtmlEmail(String sender, String receiver, String subject, String content) throws MessagingException {
+        String senderName = getPlatformName();
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message,true);
         try {
-            helper.setFrom(sender, VerifyConstants.SENDER_NAME);
+            helper.setFrom(sender, senderName);
         } catch (UnsupportedEncodingException e) {
             logger.error("设置发件人名称出错", e);
         }
@@ -85,7 +91,19 @@ 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);
+
+        String senderName = getPlatformName();
+        sendHtmlEmail(sender,receiver, "【验证码-" + senderName + "】", emailContent);
+    }
+
+    private String getPlatformName() {
+        String senderName = VerifyConstants.SENDER_NAME;
+        try {
+            senderName = configurationService.getPlatformNameConfiguration();
+        } catch (ConfigurationNotExistException e) {
+            e.printStackTrace();
+        }
+        return senderName;
     }
 
     @Override
@@ -97,11 +115,12 @@ public class MailServiceImpl implements MailService {
         MimeMessage message = mailSender.createMimeMessage();
         String[] receivers = adminEmails.toArray(new String[adminEmails.size()]);
 
+        String senderName = getPlatformName();
         try {
             MimeMessageHelper helper = new MimeMessageHelper(message,true);
-            helper.setFrom(mailProperties.getUsername(), VerifyConstants.SENDER_NAME);
+            helper.setFrom(mailProperties.getUsername(), senderName);
             helper.setTo(receivers);
-            helper.setSubject("【群智服务平台】短信服务欠费通知");
+            helper.setSubject("【" + senderName + "】短信服务欠费通知");
             helper.setText(emailContent, true);
         } catch (UnsupportedEncodingException e) {
             logger.error("设置发件人名称时编码出错", e);

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

@@ -11,6 +11,7 @@ import cn.iselab.mooctest.user.util.OSSUtil;
 import cn.iselab.mooctest.user.web.data.BankAccountInfoVO;
 import cn.iselab.mooctest.user.web.data.OperationRecordVO;
 import cn.iselab.mooctest.user.web.data.UserVO;
+import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
 import cn.iselab.mooctest.user.web.logic.UserLogic;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -183,4 +184,14 @@ public class UserController extends BaseController {
     public void recordUserOperation(@RequestBody OperationRecordVO recordVO) {
         userLogic.recordUserOperation(recordVO.toOperationRecord());
     }
+
+
+    /**
+     * 获取平台名称
+     * @return
+     */
+    @RequestMapping(value = UrlConstants.API + "getPlatformName", method = RequestMethod.GET)
+    public String getPlatformName() throws ConfigurationNotExistException {
+        return userLogic.getPlatformName();
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/exception/ConfigurationNotExistException.java

@@ -0,0 +1,13 @@
+package cn.iselab.mooctest.user.web.exception;
+
+import cn.iselab.mooctest.user.model.Configuration;
+
+/**
+ * @author guochao
+ * @date 2020-12-30 19:35
+ */
+public class ConfigurationNotExistException extends Exception{
+    public ConfigurationNotExistException(String msg){
+        super(msg);
+    }
+}

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

@@ -6,6 +6,7 @@ import cn.iselab.mooctest.user.data.ResponseResult;
 import cn.iselab.mooctest.user.model.OperationRecord;
 import cn.iselab.mooctest.user.web.data.BankAccountInfoVO;
 import cn.iselab.mooctest.user.web.data.UserVO;
+import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -78,4 +79,6 @@ public interface UserLogic {
     void recordUserOperation(String ip, Long userId, String operation, String resource);
 
     Boolean isLogin(HttpServletRequest request);
+
+    String getPlatformName() throws ConfigurationNotExistException;
 }

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

@@ -14,6 +14,7 @@ import cn.iselab.mooctest.user.web.data.BankAccountInfoVO;
 import cn.iselab.mooctest.user.web.data.UserVO;
 import cn.iselab.mooctest.user.web.data.wrapper.BankAccountInfoVOWrapper;
 import cn.iselab.mooctest.user.web.data.wrapper.UserVOWrapper;
+import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
 import cn.iselab.mooctest.user.web.exception.HttpBadRequestException;
 import cn.iselab.mooctest.user.web.logic.BaseLogic;
 import cn.iselab.mooctest.user.web.logic.UserLogic;
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.mail.MessagingException;
+import javax.naming.Name;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.io.UnsupportedEncodingException;
@@ -72,6 +74,10 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
 
     @Autowired
     private BankAccountInfoService bankAccountInfoService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
     private String userId;
 
     @Value("${feature.email}")
@@ -732,6 +738,11 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     }
 
     @Override
+    public String getPlatformName() throws ConfigurationNotExistException {
+        return configurationService.getPlatformNameConfiguration();
+    }
+
+    @Override
     public void recordLoginAction(HttpServletRequest request, Long userId, String resource) {
         OperationRecord record = this.buildUserOperation(request,userId,resource);
         if(record==null)

mooctest-user-server/src/main/resources/static/js/common-contains.js

@@ -0,0 +1,13 @@
+//获取平台名称
+$.ajax({
+    type: 'get',
+    url: '/api/getPlatformName',
+    success: function (data) {
+        var originTitle = document.title;
+        var realTitle = originTitle;
+        if(originTitle.indexOf("群智服务平台") != -1){
+            realTitle = originTitle.replace("群智服务平台", data);
+        }
+        document.title = realTitle;
+    }
+});

mooctest-user-server/src/main/resources/static/js/common-only.js

@@ -0,0 +1,8 @@
+//获取平台名称
+$.ajax({
+    type: 'get',
+    url: '/api/getPlatformName',
+    success: function (data) {
+        document.title = data;
+    }
+});

mooctest-user-server/src/main/resources/static/js/common.js

@@ -0,0 +1,19 @@
+//获取平台名称
+$.ajax({
+    type: 'get',
+    url: '/api/getPlatformName',
+    success: function (data) {
+        document.title = data;
+        $(".login100-form-title").text(data);
+        // var originTitle = document.title;
+        // var realTitle = originTitle;
+        // if(originTitle.indexOf("群智服务平台") != -1){
+        //     realTitle = originTitle.replace("群智服务平台", data);
+        // }
+        // document.title = realTitle;
+
+        // if($(".login100-form-title").text().indexOf("群智服务平台") != -1 ){
+        //     $(".login100-form-title").text(data);
+        // }
+    }
+});

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

@@ -2,8 +2,7 @@
 <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>
     <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}">

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

@@ -10,4 +10,5 @@
 <br>
 <a th:href="${rechargeUrl}">充值连接</a>
 </body>
+<script th:src="@{/js/common-contains.js}"></script>
 </html>

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

@@ -8,4 +8,5 @@
 尊敬的用户：<br>
 您好，这是一封验证邮件，您的验证码为：<span style="color: #138496" th:text="${verifyCode}"></span>
 </body>
+<script th:src="@{/js/common-contains.js}"></script>
 </html>

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="" />
 
@@ -116,6 +116,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common-only.js}"></script>
 <script type="text/javascript">
 
     function findByEmail() {

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="" />
 
@@ -73,6 +73,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common-only.js}"></script>
 <script type="text/javascript">
     function sendEmailVerifyCode(obj) {
         var email = $("#email").val();

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="" />
 
@@ -71,6 +71,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common-only.js}"></script>
 <script type="text/javascript">
     function sendMobileVerifyCode(obj) {
         var mobile = $("#mobile").val();

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="" />
 

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>
@@ -87,6 +87,7 @@
 
 	<script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 	<script th:src="@{/js/main.js}"></script>
+	<script th:src="@{/js/common.js}">
 </body>
 
 </html>

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="" />
 
@@ -26,8 +26,7 @@
                 <div id="login-logo" style="text-align: center;">
                     <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 +41,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>
@@ -87,6 +86,8 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common.js}"></script>
+
 </body>
 
 

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>
@@ -93,6 +93,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common.js}"></script>
 <script type="text/javascript">
     function sendVerifyCode(obj) {
         var mobile = $("#mobile").val();

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>-->
@@ -84,6 +84,8 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common.js}"></script>
+
 <script type="text/javascript">
 function sendEmail(obj) {
     var email = $("#email").val();

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="" />
 
@@ -67,6 +67,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common.js}"></script>
 <script type="text/javascript">
     function sendEmailVerifyCode(obj) {
         var email = $("#email").val();

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="" />
 
@@ -67,6 +67,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common.js}"></script>
 <script type="text/javascript">
     function sendMobileVerifyCode(obj) {
         var mobile = $("#mobile").val();

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="" />
 
@@ -62,6 +62,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common-only.js}"></script>
 <script type="text/javascript">
     function resetPassword(obj) {
         var oldPassword = $("#oldPassword").val();

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}">
@@ -68,6 +68,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common.js}"></script>
 </body>
 
 </html>

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="" />
 
@@ -73,6 +73,7 @@
 
 <script th:src="@{/vendor/jquery/jquery-3.2.1.min.js}"></script>
 <script th:src="@{/js/main.js}"></script>
+<script th:src="@{/js/common-only.js}"></script>
 <script type="text/javascript">
     function changeBackPic(){
         var reads = new FileReader();