合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

@@ -202,8 +202,9 @@ public class UserServiceImpl implements IUserService {
 
     @Override
     public User addUser(User user) {
-        String encode = bCryptPasswordEncoder.encode("qwer1234");
-        user.setPassword(encode);
+//        String encode = bCryptPasswordEncoder.encode("qwer1234");
+//        user.setPassword(encode);
+        user.setPassword("qwer1234");
         List<Role> roles = user.getRoles();
         List<UserRole> userRoles = new ArrayList<>();
         List<User> users = pasUserDao.findAll();

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

@@ -14,7 +14,7 @@ server.port=8289
 #server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/notes
+spring.data.mongodb.uri=mongodb://localhost:27017/note
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB