修复管理员只能有一个的bug

src/main/java/com/fjy/spring/controller/LoginController.java

@@ -1,8 +1,10 @@
 package com.fjy.spring.controller;
 
+import com.fjy.spring.domain.TbAdmin;
 import com.fjy.spring.domain.TbLog;
 import com.fjy.spring.domain.TbUser;
 import com.fjy.spring.properties.ServerProperties;
+import com.fjy.spring.service.AdminService;
 import com.fjy.spring.service.LogService;
 import com.fjy.spring.service.UserService;
 import com.fjy.spring.untils.CodingUtil;
@@ -10,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
@@ -19,6 +22,7 @@ import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Optional;
 
 import static com.fjy.spring.constant.GlobalConstant.USER_SESSION_KEY;
 

src/main/java/com/fjy/spring/interceptor/AdminInterceptor.java

@@ -1,20 +1,39 @@
 package com.fjy.spring.interceptor;
 
 import com.fjy.spring.constant.GlobalConstant;
+import com.fjy.spring.domain.TbAdmin;
 import com.fjy.spring.domain.TbUser;
+import com.fjy.spring.service.AdminService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Optional;
 
+@Slf4j
 public class AdminInterceptor implements HandlerInterceptor {
+    @Autowired
+    private AdminService adminService;
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         TbUser user = (TbUser)request.getSession().getAttribute(GlobalConstant.USER_SESSION_KEY);
-        if (!user.getColname().equals("root")){
+        log.info(user.getColuserid()+"");
+        if (adminService == null) {//解决service为null无法注入问题
+            BeanFactory factory = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
+            adminService = (AdminService) factory.getBean("adminService");
+        }
+        Optional<TbAdmin> admin = adminService.findAdminById(user.getColuserid());
+
+        if (!admin.isPresent()){
                 response.sendRedirect("/cms/home");
                 return false;
-        }
+        }else
             return true;
     }
 

src/main/java/com/fjy/spring/interceptor/WebAppConfig.java

@@ -2,7 +2,6 @@ package com.fjy.spring.interceptor;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 

src/main/java/com/fjy/spring/repository/TbAdminRepository.java

@@ -3,6 +3,8 @@ package com.fjy.spring.repository;
 import com.fjy.spring.domain.TbAdmin;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface TbAdminRepository extends JpaRepository<TbAdmin,Integer> {
+import java.util.Optional;
 
+public interface TbAdminRepository extends JpaRepository<TbAdmin,Integer> {
+    Optional<TbAdmin> findByUserid(Integer userid);
 }

src/main/java/com/fjy/spring/service/AdminService.java

@@ -0,0 +1,18 @@
+package com.fjy.spring.service;
+
+import com.fjy.spring.domain.TbAdmin;
+import com.fjy.spring.repository.TbAdminRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class AdminService {
+    @Autowired
+    private TbAdminRepository adminRepository;
+
+    public Optional<TbAdmin>  findAdminById(Integer id){
+        return adminRepository.findByUserid(id);
+    }
+}

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 #控制配置文件调用
 spring:
   profiles:
-    active: prod
+    active: dev

src/main/resources/logback-spring.xml

@@ -25,8 +25,8 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径文件名，文件名包含时间-->
-        <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
+        <fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
-            <fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
+            <!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
         </rollingPolicy>
     </appender>
 
@@ -44,8 +44,8 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径文件名，文件名包含时间-->
-            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
+            <fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
-            <fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
+            <!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
         </rollingPolicy>
     </appender>
 

src/main/resources/static/js/user.js

@@ -176,10 +176,6 @@ var Main = {
         submitForm(formName, url) {
             this.$refs[formName].validate((valid) => {
                 var that = this;
-                var params = new URLSearchParams();
-                params.append('userid', '55');       //你要传给后台的参数值 key/value
-                params.append('question', th.ruleForm3.question.value);
-                params.append('answer', th.ruleForm3.answer.value);
                 if (valid) {//此处暂时去除校验
                     axios({
                         url: getRootPath_web()+'/' + url,