代码修改

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-pas/src/main/java/com/zjty/tynotes/pas/service/impl/ConfigServiceImpl.java

@@ -40,7 +40,7 @@ public class ConfigServiceImpl implements ConfigService {
                 holidayRequest.getStartDate(), holidayRequest.getEndDate());
         List<Date> dates = new ArrayList<>();
         for (Day day : days) {
-            String format = sdf.format(day);
+            String format = sdf.format(day.getDate());
             try {
                 Date parse = sdf.parse(format);
                 dates.add(parse);

notes-union/src/main/resources/application.properties

@@ -14,7 +14,7 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/test2
+spring.data.mongodb.uri=mongodb://localhost:27017/test3
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB