1

src/main/java/com/neotel/smfcore/custom/hotayi20057/HotayiApi.java

@@ -360,7 +360,7 @@ public class HotayiApi extends BaseSmfApiListener {
                 }
                 }
 
 
                 Role role = roleManager.getByName(roleName);
                 Role role = roleManager.getByName(roleName);
-                if (role != null) {
+                if (role == null) {
                     role = new Role();
                     role = new Role();
                     role.setName(roleName);
                     role.setName(roleName);
                     role.setDescription("System automatically created");
                     role.setDescription("System automatically created");
@@ -375,14 +375,13 @@ public class HotayiApi extends BaseSmfApiListener {
                 user.setEmail(userName + "@qq.com");
                 user.setEmail(userName + "@qq.com");
                 user.setLanguage("en_US");
                 user.setLanguage("en_US");
                 user.setRoleId(role.getId());
                 user.setRoleId(role.getId());
-
+                user.setEnabled(true);
+                user=userManager.save(user);
                 log.info("autoCreateUser  未找到用户，自动创建用户[" + userName + "]完成 ");
                 log.info("autoCreateUser  未找到用户，自动创建用户[" + userName + "]完成 ");
 
 
             } else {
             } else {
 
 
-                String dbPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, user.getPassword());
-
-                if (!passwordEncoder.matches(dbPass, pwd)) {
+                if (!passwordEncoder.matches(pwd, user.getPassword())) {
                     log.info("autoCreateUser  [" + userName + "]返回 UserLevel=" + userLevel + ",自动重置密码");
                     log.info("autoCreateUser  [" + userName + "]返回 UserLevel=" + userLevel + ",自动重置密码");
                     //密码不一致时修改密码
                     //密码不一致时修改密码
                     userManager.updatePass(user.getUsername(), passwordEncoder.encode(pwd));
                     userManager.updatePass(user.getUsername(), passwordEncoder.encode(pwd));