|
@@ -27,10 +27,10 @@ import org.maxkey.entity.Accounts;
|
|
|
import org.maxkey.entity.ChangePassword;
|
|
|
import org.maxkey.entity.UserInfo;
|
|
|
import org.maxkey.persistence.mapper.UserInfoMapper;
|
|
|
-import org.maxkey.persistence.mq.MqProvisionAction;
|
|
|
-import org.maxkey.persistence.mq.MqProvisionTopic;
|
|
|
-import org.maxkey.persistence.mq.MessageQueueService;
|
|
|
import org.maxkey.persistence.repository.PasswordPolicyValidator;
|
|
|
+import org.maxkey.provision.ProvisionService;
|
|
|
+import org.maxkey.provision.ProvisionAction;
|
|
|
+import org.maxkey.provision.ProvisionTopic;
|
|
|
import org.maxkey.util.DateUtils;
|
|
|
import org.maxkey.util.StringUtils;
|
|
|
import org.maxkey.web.WebContext;
|
|
@@ -56,7 +56,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
|
|
|
PasswordPolicyValidator passwordPolicyValidator;
|
|
|
|
|
|
@Autowired
|
|
|
- MessageQueueService messageQueueService;
|
|
|
+ ProvisionService messageQueueService;
|
|
|
|
|
|
AccountsService accountsService;
|
|
|
|
|
@@ -78,9 +78,9 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
|
|
|
if(messageQueueService.getApplicationConfig().isMessageQueueSupport()) {
|
|
|
UserInfo loadUserInfo = findUserRelated(userInfo.getId());
|
|
|
messageQueueService.send(
|
|
|
- MqProvisionTopic.USERINFO_TOPIC,
|
|
|
+ ProvisionTopic.USERINFO_TOPIC,
|
|
|
loadUserInfo,
|
|
|
- MqProvisionAction.CREATE_ACTION);
|
|
|
+ ProvisionAction.CREATE_ACTION);
|
|
|
}
|
|
|
|
|
|
return true;
|
|
@@ -96,9 +96,9 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
|
|
|
UserInfo loadUserInfo = findUserRelated(userInfo.getId());
|
|
|
accountUpdate(loadUserInfo);
|
|
|
messageQueueService.send(
|
|
|
- MqProvisionTopic.USERINFO_TOPIC,
|
|
|
+ ProvisionTopic.USERINFO_TOPIC,
|
|
|
loadUserInfo,
|
|
|
- MqProvisionAction.UPDATE_ACTION);
|
|
|
+ ProvisionAction.UPDATE_ACTION);
|
|
|
}
|
|
|
if(userInfo.getPassword() != null) {
|
|
|
changePasswordProvisioning(changePassword);
|
|
@@ -116,9 +116,9 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
|
|
|
|
|
|
if( super.delete(userInfo)){
|
|
|
messageQueueService.send(
|
|
|
- MqProvisionTopic.USERINFO_TOPIC,
|
|
|
+ ProvisionTopic.USERINFO_TOPIC,
|
|
|
loadUserInfo,
|
|
|
- MqProvisionAction.DELETE_ACTION);
|
|
|
+ ProvisionAction.DELETE_ACTION);
|
|
|
accountUpdate(loadUserInfo);
|
|
|
return true;
|
|
|
}
|
|
@@ -314,9 +314,9 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
|
|
|
UserInfo loadUserInfo = findByUsername(changePassworded.getUsername());
|
|
|
ChangePassword changePassword = new ChangePassword(loadUserInfo);
|
|
|
messageQueueService.send(
|
|
|
- MqProvisionTopic.PASSWORD_TOPIC,
|
|
|
+ ProvisionTopic.PASSWORD_TOPIC,
|
|
|
changePassword,
|
|
|
- MqProvisionAction.PASSWORD_ACTION);
|
|
|
+ ProvisionAction.PASSWORD_ACTION);
|
|
|
}
|
|
|
}
|
|
|
|