修改默认图片，作为配置项配置

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

@@ -14,4 +14,7 @@ import javax.transaction.Transactional;
 @Transactional
 public interface ConfigurationDao extends CrudRepository<Configuration, Long>, JpaSpecificationExecutor<Configuration> {
     Configuration findByName(String name);
+
+    @Override
+    Iterable<Configuration> findAll();
 }

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

@@ -3,6 +3,8 @@ package cn.iselab.mooctest.user.service;
 import cn.iselab.mooctest.user.model.Configuration;
 import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
 
+import java.util.Map;
+
 
 /**
  * @author guochao
@@ -11,5 +13,6 @@ public interface ConfigurationService {
 
     String getPlatformNameConfiguration() throws ConfigurationNotExistException;
 
+    Map<String, String> getConfiguration();
 }
 

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

@@ -4,9 +4,14 @@ 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 com.google.common.collect.Lists;
+import org.apache.commons.collections4.IteratorUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * @author guochao
@@ -26,5 +31,10 @@ public class ConfigurationServiceImpl implements ConfigurationService {
         }
 
     }
+
+    @Override
+    public Map<String, String> getConfiguration() {
+       return Lists.newArrayList(configurationDao.findAll()).stream().collect(Collectors.toMap(configuration -> configuration.getName(), configuration -> configuration.getValue()));
+    }
 }
 

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

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpSession;
 import javax.websocket.Session;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author sean
@@ -186,12 +187,21 @@ public class UserController extends BaseController {
     }
 
 
+//    /**
+//     * 获取平台名称
+//     * @return
+//     */
+//    @RequestMapping(value = UrlConstants.API + "getPlatformName", method = RequestMethod.GET)
+//    public String getPlatformName() throws ConfigurationNotExistException {
+//        return userLogic.getPlatformName();
+//    }
+
     /**
      * 获取平台名称
      * @return
      */
-    @RequestMapping(value = UrlConstants.API + "getPlatformName", method = RequestMethod.GET)
-    public String getPlatformName() throws ConfigurationNotExistException {
-        return userLogic.getPlatformName();
+    @RequestMapping(value = UrlConstants.API + "configuration", method = RequestMethod.GET)
+    public Map<String, String> getConfiguration() throws ConfigurationNotExistException {
+        return userLogic.getConfiguration();
     }
 }

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

@@ -11,6 +11,7 @@ import cn.iselab.mooctest.user.web.exception.ConfigurationNotExistException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author sean
@@ -81,4 +82,6 @@ public interface UserLogic {
     Boolean isLogin(HttpServletRequest request);
 
     String getPlatformName() throws ConfigurationNotExistException;
+
+    Map<String, String> getConfiguration();
 }

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

@@ -36,6 +36,7 @@ import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author sean
@@ -743,6 +744,11 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     }
 
     @Override
+    public Map<String, String> getConfiguration() {
+        return configurationService.getConfiguration();
+    }
+
+    @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/application.yaml

@@ -1,4 +1,4 @@
-spring.profiles.active: private-cloud
+spring.profiles.active: private-cloud-localhost
 server:
   port: 8081
 

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

@@ -1,13 +1,17 @@
-//获取平台名称
 $.ajax({
     type: 'get',
-    url: '/api/getPlatformName',
+    url: '/api/configuration',
     success: function (data) {
         var originTitle = document.title;
         var realTitle = originTitle;
         if(originTitle.indexOf("群智服务平台") != -1){
-            realTitle = originTitle.replace("群智服务平台", data);
+            realTitle = originTitle.replace("群智服务平台", data.platformName);
         }
         document.title = realTitle;
+        if(data.logo_url == '' || data.logo_url == undefined){
+            $(".logoImage").attr("src", "/images/mooctest.png");
+        }else{
+            $(".logoImage").attr("src", data.logo_url);
+        }
     }
 });

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

@@ -1,8 +1,12 @@
-//获取平台名称
 $.ajax({
     type: 'get',
-    url: '/api/getPlatformName',
+    url: '/api/configuration',
     success: function (data) {
-        document.title = data;
+        document.title = data.platformName;
+        if(data.logo_url == '' || data.logo_url == undefined){
+            $(".logoImage").attr("src", "/images/mooctest.png");
+        }else{
+            $(".logoImage").attr("src", data.logo_url);
+        }
     }
 });

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

@@ -1,19 +1,13 @@
-//获取平台名称
 $.ajax({
     type: 'get',
-    url: '/api/getPlatformName',
+    url: '/api/configuration',
     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);
-        // }
+        document.title = data.platformName;
+        $(".login100-form-title").text(data.platformName);
+        if(data.logo_url == '' || data.logo_url == undefined){
+            $(".logoImage").attr("src", "/images/mooctest.png");
+        }else{
+            $(".logoImage").attr("src", data.logo_url);
+        }
     }
 });

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

@@ -25,7 +25,7 @@
             <!--邮箱找回-->
             <form id="byEmail" th:action="@{/page/forgetPassword/check/email}" method="post" class="login100-form">
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">找回密码</span>
@@ -69,7 +69,7 @@
             <!--手机找回-->
             <form id="byMobile" style="display: none;" th:action="@{/page/forgetPassword/check/mobile}" method="post" class="login100-form">
                 <div style="text-align: center;" class="p-b-15">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">找回密码</span>

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

@@ -25,7 +25,7 @@
             <!--邮箱找回-->
             <form id="byEmail" th:action="@{/page/forgetPassword/check/email}" method="post" class="login100-form">
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">找回密码</span>

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

@@ -24,7 +24,7 @@
         <div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
             <form id="byMobile" th:action="@{/page/forgetPassword/check/mobile}" method="post" class="login100-form">
                 <div style="text-align: center;" class="p-b-15">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">找回密码</span>

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

@@ -24,7 +24,7 @@
         <div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
             <form method="post" class="login100-form validate-form">
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">重置密码</span>

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

@@ -24,7 +24,7 @@
 			<div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
 				<form th:action="@{/page/dologin}" method="post" class="login100-form validate-form">
 					<div id="login-logo" style="text-align: center;">
-						<img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+						<img style="width: 80px;" class="logoImage">
 					</div>
 
 					<span class="login100-form-title p-b-30"></span>

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

@@ -24,7 +24,7 @@
         <div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
             <form th:action="@{/page/dologin}" method="post" class="login100-form validate-form">
                 <div id="login-logo" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
                 <span class="login100-form-title p-b-30"></span>
 

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

@@ -24,7 +24,7 @@
         <div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
             <form th:action="@{/page/mobile/dologin}" method="post" class="login100-form validate-form">
                 <div id="login-logo" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30"></span>

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

@@ -24,7 +24,7 @@
         <div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
             <form th:action="@{/page/doregister}" method="post" class="login100-form validate-form">
                 <div id="login-logo" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-5"></span>

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

@@ -25,7 +25,7 @@
             <!--邮箱找回-->
             <form id="byEmail" th:action="@{/api/user/email}" method="post" class="login100-form">
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">修改邮箱</span>

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

@@ -25,7 +25,7 @@
             <!--邮箱找回-->
             <form id="byEmail" th:action="@{/api/user/mobile}" method="post" class="login100-form">
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">修改手机号</span>

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

@@ -24,7 +24,7 @@
         <div class="wrap-login100 p-l-40 p-r-40 p-t-30 p-b-25">
             <form method="post" class="login100-form validate-form">
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
 
                 <span class="login100-form-title p-b-30">修改密码</span>

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

@@ -24,7 +24,7 @@
             <form th:action="@{/api/bankInfo}" enctype="multipart/form-data" method="post" class="login100-form validate-form" style="align-content: center; padding-left: 40px; padding-right: 40px;">
 
                 <div id="login-logo" class="p-b-15" style="text-align: center;">
-                    <img style="width: 80px;" th:src="@{/images/mooctest.png}" >
+                    <img style="width: 80px;" class="logoImage">
                 </div>
                 <div class="wrap-input100 validate-input m-b-25">
                     <span class="label-input100" style="font-size: medium; font-weight: bold">姓名:</span>