diff --git a/src/main/java/com/meiyou/bigwhale/config/DingdingConfig.java b/src/main/java/com/meiyou/bigwhale/config/DingdingConfig.java
index 8b2f0b182f114d3ac6007eca517b609a5b92a6bc..b1bdf6fe1622281b1282c31f03b8df8dbcaca00a 100644
--- a/src/main/java/com/meiyou/bigwhale/config/DingdingConfig.java
+++ b/src/main/java/com/meiyou/bigwhale/config/DingdingConfig.java
@@ -1,14 +1,14 @@
 package com.meiyou.bigwhale.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * @author Suxy
  * @date 2019/11/8
  * @description file description
  */
-@Component
+@Configuration
 @ConfigurationProperties(prefix = "big-whale.dingding")
 public class DingdingConfig {
 
diff --git a/src/main/java/com/meiyou/bigwhale/config/SshConfig.java b/src/main/java/com/meiyou/bigwhale/config/SshConfig.java
index 12d30d118c394850827b7959e30463cd2b9416a8..7abf9579bcc9b5512f33769d5e2b90d4e5905a1d 100644
--- a/src/main/java/com/meiyou/bigwhale/config/SshConfig.java
+++ b/src/main/java/com/meiyou/bigwhale/config/SshConfig.java
@@ -1,14 +1,14 @@
 package com.meiyou.bigwhale.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
 /**
  * @author progr1mmer
  * @date Created on 2020/3/18
  */
-@Component
+@Configuration
 @ConfigurationProperties(prefix = "big-whale.ssh")
 public class SshConfig {
 
diff --git a/src/main/java/com/meiyou/bigwhale/config/YarnConfig.java b/src/main/java/com/meiyou/bigwhale/config/YarnConfig.java
index c84015875f6d6157af6afae2c2d1e23fe8edf87c..fda2265cda5dcc762b37e28800ef0d695e81ec95 100644
--- a/src/main/java/com/meiyou/bigwhale/config/YarnConfig.java
+++ b/src/main/java/com/meiyou/bigwhale/config/YarnConfig.java
@@ -1,7 +1,7 @@
 package com.meiyou.bigwhale.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2019/11/8
  * @description file description
  */
-@Component
+@Configuration
 @ConfigurationProperties(prefix = "big-whale.yarn")
 public class YarnConfig {
 
diff --git a/src/main/java/com/meiyou/bigwhale/controller/StreamController.java b/src/main/java/com/meiyou/bigwhale/controller/StreamController.java
index d61cedb4ff2ebfca35e5676ceadbbca24b555fc0..a330fe6e7ae2ae98e8a3603e62deda0a5346916f 100644
--- a/src/main/java/com/meiyou/bigwhale/controller/StreamController.java
+++ b/src/main/java/com/meiyou/bigwhale/controller/StreamController.java
@@ -152,11 +152,12 @@ public class StreamController extends BaseController {
     @RequestMapping(value = "/delete.api", method = RequestMethod.POST)
     public Msg delete(@RequestBody DtoScript req) {
         Script script = scriptService.findById(req.getId());
-        if (script != null) {
-            Monitor monitor = monitorService.findById(script.getMonitorId());
-            SchedulerUtils.deleteJob(monitor.getId(), Constant.JobGroup.MONITOR);
-            scriptService.delete(script);
+        if (script == null) {
+            return failed();
         }
+        Monitor monitor = monitorService.findById(script.getMonitorId());
+        SchedulerUtils.deleteJob(monitor.getId(), Constant.JobGroup.MONITOR);
+        scriptService.delete(script);
         return success();
     }
 
diff --git a/src/main/java/com/meiyou/bigwhale/controller/admin/auth/AuthController.java b/src/main/java/com/meiyou/bigwhale/controller/admin/auth/AuthController.java
index f87209b3cbadcd9c244dade6bc12c73abce08e6f..624602803992d261f1971e1ac65116d3e99edb9d 100644
--- a/src/main/java/com/meiyou/bigwhale/controller/admin/auth/AuthController.java
+++ b/src/main/java/com/meiyou/bigwhale/controller/admin/auth/AuthController.java
@@ -4,13 +4,12 @@ import com.meiyou.bigwhale.common.Constant;
 import com.meiyou.bigwhale.common.pojo.Msg;
 import com.meiyou.bigwhale.controller.BaseController;
 import com.meiyou.bigwhale.entity.auth.*;
+import com.meiyou.bigwhale.security.LoginUser;
 import com.meiyou.bigwhale.service.MonitorService;
 import com.meiyou.bigwhale.service.ScheduleService;
 import com.meiyou.bigwhale.service.auth.*;
 import com.meiyou.bigwhale.util.SchedulerUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.crypto.password.StandardPasswordEncoder;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -42,8 +41,6 @@ public class AuthController extends BaseController {
     @Autowired
     private MonitorService monitorService;
 
-    private PasswordEncoder passwordEncoder = new StandardPasswordEncoder();
-
     @RequestMapping(value = "/resource/list.api", method = RequestMethod.GET)
     public Msg resourceList() {
         Iterable<Resource> resources = resourceService.findAll();
@@ -151,7 +148,7 @@ public class AuthController extends BaseController {
                 return failed("用户已存在");
             }
             req.setCreateTime(now);
-            req.setPassword(passwordEncoder.encode(req.getPassword()));
+            req.setPassword(LoginUser.PASSWORD_ENCODER.encode(req.getPassword()));
         } else {
             User dbUser = userService.findById(req.getId());
             if (dbUser == null) {
@@ -159,7 +156,7 @@ public class AuthController extends BaseController {
             }
             //修改密码
             if (!dbUser.getPassword().equals(req.getPassword())) {
-                req.setPassword(passwordEncoder.encode(req.getPassword()));
+                req.setPassword(LoginUser.PASSWORD_ENCODER.encode(req.getPassword()));
             }
         }
         req.setUpdateTime(now);
diff --git a/src/main/java/com/meiyou/bigwhale/data/service/AbstractPagingAndSortingService.java b/src/main/java/com/meiyou/bigwhale/data/service/AbstractPagingAndSortingService.java
index afaa37045aab6c069556627bade1bbc247e52027..119cac08034b57301480d4ddefc9cf159e197958 100644
--- a/src/main/java/com/meiyou/bigwhale/data/service/AbstractPagingAndSortingService.java
+++ b/src/main/java/com/meiyou/bigwhale/data/service/AbstractPagingAndSortingService.java
@@ -11,7 +11,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.regex.Pattern;
 
@@ -25,8 +24,6 @@ public abstract class AbstractPagingAndSortingService<T, ID extends Serializable
 
     private static final Pattern DATE_PATTERN = Pattern.compile("[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}");
     private static final Pattern UTC_DATE_PATTERN = Pattern.compile("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{3}Z");
-    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    private static final DateFormat UTC_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
 
     protected Class<T> clazz;
 
@@ -122,10 +119,10 @@ public abstract class AbstractPagingAndSortingService<T, ID extends Serializable
                 Field field = tmpClazz.getDeclaredField(fieldName);
                 if ("java.util.Date".equals(field.getType().getName())) {
                     if (DATE_PATTERN.matcher(strVal).find()) {
-                        return DATE_FORMAT.parse(strVal);
+                        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(strVal);
                     }
                     if (UTC_DATE_PATTERN.matcher(strVal).find()) {
-                        return UTC_DATE_FORMAT.parse(strVal);
+                        return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(strVal);
                     }
                 }
                 Constructor constructor = field.getType().getConstructor(String.class);
diff --git a/src/main/java/com/meiyou/bigwhale/security/LoginUser.java b/src/main/java/com/meiyou/bigwhale/security/LoginUser.java
index f76f51d63dc2533cc564f3440be44198258de83b..1da7ffbfb848ab8d0af5b2fad7d40b0b457a2af4 100644
--- a/src/main/java/com/meiyou/bigwhale/security/LoginUser.java
+++ b/src/main/java/com/meiyou/bigwhale/security/LoginUser.java
@@ -2,9 +2,12 @@ package com.meiyou.bigwhale.security;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.crypto.password.StandardPasswordEncoder;
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,17 +17,19 @@ import java.util.Map;
  */
 public class LoginUser extends User {
 
+    public static final PasswordEncoder PASSWORD_ENCODER = new StandardPasswordEncoder();
+
     private final Integer id;
     private final boolean root;
-    private Map<String, String> resources = new HashMap<>();
+    private Map<String, List<String>> resources = new HashMap<>();
 
-    public LoginUser(Integer id, boolean root, String username, String password, Collection<? extends GrantedAuthority> authorities) {
+    public LoginUser(String username, String password, Collection<? extends GrantedAuthority> authorities, Integer id, boolean root) {
         super(username, password, authorities);
         this.id = id;
         this.root = root;
     }
 
-    public LoginUser(Integer id,  boolean root, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
+    public LoginUser(String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities, Integer id, boolean root) {
         super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
         this.id = id;
         this.root = root;
@@ -38,11 +43,11 @@ public class LoginUser extends User {
         return root;
     }
 
-    public Map<String, String> getResources() {
+    public Map<String, List<String>> getResources() {
         return resources;
     }
 
-    public void setResources(Map<String, String> resources) {
+    public void setResources(Map<String, List<String>> resources) {
         this.resources = resources;
     }
 
diff --git a/src/main/java/com/meiyou/bigwhale/security/WebSecurityConfigurerAdaptor.java b/src/main/java/com/meiyou/bigwhale/security/WebSecurityConfigurerAdaptor.java
index 0ce154d02ffc7e81265b26465f0aac3ddbbadc26..6c4e29a7ff46a62fa44ff68ceb63a34f1d7f8abb 100644
--- a/src/main/java/com/meiyou/bigwhale/security/WebSecurityConfigurerAdaptor.java
+++ b/src/main/java/com/meiyou/bigwhale/security/WebSecurityConfigurerAdaptor.java
@@ -1,6 +1,5 @@
 package com.meiyou.bigwhale.security;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -14,7 +13,6 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
-import org.springframework.security.crypto.password.StandardPasswordEncoder;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
@@ -23,7 +21,6 @@ import org.springframework.util.AntPathMatcher;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
-import java.util.stream.Stream;
 
 /**
  * @author Suxy
@@ -35,12 +32,11 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
 
     private AntPathMatcher antPathMatcher = new AntPathMatcher();
 
-    private final String[] authPath = new String[]{"/auth/**", "/admin/**", "/api/**"};
+    private final String[] authPath = new String[]{"/auth/**", "/admin/**"};
 
     @Resource
     private JdbcTemplate jdbcTemplate;
 
-
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.csrf().disable();
@@ -55,7 +51,7 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
         //授权
         http.exceptionHandling().accessDeniedHandler(accessDeniedHandler());
         //退出
-        http.logout().logoutUrl("/logout.html").permitAll().invalidateHttpSession(true);
+        http.logout().logoutUrl("/logout").permitAll().invalidateHttpSession(true);
     }
 
     @Override
@@ -65,8 +61,7 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
                 "/libs/**",
                 "/css/**",
                 "/js/**",
-                "/img/**",
-                "/openapi/**"
+                "/img/**"
         );
     }
 
@@ -76,7 +71,7 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
         userDetailsService.setJdbcTemplate(jdbcTemplate);
         userDetailsService.setUsersByUsernameQuery("select username,password,enabled,id,root from auth_user where username = ?");
         userDetailsService.setAuthoritiesByUsernameQuery("select username,role from auth_user_role where username = ?");
-        auth.userDetailsService(userDetailsService).passwordEncoder(new StandardPasswordEncoder());
+        auth.userDetailsService(userDetailsService).passwordEncoder(LoginUser.PASSWORD_ENCODER);
     }
 
     public boolean hasPermission(HttpServletRequest request, Authentication authentication) {
@@ -85,14 +80,8 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
             if (((LoginUser) principal).isRoot()) {
                 return true;
             }
-            for (String url : ((LoginUser) principal).getResources().values()) {
-                if (url.contains(",")) {
-                    for (String part : url.split(",")) {
-                        if (antPathMatcher.match(part, request.getRequestURI())) {
-                            return true;
-                        }
-                    }
-                } else {
+            for (List<String> urls : ((LoginUser) principal).getResources().values()) {
+                for (String url : urls) {
                     if (antPathMatcher.match(url, request.getRequestURI())) {
                         return true;
                     }
@@ -113,21 +102,23 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
                 principal.getAuthorities().forEach(grantedAuthority -> roles.append("\'").append(grantedAuthority.getAuthority()).append("\'").append(","));
                 String sql = String.format(defRoleResourceByRoleCode, roles.substring(0, roles.length() - 1));
                 List<Map<String, Object>> roleResourcesList = jdbcTemplate.queryForList(sql);
-                Map<String, String> roleResourcesMap = new HashMap<>();
+                Map<String, List<String>> resources = new HashMap<>();
                 String contextPath = httpServletRequest.getContextPath();
                 roleResourcesList.forEach(item -> {
                     String resource = item.get("resource") != null ? (String) item.get("resource") : "";
-                    String url = "";
+                    List<String> urls = new ArrayList<>();
                     if (item.get("url") != null) {
-                        url = StringUtils.join(Stream.of(item.get("url").toString().split(",")).map(u -> contextPath + u).toArray(), ",");
+                        for (String u : item.get("url").toString().split(",")) {
+                            urls.add(contextPath + u);
+                        }
                     }
-                    roleResourcesMap.put(resource, url);
+                    resources.put(resource, urls);
                 });
-                principal.setResources(roleResourcesMap);
+                principal.setResources(resources);
             }
             httpServletRequest.getSession().setAttribute("user", principal);
             httpServletResponse.setContentType("application/json;charset=UTF-8");
-            httpServletResponse.getWriter().write("{\"code\": 0, \"msg\": \"" + principal.getUsername() + "\"}");
+            httpServletResponse.getWriter().write("{\"code\": 0, \"msg\": \"登录成功\", \"content\": \"" + principal.getUsername() + "\"}");
         };
     }
 
@@ -135,9 +126,9 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
         return (httpServletRequest, httpServletResponse, e) -> {
             httpServletResponse.setContentType("application/json;charset=UTF-8");
             if (e instanceof BadCredentialsException) {
-                httpServletResponse.getWriter().write("{\"code\": -1, \"msg\": \"账号或密码错误\"}");
+                httpServletResponse.getWriter().write("{\"code\": -1, \"msg\": \"账号或密码错误\", \"content\": null}");
             } else {
-                httpServletResponse.getWriter().write("{\"code\": -1, \"msg\": \"账号状态异常，请联系管理员\"}");
+                httpServletResponse.getWriter().write("{\"code\": -1, \"msg\": \"账号状态异常，请联系管理员\", \"content\": null}");
             }
         };
     }
@@ -145,7 +136,7 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
     private AccessDeniedHandler accessDeniedHandler() {
         return (httpServletRequest, httpServletResponse, e) -> {
             httpServletResponse.setContentType("application/json;charset=UTF-8");
-            httpServletResponse.getWriter().write("{\"code\": -1, \"msg\": \"无权访问\"}");
+            httpServletResponse.getWriter().write("{\"code\": -1, \"msg\": \"无权访问\", \"content\": null}");
         };
     }
 
@@ -159,7 +150,7 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
                 boolean enabled = rs.getBoolean(3);
                 Integer id = rs.getInt(4);
                 boolean root = rs.getBoolean(5);
-                return new LoginUser(id, root, username1, password, enabled, true, true, true, AuthorityUtils.NO_AUTHORITIES);
+                return new LoginUser(username1, password, enabled, true, true, true, AuthorityUtils.NO_AUTHORITIES, id, root);
             });
         }
 
@@ -180,7 +171,7 @@ public class WebSecurityConfigurerAdaptor extends WebSecurityConfigurerAdapter {
             }
             Integer id = ((LoginUser) userFromUserQuery).getId();
             boolean root = ((LoginUser) userFromUserQuery).isRoot();
-            return new LoginUser(id, root, returnUsername, userFromUserQuery.getPassword(), userFromUserQuery.isEnabled(), true, true, true, combinedAuthorities);
+            return new LoginUser(returnUsername, userFromUserQuery.getPassword(), userFromUserQuery.isEnabled(), true, true, true, combinedAuthorities, id, root);
         }
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 51e52fe7e18c91ec023522bca25b109f8cb6a64e..3b3c7138592a1306ca6d7c9d49b045b3f12038f8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
   servlet:
     context-path: /
     session:
-      timeout: Pt30m
+      timeout: Pt4h
       cookie:
         name: JSESSIONID_BW
 
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 5f189d3349bfb5f57731f29a0c6d1a44b83cdc86..d9cb14dfa881fbb30a7927b19e60010d1f32f455 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -55,7 +55,7 @@
                 <a href="javascript:" th:text="${session.user.username}"></a>
                 <dl class="layui-nav-child">
                     <dd>
-                        <a href="./logout.html">退出</a>
+                        <a href="./logout">退出</a>
                     </dd>
                 </dl>
             </li>