diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java
index 22850b60..fe05236c 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.Accounts;
 import org.maxkey.persistence.mapper.AccountsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AccountsService  extends JpaBaseService<Accounts>{
 
 	public AccountsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java
index 639a799c..5d9f3eb6 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.AppsCasDetails;
 import org.maxkey.persistence.mapper.AppsCasDetailsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsCasDetailsService  extends JpaBaseService<AppsCasDetails>{
 
 	public AppsCasDetailsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java
index 1cfc88df..506124eb 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.AppsDesktopDetails;
 import org.maxkey.persistence.mapper.AppsDesktopDetailsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsDesktopDetailsService  extends JpaBaseService<AppsDesktopDetails>{
 
 	public AppsDesktopDetailsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java
index 3843f0d7..7a6085e1 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.AppsFormBasedDetails;
 import org.maxkey.persistence.mapper.AppsFormBasedDetailsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsFormBasedDetailsService  extends JpaBaseService<AppsFormBasedDetails>{
 
 	public AppsFormBasedDetailsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java
index 54d21974..d6f84c0d 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.AppsJwtDetails;
 import org.maxkey.persistence.mapper.AppsJwtDetailsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsJwtDetailsService  extends JpaBaseService<AppsJwtDetails>{
 
 	public AppsJwtDetailsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java
index 2420af7a..636d5e2b 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.AppsSAML20Details;
 import org.maxkey.persistence.mapper.AppsSaml20DetailsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsSaml20DetailsService  extends JpaBaseService<AppsSAML20Details>{
 
 	public AppsSaml20DetailsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java
index efad8f34..e55a2b6a 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java
@@ -23,9 +23,9 @@ import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.Apps;
 import org.maxkey.domain.apps.UserApps;
 import org.maxkey.persistence.mapper.AppsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsService  extends JpaBaseService<Apps>{
 
 	public AppsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java
index b48a2131..bac32a06 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.apps.AppsTokenBasedDetails;
 import org.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class AppsTokenBasedDetailsService  extends JpaBaseService<AppsTokenBasedDetails>{
 
 	public AppsTokenBasedDetailsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java
index 2cf52b72..b0a2a740 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java
@@ -21,9 +21,9 @@ import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.GroupMember;
 import org.maxkey.domain.Groups;
 import org.maxkey.persistence.mapper.GroupMemberMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class GroupMemberService  extends JpaBaseService<GroupMember>{
 	
 	public GroupMemberService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java
index 4b27f77d..3ef32ef1 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.GroupPrivileges;
 import org.maxkey.persistence.mapper.GroupPrivilegesMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class GroupPrivilegesService  extends JpaBaseService<GroupPrivileges>{
 	
 	public GroupPrivilegesService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java
index e2694c9e..d71f3590 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java
@@ -29,9 +29,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class GroupsService  extends JpaBaseService<Groups>{
     final static Logger _logger = LoggerFactory.getLogger(GroupsService.class);
     @Autowired
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java
index 03ca0713..19094c6e 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.HistoryLoginApps;
 import org.maxkey.persistence.mapper.HistoryLoginAppsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class HistoryLoginAppsService  extends JpaBaseService<HistoryLoginApps>{
 
 	public HistoryLoginAppsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java
index 282f0474..cde7fe32 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.HistoryLogin;
 import org.maxkey.persistence.mapper.HistoryLoginMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class HistoryLoginService  extends JpaBaseService<HistoryLogin>{
 
 	public HistoryLoginService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java
index 72d6b0a0..e6e78cda 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.HistoryLogs;
 import org.maxkey.persistence.mapper.HistoryLogsMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class HistoryLogsService  extends JpaBaseService<HistoryLogs>{
 
 	public HistoryLogsService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java
index e0404b91..a981981a 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java
@@ -39,13 +39,13 @@ import org.maxkey.persistence.kafka.KafkaIdentityTopic;
 import org.maxkey.persistence.kafka.KafkaPersistService;
 import org.maxkey.persistence.mapper.OrganizationsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.google.common.collect.Lists;
 
-@Service
+@Repository
 public class OrganizationsService  extends JpaBaseService<Organizations>{
 
     @Autowired
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java
index b1f2c67f..8e78aef2 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java
@@ -20,9 +20,9 @@ package org.maxkey.persistence.service;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.PasswordPolicy;
 import org.maxkey.persistence.mapper.PasswordPolicyMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class PasswordPolicyService  extends JpaBaseService<PasswordPolicy>{
 
 	public PasswordPolicyService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java
index f02b2c0e..cdd546f5 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java
@@ -23,9 +23,9 @@ import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.Registration;
 import org.maxkey.domain.UserInfo;
 import org.maxkey.persistence.mapper.RegistrationMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class RegistrationService  extends JpaBaseService<Registration>{
 
 	public RegistrationService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java
index c2b10556..ec7cbb9c 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java
@@ -23,9 +23,9 @@ import java.util.Map;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.persistence.mapper.ReportMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class ReportService  extends JpaBaseService<JpaBaseDomain>{
 
 	public Integer analysisDay(String reportParameter) {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java
index 643eb4c7..d964071c 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java
@@ -22,9 +22,9 @@ import java.util.List;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.Resources;
 import org.maxkey.persistence.mapper.ResourcesMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class ResourcesService  extends JpaBaseService<Resources>{
 	
 	public ResourcesService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java
index 5ca174d6..598ba307 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java
@@ -21,9 +21,9 @@ import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.RoleMember;
 import org.maxkey.domain.Roles;
 import org.maxkey.persistence.mapper.RoleMemberMapper;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class RoleMemberService  extends JpaBaseService<RoleMember>{
 	
 	public RoleMemberService() {
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java
index 0d5db580..d44d2955 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java
@@ -28,9 +28,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class RolesService  extends JpaBaseService<Roles>{
     final static Logger _logger = LoggerFactory.getLogger(RolesService.class);
     
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java
index 3abd187f..1505cd0b 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java
@@ -19,13 +19,12 @@ package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.domain.UserInfoAdjoint;
-import org.maxkey.persistence.mapper.RolesMapper;
 import org.maxkey.persistence.mapper.UserInfoAdjointMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
-@Service
+@Repository
 public class UserInfoAdjointService  extends JpaBaseService<UserInfoAdjoint>{
     final static Logger _logger = LoggerFactory.getLogger(UserInfoAdjointService.class);
     
diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
index 199e3f37..43e64dc9 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -64,7 +64,7 @@ import com.google.common.collect.Lists;
  * @author Crystal.Sea
  *
  */
-@Service
+@Repository
 public class UserInfoService extends JpaBaseService<UserInfo> {
 	final static Logger _logger = LoggerFactory.getLogger(UserInfoService.class);