合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/config/MyUserDetailsServiceImpl.java

 package com.zjty.tynotes.pas.config;
 
+import com.zjty.tynotes.pas.config.handler.MyFailHandler;
 import com.zjty.tynotes.pas.dao.AuthorityDao;
 import com.zjty.tynotes.pas.dao.RoleAuthorityDao;
 import com.zjty.tynotes.pas.dao.RoleDao;
@@ -49,7 +50,7 @@ public class MyUserDetailsServiceImpl implements UserDetailsService {
     @Autowired
     private Init init;
     @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException{
         System.out.println("userService验证:" + username);
         if(username.equals("root")){
             User root = init.root;
@@ -97,6 +98,9 @@ public class MyUserDetailsServiceImpl implements UserDetailsService {
                 user.setArrayList(list);
         }
 
+            if(user==null){
+                throw new UsernameNotFoundException("用户名或密码不正确");
+            }
             return user;
         }
     }

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/User.java

@@ -50,7 +50,6 @@ public class User implements UserDetails, Serializable {
     @ApiModelProperty(value = "联系方式",example = "113665465465")
     private String phone1;
 
-    @NotEmpty(message = "联系方式不可为空")
     @ApiModelProperty(value = "联系方式",example = "113665465465")
     private String phone2;
 

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

@@ -35,14 +35,14 @@ public class UnionApplication {
     return tomcat;
     }
 
- private Connector createHTTPConnector() {
- Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
- //同时启用http（8080）、https（8443）两个端口
- connector.setScheme("http");
- connector.setSecure(false);
- connector.setPort(8084);
- connector.setRedirectPort(8289);
- return connector;
-}
+    private Connector createHTTPConnector() {
+        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+        //同时启用http（8080）、https（8443）两个端口
+        connector.setScheme("http");
+        connector.setSecure(false);
+        connector.setPort(8084);
+        connector.setRedirectPort(8289);
+        return connector;
+    }
 
 }