diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java index 672b1b72524aca2bc40a8d5b8940b6f9488e5b31..996aa0e362db4ada1bc7ad8aaca54a4143f94638 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java @@ -4,6 +4,7 @@ import com.zheng.cms.dao.mapper.CmsArticleMapper; import com.zheng.cms.dao.model.CmsArticle; import com.zheng.cms.dao.model.CmsArticleExample; import com.zheng.cms.rpc.api.CmsArticleService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class CmsArticleServiceImpl extends BaseServiceImpl implements CmsArticleService { private static Logger _log = LoggerFactory.getLogger(CmsArticleServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java index f89e11876daf5b225e70ecac142acf4ae3ec4a48..366dce84116d1e6aff2abc2d034187b834586af4 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java @@ -4,6 +4,7 @@ import com.zheng.cms.dao.mapper.CmsCategoryMapper; import com.zheng.cms.dao.model.CmsCategory; import com.zheng.cms.dao.model.CmsCategoryExample; import com.zheng.cms.rpc.api.CmsCategoryService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class CmsCategoryServiceImpl extends BaseServiceImpl implements CmsCategoryService { private static Logger _log = LoggerFactory.getLogger(CmsCategoryServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java index 8bfa479fd2faa8d45a25f5dacc4582acec5bbc35..11df4ddc50ffabe5434c7d2671aa169a02b34d2e 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java @@ -4,6 +4,7 @@ import com.zheng.cms.dao.mapper.CmsCommentMapper; import com.zheng.cms.dao.model.CmsComment; import com.zheng.cms.dao.model.CmsCommentExample; import com.zheng.cms.rpc.api.CmsCommentService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class CmsCommentServiceImpl extends BaseServiceImpl implements CmsCommentService { private static Logger _log = LoggerFactory.getLogger(CmsCommentServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java index 8f77b662d03750d60f80e2a75b52a84b014f517b..197026a48fd098360254cffe5f5a16ada689e201 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java @@ -4,6 +4,7 @@ import com.zheng.cms.dao.mapper.CmsPageMapper; import com.zheng.cms.dao.model.CmsPage; import com.zheng.cms.dao.model.CmsPageExample; import com.zheng.cms.rpc.api.CmsPageService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class CmsPageServiceImpl extends BaseServiceImpl implements CmsPageService { private static Logger _log = LoggerFactory.getLogger(CmsPageServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java index a4613e565293e926c5d0b097cf9e74349cd54ab9..d13fae3bfc00eeadc441cb9a58fde8b156a922f1 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java @@ -4,6 +4,7 @@ import com.zheng.cms.dao.mapper.CmsSettingMapper; import com.zheng.cms.dao.model.CmsSetting; import com.zheng.cms.dao.model.CmsSettingExample; import com.zheng.cms.rpc.api.CmsSettingService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class CmsSettingServiceImpl extends BaseServiceImpl implements CmsSettingService { private static Logger _log = LoggerFactory.getLogger(CmsSettingServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java index 5c1c90fe2ce50fb5016bd1def295488b5e33b029..617a9a332ca1a37cfb337a9b8b6290e668575e6c 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java @@ -4,6 +4,7 @@ import com.zheng.cms.dao.mapper.CmsTagMapper; import com.zheng.cms.dao.model.CmsTag; import com.zheng.cms.dao.model.CmsTagExample; import com.zheng.cms.rpc.api.CmsTagService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class CmsTagServiceImpl extends BaseServiceImpl implements CmsTagService { private static Logger _log = LoggerFactory.getLogger(CmsTagServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java index f405f3211b09abda5655f061da6cc8dfea1688cc..d0b32750cdecadba152f21931ac4adcb558cc0f6 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java @@ -6,6 +6,7 @@ import com.zheng.cms.dao.model.CmsUser; import com.zheng.cms.dao.model.CmsUserExample; import com.zheng.cms.dao.model.UserVO; import com.zheng.cms.rpc.api.UserService; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class UserServiceImpl extends BaseServiceImpl implements UserService { private static Logger _log = LoggerFactory.getLogger(UserServiceImpl.class); diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/listener/ApplicationContextListener.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/listener/ApplicationContextListener.java deleted file mode 100644 index b771ed200e054240fd10b1bcefa54990b937619b..0000000000000000000000000000000000000000 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/listener/ApplicationContextListener.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zheng.cms.rpc.service.listener; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Service; - -import java.lang.reflect.Method; -import java.util.Map; - -/** - * spring容器初始化完成事件 - * Created by shuzheng on 2017/1/7. - */ -public class ApplicationContextListener implements ApplicationListener { - - private static Logger _log = LoggerFactory.getLogger(ApplicationContextListener.class); - - @Override - public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) { - // root application context - if (null == contextRefreshedEvent.getApplicationContext().getParent()) { - _log.info(">>>>> spring初始化完毕 <<<<<"); - // spring初始化完毕后，通过反射调用所有service的initMapper方法 - Map services = contextRefreshedEvent.getApplicationContext().getBeansWithAnnotation(Service.class); - _log.info("===== 开始初始化service的initMapper方法 ====="); - for (Object service : services.values()) { - _log.info(">>>>> {}.initMapper()", service.getClass().getName()); - try { - Method initMapper = service.getClass().getMethod("initMapper"); - initMapper.invoke(service); - } catch (Exception e) { - _log.error("初始化service的initMapper方法异常", e); - e.printStackTrace(); - } - } - _log.info("===== 完成初始化service的initMapper方法 ====="); - } - } - -} diff --git a/zheng-common/src/main/java/com/zheng/common/annotation/BaseService.java b/zheng-common/src/main/java/com/zheng/common/annotation/BaseService.java new file mode 100644 index 0000000000000000000000000000000000000000..7292d49a3f43424f2b3f6d77a77f769b6581a511 --- /dev/null +++ b/zheng-common/src/main/java/com/zheng/common/annotation/BaseService.java @@ -0,0 +1,13 @@ +package com.zheng.common.annotation; + +import java.lang.annotation.*; + +/** + * 初始化继承BaseService的service + * Created by shuzheng on 2017/2/11. + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface BaseService { +} diff --git a/zheng-common/src/main/java/com/zheng/common/base/BaseService.java b/zheng-common/src/main/java/com/zheng/common/base/BaseService.java index a0eed814d21ea7fc5339d4a2322b8b62bb5a0c8f..2969c38fb0504085d30e6d129f18a06661112a0e 100644 --- a/zheng-common/src/main/java/com/zheng/common/base/BaseService.java +++ b/zheng-common/src/main/java/com/zheng/common/base/BaseService.java @@ -42,8 +42,6 @@ public interface BaseService { int deleteByPrimaryKeys(String ids); - //void initMapper(Class clazz); - void initMapper(); } \ No newline at end of file diff --git a/zheng-common/src/main/java/com/zheng/common/base/BaseServiceImpl.java b/zheng-common/src/main/java/com/zheng/common/base/BaseServiceImpl.java index 62826bbf41b39e92881a5511ad4fabfd83d0806f..cf00f9f173f43506c5cc472d4b9d15e181116945 100644 --- a/zheng-common/src/main/java/com/zheng/common/base/BaseServiceImpl.java +++ b/zheng-common/src/main/java/com/zheng/common/base/BaseServiceImpl.java @@ -240,11 +240,6 @@ public abstract class BaseServiceImpl implements BaseSe return 0; } -// @Override -// public void initMapper(Class clazz) { -// this.mapper = (Mapper) SpringContextUtil.getBean(clazz); -// } - @Override public void initMapper() { this.mapper = SpringContextUtil.getBean(getMapperClass()); diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/listener/ApplicationContextListener.java b/zheng-common/src/main/java/com/zheng/common/listener/ApplicationContextListener.java similarity index 81% rename from zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/listener/ApplicationContextListener.java rename to zheng-common/src/main/java/com/zheng/common/listener/ApplicationContextListener.java index 4c8b2db48177f732a6235de5d22867c57ad8ea2d..8c921a4925459cd9a18b0e5fa8aa9c3a02e4301e 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/listener/ApplicationContextListener.java +++ b/zheng-common/src/main/java/com/zheng/common/listener/ApplicationContextListener.java @@ -1,10 +1,10 @@ -package com.zheng.upms.rpc.service.listener; +package com.zheng.common.listener; +import com.zheng.common.annotation.BaseService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Service; import java.lang.reflect.Method; import java.util.Map; @@ -23,8 +23,7 @@ public class ApplicationContextListener implements ApplicationListener>>>> spring初始化完毕 <<<<<"); // spring初始化完毕后，通过反射调用所有service的initMapper方法 - Map services = contextRefreshedEvent.getApplicationContext().getBeansWithAnnotation(Service.class); - _log.info("===== 开始初始化service的initMapper方法 ====="); + Map services = contextRefreshedEvent.getApplicationContext().getBeansWithAnnotation(BaseService.class); for(Object service : services.values()) { _log.info(">>>>> {}.initMapper()", service.getClass().getName()); try { @@ -35,7 +34,6 @@ public class ApplicationContextListener implements ApplicationListener - + \ No newline at end of file diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsOrganizationServiceImpl.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsOrganizationServiceImpl.java index 22c22e988926edbab90e8789302d9e90e745c29e..f5c98bdf17f6550910b29aacbea4af5734b018b3 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsOrganizationServiceImpl.java +++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsOrganizationServiceImpl.java @@ -1,5 +1,6 @@ package com.zheng.upms.rpc.service.impl; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import com.zheng.upms.dao.mapper.UpmsOrganizationMapper; import com.zheng.upms.dao.model.UpmsOrganization; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class UpmsOrganizationServiceImpl extends BaseServiceImpl implements UpmsOrganizationService { private static Logger _log = LoggerFactory.getLogger(UpmsOrganizationServiceImpl.class); diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsPermissionServiceImpl.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsPermissionServiceImpl.java index b9b6e73fec3dda73c23233cf1b411f817fed41a1..e148a14c849daaa5d9504c162daa4967e57aa604 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsPermissionServiceImpl.java +++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsPermissionServiceImpl.java @@ -1,5 +1,6 @@ package com.zheng.upms.rpc.service.impl; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import com.zheng.upms.dao.mapper.UpmsPermissionMapper; import com.zheng.upms.dao.model.UpmsPermission; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class UpmsPermissionServiceImpl extends BaseServiceImpl implements UpmsPermissionService { private static Logger _log = LoggerFactory.getLogger(UpmsPermissionServiceImpl.class); diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsRoleServiceImpl.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsRoleServiceImpl.java index b9864b8d051d11406a4b7dd47cb22ea60349ef2b..2c263cbc7fce725b97d5254143be0c13b826509b 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsRoleServiceImpl.java +++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsRoleServiceImpl.java @@ -1,5 +1,6 @@ package com.zheng.upms.rpc.service.impl; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import com.zheng.upms.dao.mapper.UpmsRoleMapper; import com.zheng.upms.dao.model.UpmsRole; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class UpmsRoleServiceImpl extends BaseServiceImpl implements UpmsRoleService { private static Logger _log = LoggerFactory.getLogger(UpmsRoleServiceImpl.class); diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsSystemServiceImpl.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsSystemServiceImpl.java index b42817b312eb12969bc464b9b85f89cf364c098c..528b7eebf5661b11c2f00b8b4a32bc4d25ede93d 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsSystemServiceImpl.java +++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsSystemServiceImpl.java @@ -1,5 +1,6 @@ package com.zheng.upms.rpc.service.impl; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import com.zheng.upms.dao.mapper.UpmsSystemMapper; import com.zheng.upms.dao.model.UpmsSystem; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class UpmsSystemServiceImpl extends BaseServiceImpl implements UpmsSystemService { private static Logger _log = LoggerFactory.getLogger(UpmsSystemServiceImpl.class); diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java index 4255a84b513c8cc460ff3559f4a8f999335b61bd..b4ecc2c4a04adc887880949beba7c567de03e64b 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java +++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java @@ -1,5 +1,6 @@ package com.zheng.upms.rpc.service.impl; +import com.zheng.common.annotation.BaseService; import com.zheng.common.base.BaseServiceImpl; import com.zheng.upms.dao.mapper.UpmsUserMapper; import com.zheng.upms.dao.model.UpmsUser; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional +@BaseService public class UpmsUserServiceImpl extends BaseServiceImpl implements UpmsUserService { private static Logger _log = LoggerFactory.getLogger(UpmsUserServiceImpl.class); diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/applicationContext-listener.xml b/zheng-upms/zheng-upms-rpc-service/src/main/resources/applicationContext-listener.xml deleted file mode 100644 index 90c11bd6e27f8efdf8950706c22ca4b75456922a..0000000000000000000000000000000000000000 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/applicationContext-listener.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file