v2.0.0初始化

jeesns-service/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.lxinet</groupId>
             <artifactId>jeesns-core</artifactId>
-            <version>1.4.2</version>
+            <version>2.0.0</version>
         </dependency>
 
         <dependency>

jeesns-service/src/main/java/com/lxinet/jeesns/service/cms/ArticleCateService.java

@@ -2,7 +2,7 @@ package com.lxinet.jeesns.service.cms;
 
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.exception.ParamException;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.cms.IArticleCateDao;
 import com.lxinet.jeesns.model.cms.ArticleCate;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import java.util.List;
  * Created by zchuanzhao on 16/9/29.
  */
 @Service("articleCateService")
-public class ArticleCateService extends BaseServiceImpl<ArticleCate> {
+public class ArticleCateService extends BaseService<ArticleCate> {
 
     @Resource
     private IArticleCateDao articleCateDao;

jeesns-service/src/main/java/com/lxinet/jeesns/service/cms/ArticleCommentService.java

 package com.lxinet.jeesns.service.cms;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.core.utils.ValidUtill;
 import com.lxinet.jeesns.core.consts.AppTag;
 import com.lxinet.jeesns.core.enums.MessageType;
@@ -27,7 +27,7 @@ import java.util.List;
  * Created by zchuanzhao on 2016/10/14.
  */
 @Service("articleCommentService")
-public class ArticleCommentService extends BaseServiceImpl<ArticleComment> {
+public class ArticleCommentService extends BaseService<ArticleComment> {
     @Resource
     private IArticleCommentDao articleCommentDao;
     @Resource

jeesns-service/src/main/java/com/lxinet/jeesns/service/cms/ArticleFavorService.java

 package com.lxinet.jeesns.service.cms;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.cms.IArticleFavorDao;
 import com.lxinet.jeesns.model.cms.ArticleFavor;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import javax.annotation.Resource;
  * Created by zchuanzhao on 2017/2/9.
  */
 @Service("articleFavorService")
-public class ArticleFavorService extends BaseServiceImpl<ArticleFavor> {
+public class ArticleFavorService extends BaseService<ArticleFavor> {
     @Resource
     private IArticleFavorDao articleFavorDao;
 

jeesns-service/src/main/java/com/lxinet/jeesns/service/cms/ArticleService.java

@@ -4,11 +4,11 @@ import com.lxinet.jeesns.core.consts.AppTag;
 import com.lxinet.jeesns.core.enums.MessageType;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.exception.ParamException;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.cms.IArticleDao;
 import com.lxinet.jeesns.model.cms.Article;
 import com.lxinet.jeesns.model.member.Member;
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.model.Page;
 import com.lxinet.jeesns.core.utils.*;
 import com.lxinet.jeesns.service.member.MemberService;
@@ -30,7 +30,7 @@ import java.util.Map;
  * Created by zchuanzhao on 2016/10/14.
  */
 @Service("articleService")
-public class ArticleService extends BaseServiceImpl<Article> {
+public class ArticleService extends BaseService<Article> {
     @Resource
     private IArticleDao articleDao;
     @Resource
@@ -112,12 +112,12 @@ public class ArticleService extends BaseServiceImpl<Article> {
         return true;
     }
 
-    public ResultModel listByPage(Page page, String key, int cateid, int status, int memberId) {
+    public Result listByPage(Page page, String key, int cateid, int status, int memberId) {
         if (StringUtils.isNotBlank(key)){
             key = "%"+key+"%";
         }
         List<Article> list = articleDao.list(page, key,cateid,status,memberId);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }
@@ -141,12 +141,12 @@ public class ArticleService extends BaseServiceImpl<Article> {
         return true;
     }
 
-    public ResultModel favor(Member loginMember, int articleId) {
+    public Result favor(Member loginMember, int articleId) {
         Article article = this.findById(articleId);
         ValidUtill.checkIsNull(article, "文章不存在");
         int favor = article.getFavor();
         String message;
-        ResultModel<Integer> resultModel;
+        Result<Integer> result;
         if(articleFavorService.find(articleId,loginMember.getId()) == null){
             //增加
             articleDao.favor(articleId,1);
@@ -166,9 +166,9 @@ public class ArticleService extends BaseServiceImpl<Article> {
             //取消喜欢，扣除积分
             scoreDetailService.scoreCancelBonus(loginMember.getId(),ScoreRuleConsts.ARTICLE_RECEIVED_LIKE, articleId);
         }
-        resultModel = new ResultModel(0,message);
-        resultModel.setData(favor);
-        return resultModel;
+        result = new Result(0,message);
+        result.setData(favor);
+        return result;
     }
 
     public List<Article> listByCustom(int cid, String sort, int num, int day,int thumbnail) {

jeesns-service/src/main/java/com/lxinet/jeesns/service/common/AdsService.java

 package com.lxinet.jeesns.service.common;
 
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.model.Page;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.common.IAdsDao;
 import com.lxinet.jeesns.model.common.Ads;
 import org.springframework.stereotype.Service;
@@ -15,13 +15,13 @@ import java.util.List;
  * Created by zchuanzhao on 2017/9/07.
  */
 @Service("adsService")
-public class AdsService extends BaseServiceImpl<Ads> {
+public class AdsService extends BaseService<Ads> {
     @Resource
     private IAdsDao adsDao;
 
-    public ResultModel listByPage(Page page) {
+    public Result listByPage(Page page) {
         List<Ads> list = adsDao.list(page);
-        ResultModel model = new ResultModel(0, page);
+        Result model = new Result(0, page);
         model.setData(list);
         return model;
     }

jeesns-service/src/main/java/com/lxinet/jeesns/service/common/ArchiveService.java

@@ -2,7 +2,7 @@ package com.lxinet.jeesns.service.common;
 
 import com.lxinet.jeesns.dao.common.IArchiveDao;
 import com.lxinet.jeesns.model.common.Archive;
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.utils.HtmlUtil;
 import com.lxinet.jeesns.core.utils.StringUtils;
 import com.lxinet.jeesns.model.member.Member;
@@ -59,25 +59,25 @@ public class ArchiveService {
     }
 
     @Transactional
-    public ResultModel favor(Member loginMember, int archiveId) {
+    public Result favor(Member loginMember, int archiveId) {
         String message;
-        ResultModel<Integer> resultModel;
+        Result<Integer> result;
         if(archiveFavorService.find(archiveId,loginMember.getId()) == null){
             //增加
             archiveDao.favor(archiveId,1);
             archiveFavorService.save(archiveId,loginMember.getId());
             message = "喜欢成功";
-            resultModel = new ResultModel(0,message);
+            result = new Result(0,message);
         }else {
             //减少
             archiveDao.favor(archiveId,-1);
             archiveFavorService.delete(archiveId,loginMember.getId());
             message = "取消喜欢成功";
-            resultModel = new ResultModel(1,message);
+            result = new Result(1,message);
         }
         Archive findArchive = this.findByArchiveId(archiveId);
-        resultModel.setData(findArchive.getFavor());
-        return resultModel;
+        result.setData(findArchive.getFavor());
+        return result;
     }
 
     public boolean update(Member member, Archive archive) {

jeesns-service/src/main/java/com/lxinet/jeesns/service/common/LinkService.java

 package com.lxinet.jeesns.service.common;
 
 import com.lxinet.jeesns.core.conditions.SqlWrapper;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.service.BaseService;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.model.Page;
 import com.lxinet.jeesns.dao.common.ILinkDao;
 import com.lxinet.jeesns.model.common.Link;
@@ -14,27 +14,27 @@ import java.util.List;
  * Created by zchuanzhao on 2017-10-13.
  */
 @Service("linkService")
-public class LinkService extends BaseServiceImpl<Link> {
+public class LinkService extends BaseService<Link> {
     @Resource
     private ILinkDao linkDao;
 
-    public ResultModel listByPage(Page page) {
+    public Result listByPage(Page page) {
         List<Link> list = linkDao.list(page);
-        ResultModel model = new ResultModel(0, page);
+        Result model = new Result(0, page);
         model.setData(list);
         return model;
     }
 
-    public ResultModel allList() {
+    public Result allList() {
         List<Link> list = linkDao.listAll(new SqlWrapper<>(Link.class));
-        ResultModel model = new ResultModel(0);
+        Result model = new Result(0);
         model.setData(list);
         return model;
     }
 
-    public ResultModel recommentList() {
+    public Result recommentList() {
         List<Link> list = linkDao.recommentList();
-        ResultModel model = new ResultModel(0);
+        Result model = new Result(0);
         model.setData(list);
         return model;
     }

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupFansService.java

 package com.lxinet.jeesns.service.group;
 
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.model.Page;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.model.group.Group;
 import com.lxinet.jeesns.model.group.GroupFans;
 import com.lxinet.jeesns.model.member.Member;
@@ -18,13 +18,13 @@ import java.util.List;
  * Created by zchuanzhao on 2016/12/26.
  */
 @Service("groupFansService")
-public class GroupFansService extends BaseServiceImpl<GroupFans> {
+public class GroupFansService extends BaseService<GroupFans> {
     @Resource
     private IGroupFansDao groupFansDao;
 
-    public ResultModel listByPage(Page page, Integer groupId) {
+    public Result listByPage(Page page, Integer groupId) {
         List<GroupFans> list = groupFansDao.list(page, groupId);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }
@@ -57,9 +57,9 @@ public class GroupFansService extends BaseServiceImpl<GroupFans> {
     }
 
 
-    public ResultModel listByMember(Page page, Integer memberId) {
+    public Result listByMember(Page page, Integer memberId) {
         List<Group> list = groupFansDao.listByMember(page, memberId);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupService.java

 package com.lxinet.jeesns.service.group;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.core.utils.ValidUtill;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.utils.*;
@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @Service("groupService")
 @Transactional
-public class GroupService extends BaseServiceImpl<Group> {
+public class GroupService extends BaseService<Group> {
     @Resource
     private IGroupDao groupDao;
     @Resource

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupTopicCommentService.java

 package com.lxinet.jeesns.service.group;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.core.utils.ValidUtill;
 import com.lxinet.jeesns.core.consts.AppTag;
 import com.lxinet.jeesns.core.enums.MessageType;
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.model.Page;
 import com.lxinet.jeesns.model.group.GroupTopic;
 import com.lxinet.jeesns.model.group.GroupTopicComment;
@@ -24,7 +24,7 @@ import java.util.List;
  * Created by zchuanzhao on 2016/12/27.
  */
 @Service("groupTopicCommentService")
-public class GroupTopicCommentService extends BaseServiceImpl<GroupTopicComment> {
+public class GroupTopicCommentService extends BaseService<GroupTopicComment> {
     @Resource
     private IGroupTopicCommentDao groupTopicCommentDao;
     @Resource
@@ -68,10 +68,10 @@ public class GroupTopicCommentService extends BaseServiceImpl<GroupTopicComment>
         return result == 1;
     }
 
-    public ResultModel listByGroupTopic(Page page, int groupTopicId) {
+    public Result listByGroupTopic(Page page, int groupTopicId) {
         List<GroupTopicComment> list = groupTopicCommentDao.listByGroupTopic(page, groupTopicId);
         this.atFormat(list);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupTopicFavorService.java

 package com.lxinet.jeesns.service.group;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.group.IGroupTopicFavorDao;
 import com.lxinet.jeesns.model.group.GroupTopicFavor;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import javax.annotation.Resource;
  * Created by zchuanzhao on 2017/2/9.
  */
 @Service("groupTopicFavorService")
-public class GroupTopicFavorService extends BaseServiceImpl<GroupTopicFavor> {
+public class GroupTopicFavorService extends BaseService<GroupTopicFavor> {
     @Resource
     private IGroupTopicFavorDao groupTopicFavorDao;
 

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupTopicService.java

 package com.lxinet.jeesns.service.group;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.core.utils.HtmlUtil;
 import com.lxinet.jeesns.service.member.MemberService;
 import com.lxinet.jeesns.service.member.MessageService;
@@ -12,7 +12,7 @@ import com.lxinet.jeesns.utils.ScoreRuleConsts;
 import com.lxinet.jeesns.core.utils.ValidUtill;
 import com.lxinet.jeesns.core.consts.AppTag;
 import com.lxinet.jeesns.core.enums.MessageType;
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.exception.ParamException;
 import com.lxinet.jeesns.core.model.Page;
@@ -34,7 +34,7 @@ import java.util.List;
  * Created by zchuanzhao on 2016/12/26.
  */
 @Service("groupTopicService")
-public class GroupTopicService extends BaseServiceImpl<GroupTopic> {
+public class GroupTopicService extends BaseService<GroupTopic> {
     @Resource
     private IGroupTopicDao groupTopicDao;
     @Resource
@@ -90,12 +90,12 @@ public class GroupTopicService extends BaseServiceImpl<GroupTopic> {
         return result == 1;
     }
 
-    public ResultModel listByPage(Page page, String key, int groupId, int status, int memberId, int typeId) {
+    public Result listByPage(Page page, String key, int groupId, int status, int memberId, int typeId) {
         if (StringUtils.isNotBlank(key)){
             key = "%"+key+"%";
         }
         List<GroupTopic> list = groupTopicDao.list(page, key,groupId,status,memberId,typeId);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }
@@ -264,12 +264,12 @@ public class GroupTopicService extends BaseServiceImpl<GroupTopic> {
     }
 
 
-    public ResultModel favor(Member loginMember, int id) {
+    public Result favor(Member loginMember, int id) {
         GroupTopic groupTopic = this.findById(id);
         ValidUtill.checkIsNull(groupTopic, "帖子不存在");
         int favor = groupTopic.getFavor();
         String message;
-        ResultModel<Integer> resultModel;
+        Result<Integer> result;
         if(groupTopicFavorService.find(id,loginMember.getId()) == null){
             //增加
             groupTopicDao.favor(id,1);
@@ -291,9 +291,9 @@ public class GroupTopicService extends BaseServiceImpl<GroupTopic> {
             //扣除积分
             scoreDetailService.scoreCancelBonus(loginMember.getId(),ScoreRuleConsts.GROUP_TOPIC_RECEIVED_LIKE, id);
         }
-        resultModel = new ResultModel(0,message);
-        resultModel.setData(favor);
-        return resultModel;
+        result = new Result(0,message);
+        result.setData(favor);
+        return result;
     }
 
     public List<GroupTopic> listByCustom(int gid, String sort, int num, int day,int thumbnail) {

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupTopicTypeService.java

 package com.lxinet.jeesns.service.group;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.group.IGroupTopicTypeDao;
 import com.lxinet.jeesns.model.group.GroupTopicType;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2018/5/9 下午1:17
  */
 @Service
-public class GroupTopicTypeService extends BaseServiceImpl<GroupTopicType> {
+public class GroupTopicTypeService extends BaseService<GroupTopicType> {
     @Resource
     private IGroupTopicTypeDao groupTopicTypeDao;
 

jeesns-service/src/main/java/com/lxinet/jeesns/service/group/GroupTypeService.java

 package com.lxinet.jeesns.service.group;
 
 import com.lxinet.jeesns.core.exception.OpeErrorException;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.group.IGroupTypeDao;
 import com.lxinet.jeesns.model.group.GroupType;
 import org.springframework.stereotype.Service;
@@ -14,7 +14,7 @@ import java.util.List;
  * @date: 2018/5/15 下午1:17
  */
 @Service
-public class GroupTypeService extends BaseServiceImpl<GroupType> {
+public class GroupTypeService extends BaseService<GroupType> {
     @Resource
     private IGroupTypeDao groupTypeDao;
 

jeesns-service/src/main/java/com/lxinet/jeesns/service/member/CheckinService.java

 package com.lxinet.jeesns.service.member;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.utils.ScoreRuleConsts;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.model.Page;
@@ -17,7 +17,7 @@ import java.util.List;
  * Created by zchuanzhao on 18/8/20.
  */
 @Service
-public class CheckinService extends BaseServiceImpl<Checkin> {
+public class CheckinService extends BaseService<Checkin> {
     @Resource
     private ICheckinDao checkinDao;
     @Resource

jeesns-service/src/main/java/com/lxinet/jeesns/service/member/FinancialService.java

 package com.lxinet.jeesns.service.member;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.core.utils.PageUtil;
 import com.lxinet.jeesns.dao.member.IFinancialDao;
 import com.lxinet.jeesns.model.member.Financial;
@@ -12,7 +12,7 @@ import java.util.List;
  * Created by zchuanzhao on 2018/11/28.
  */
 @Service
-public class FinancialService extends BaseServiceImpl<Financial> {
+public class FinancialService extends BaseService<Financial> {
     @Resource
     private IFinancialDao financialDao;
 

jeesns-service/src/main/java/com/lxinet/jeesns/service/member/MemberFansService.java

 package com.lxinet.jeesns.service.member;
 
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.model.Page;
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.member.IMemberFansDao;
 import com.lxinet.jeesns.model.member.MemberFans;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import java.util.List;
  * Created by zchuanzhao on 2017/2/21.
  */
 @Service("memberFansServiceImpl")
-public class MemberFansService extends BaseServiceImpl<MemberFans> {
+public class MemberFansService extends BaseService<MemberFans> {
     @Resource
     private IMemberFansDao memberFansDao;
 
@@ -40,16 +40,16 @@ public class MemberFansService extends BaseServiceImpl<MemberFans> {
         return memberFansDao.delete(whoFollowId,followWhoId) > 0;
     }
 
-    public ResultModel followsList(Page page, Integer whoFollowId) {
+    public Result followsList(Page page, Integer whoFollowId) {
         List<MemberFans> list = memberFansDao.followsList(page, whoFollowId);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }
 
-    public ResultModel fansList(Page page, Integer followWhoId) {
+    public Result fansList(Page page, Integer followWhoId) {
         List<MemberFans> list = memberFansDao.fansList(page, followWhoId);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }

jeesns-service/src/main/java/com/lxinet/jeesns/service/member/MemberService.java

 package com.lxinet.jeesns.service.member;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.service.system.ActionLogService;
 import com.lxinet.jeesns.service.system.ConfigService;
 import com.lxinet.jeesns.utils.MemberUtil;
-import com.lxinet.jeesns.core.dto.ResultModel;
+import com.lxinet.jeesns.core.dto.Result;
 import com.lxinet.jeesns.core.exception.NotLoginException;
 import com.lxinet.jeesns.core.exception.OpeErrorException;
 import com.lxinet.jeesns.core.model.Page;
@@ -31,7 +31,7 @@ import java.util.Map;
  * Created by zchuanzhao on 16/9/29.
  */
 @Service("memberService")
-public class MemberService extends BaseServiceImpl<Member> {
+public class MemberService extends BaseService<Member> {
     @Resource
     private IMemberDao memberDao;
     @Resource
@@ -92,7 +92,7 @@ public class MemberService extends BaseServiceImpl<Member> {
     }
 
     @Transactional
-    public ResultModel register(Member member, HttpServletRequest request) {
+    public Result register(Member member, HttpServletRequest request) {
         if(memberDao.findByName(member.getName()) != null){
             throw new OpeErrorException("用户名已存在");
         }
@@ -147,73 +147,73 @@ public class MemberService extends BaseServiceImpl<Member> {
                 }
 
             }
-            return new ResultModel(2,"注册成功",request.getServletContext().getContextPath()+"/member/login");
+            return new Result(2,"注册成功",request.getServletContext().getContextPath()+"/member/login");
         }
-        return new ResultModel(-1,"注册失败");
+        return new Result(-1,"注册失败");
     }
 
 
-    public ResultModel delete(int id) {
+    public Result delete(int id) {
         if(super.deleteById(id)){
-            return new ResultModel(1,"删除成功");
+            return new Result(1,"删除成功");
         }
-        return new ResultModel(-1,"删除失败");
+        return new Result(-1,"删除失败");
     }
 
-    public ResultModel<Member> listByPage(Page page, String key) {
+    public Result<Member> listByPage(Page page, String key) {
         if (StringUtils.isNotBlank(key)){
             key = "%"+key.trim()+"%";
         }
         List<Member> list = memberDao.list(page, key);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }
 
-    public ResultModel<Member> managerList(Page page, String key) {
+    public Result<Member> managerList(Page page, String key) {
         if (StringUtils.isNotBlank(key)){
             key = "%"+key.trim()+"%";
         }
         List<Member> list = memberDao.managerList(page, key);
-        ResultModel model = new ResultModel(0,page);
+        Result model = new Result(0,page);
         model.setData(list);
         return model;
     }
 
-    public ResultModel managerAdd(Member loginMember, String name) {
+    public Result managerAdd(Member loginMember, String name) {
         int isAdmin = 1;
         Member findMember = this.findByName(name);
         if(findMember == null){
-            return new ResultModel(-1,"会员["+name+"]不存在");
+            return new Result(-1,"会员["+name+"]不存在");
         }
         //为了旧系统升级使用
         if(findMember.getId() == 1 && findMember.getIsAdmin() == 1){
             isAdmin = 2;
         }
         if(isAdmin == 1 && loginMember.getId().intValue() == findMember.getId().intValue()){
-            return new ResultModel(-1,"不能操作自己的账号");
+            return new Result(-1,"不能操作自己的账号");
         }
         if(isAdmin != 2 && findMember.getIsAdmin() > 0){
-            return new ResultModel(-1,"会员["+name+"]已经是管理员，无需再授权");
+            return new Result(-1,"会员["+name+"]已经是管理员，无需再授权");
         }
         //管理员只能对授权为普通管理员
         memberDao.managerAddAndCancel(isAdmin,findMember.getId());
         if(isAdmin == 2){
             loginMember.setIsAdmin(isAdmin);
         }
-        return new ResultModel(3,"操作成功");
+        return new Result(3,"操作成功");
     }
 
-    public ResultModel managerCancel(Member loginMember, int id) {
+    public Result managerCancel(Member loginMember, int id) {
         Member findMember = this.findById(id);
         if(loginMember.getId().intValue() == findMember.getId().intValue()){
-            return new ResultModel(-1,"不能操作自己的账号");
+            return new Result(-1,"不能操作自己的账号");
         }
         if(findMember == null){
-            return new ResultModel(-1,"会员不存在");
+            return new Result(-1,"会员不存在");
         }
         memberDao.managerAddAndCancel(0,findMember.getId());
-        return new ResultModel(1,"操作成功");
+        return new Result(1,"操作成功");
     }
 
 
@@ -222,11 +222,11 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param id
      * @return
      */
-    public ResultModel isenable(int id) {
+    public Result isenable(int id) {
         if(memberDao.isenable(id) == 1){
-            return new ResultModel(1,"操作成功");
+            return new Result(1,"操作成功");
         }
-        return new ResultModel(-1,"操作失败");
+        return new Result(-1,"操作失败");
     }
 
     /**
@@ -235,19 +235,19 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param password
      * @return
      */
-    public ResultModel changepwd(Member loginMember, int id, String password) {
+    public Result changepwd(Member loginMember, int id, String password) {
         if(StringUtils.isBlank(password)){
             throw new OpeErrorException("密码不能为空");
         }
         if(password.length() < 6){
-            return new ResultModel(-1,"密码不能少于6个字符");
+            return new Result(-1,"密码不能少于6个字符");
         }
         password = Md5Util.getMD5Code(password);
         if(memberDao.changepwd(id,password) == 1){
             actionLogService.save(loginMember.getCurrLoginIp(),loginMember.getId(),ActionUtil.CHANGE_PWD);
-            return new ResultModel(3,"密码修改成功");
+            return new Result(3,"密码修改成功");
         }
-        return new ResultModel(-1,"密码修改失败");
+        return new Result(-1,"密码修改失败");
     }
 
     /**
@@ -257,17 +257,17 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param newPassword
      * @return
      */
-    public ResultModel changepwd(Member loginMember, String oldPassword, String newPassword) {
+    public Result changepwd(Member loginMember, String oldPassword, String newPassword) {
         if(StringUtils.isBlank(newPassword)){
             throw new OpeErrorException("密码不能为空");
         }
         if(newPassword.length() < 6){
-            return new ResultModel(-1,"密码不能少于6个字符");
+            return new Result(-1,"密码不能少于6个字符");
         }
         oldPassword = Md5Util.getMD5Code(oldPassword);
         Member member = super.findById(loginMember.getId());
         if(!oldPassword.equals(member.getPassword())){
-            return new ResultModel(-1,"旧密码错误");
+            return new Result(-1,"旧密码错误");
         }
         return this.changepwd(loginMember,member.getId(),newPassword);
     }
@@ -279,7 +279,7 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param request
      * @return
      */
-    public ResultModel updateAvatar(Member member, String oldAvatar, HttpServletRequest request) {
+    public Result updateAvatar(Member member, String oldAvatar, HttpServletRequest request) {
         int result = memberDao.updateAvatar(member.getId(),member.getAvatar());
         if(result == 1){
             if(StringUtils.isNotEmpty(oldAvatar) && !Const.DEFAULT_AVATAR.equals(oldAvatar)){
@@ -291,9 +291,9 @@ public class MemberService extends BaseServiceImpl<Member> {
                     file.delete();
                 }
             }
-            return new ResultModel(0,"头像修改成功");
+            return new Result(0,"头像修改成功");
         }
-        return new ResultModel(-1,"头像修改失败，请重试");
+        return new Result(-1,"头像修改失败，请重试");
     }
 
     /**
@@ -304,22 +304,22 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param introduce  个人说明
      * @return
      */
-    public ResultModel editBaseInfo(Member member, String name, String sex, String introduce) {
+    public Result editBaseInfo(Member member, String name, String sex, String introduce) {
         if(!StringUtils.checkNickname(member.getName())){
-            return new ResultModel(-1,"昵称只能由中文、字母、数字、下划线(_)或者短横线(-)组成");
+            return new Result(-1,"昵称只能由中文、字母、数字、下划线(_)或者短横线(-)组成");
         }
         if (name != null && !name.equals(member.getName())){
             if(this.findByName(name) != null){
-                return new ResultModel(-1,"昵称已被占用，请更换一个");
+                return new Result(-1,"昵称已被占用，请更换一个");
             }
         }
         member.setName(name);
         member.setSex(sex);
         member.setIntroduce(introduce);
         if(memberDao.editBaseInfo(member) == 1){
-            return new ResultModel(0,"修改成功");
+            return new Result(0,"修改成功");
         }
-        return new ResultModel(-1,"修改失败");
+        return new Result(-1,"修改失败");
     }
 
     /**
@@ -333,7 +333,7 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param website
      * @return
      */
-    public ResultModel editOtherInfo(Member loginMember, String birthday, String qq, String wechat, String contactPhone,
+    public Result editOtherInfo(Member loginMember, String birthday, String qq, String wechat, String contactPhone,
                                      String contactEmail, String website) {
         loginMember.setBirthday(birthday);
         loginMember.setQq(qq);
@@ -342,9 +342,9 @@ public class MemberService extends BaseServiceImpl<Member> {
         loginMember.setContactEmail(contactEmail);
         loginMember.setWebsite(website);
         if(memberDao.editOtherInfo(loginMember) == 1){
-            return new ResultModel(0,"修改成功");
+            return new Result(0,"修改成功");
         }
-        return new ResultModel(-1,"修改失败");
+        return new Result(-1,"修改失败");
     }
 
     public Member findByName(String name) {
@@ -359,31 +359,31 @@ public class MemberService extends BaseServiceImpl<Member> {
         return memberDao.findByPhone(phone);
     }
 
-    public ResultModel sendEmailActiveValidCode(Member loginMember, HttpServletRequest request) {
+    public Result sendEmailActiveValidCode(Member loginMember, HttpServletRequest request) {
         loginMember = this.findById(loginMember.getId());
         if(loginMember.getIsActive() == 1){
-            return new ResultModel(-1,"您的账号已经激活，无需重复激活");
+            return new Result(-1,"您的账号已经激活，无需重复激活");
         }
         String randomCode = RandomCodeUtil.randomCode6();
         ValidateCode validateCode = new ValidateCode(loginMember.getEmail(),randomCode,2);
         if(validateCodeService.save(validateCode)){
             if(EmailSendUtil.activeMember(request, loginMember.getEmail(),randomCode)){
-                return new ResultModel(0,"邮件发送成功");
+                return new Result(0,"邮件发送成功");
             }
         }
-        return new ResultModel(-1,"邮件发送失败，请重试");
+        return new Result(-1,"邮件发送失败，请重试");
     }
 
     @Transactional
-    public ResultModel active(Member loginMember, String randomCode, HttpServletRequest request) {
+    public Result active(Member loginMember, String randomCode, HttpServletRequest request) {
         try {
             loginMember = this.findById(loginMember.getId());
             if(loginMember.getIsActive() == 1){
-                return new ResultModel(-1,"您的账号已经激活，无需重复激活");
+                return new Result(-1,"您的账号已经激活，无需重复激活");
             }
             ValidateCode validateCode = validateCodeService.valid(loginMember.getEmail(),randomCode,2);
             if(validateCode == null){
-                return new ResultModel(-1,"验证码错误");
+                return new Result(-1,"验证码错误");
             }
 
             if(validateCodeService.used(validateCode.getId())){
@@ -392,13 +392,13 @@ public class MemberService extends BaseServiceImpl<Member> {
                     MemberUtil.setLoginMember(request,loginMember);
                     //邮箱认证奖励
                     scoreDetailService.scoreBonus(loginMember.getId(), ScoreRuleConsts.EMAIL_AUTHENTICATION);
-                    return new ResultModel(2,"激活成功，正在进入会员中心...",request.getContextPath()+"/member/");
+                    return new Result(2,"激活成功，正在进入会员中心...",request.getContextPath()+"/member/");
                 }
             }
-            return new ResultModel(-1,"激活失败，请重试");
+            return new Result(-1,"激活失败，请重试");
         }catch (Exception e){
             e.printStackTrace();
-            return new ResultModel(-1,"激活失败，请重试");
+            return new Result(-1,"激活失败，请重试");
         }
     }
 
@@ -406,75 +406,75 @@ public class MemberService extends BaseServiceImpl<Member> {
         return memberDao.findByNameAndEmail(name,email);
     }
 
-    public ResultModel forgetpwd(String name, String email, HttpServletRequest request) {
+    public Result forgetpwd(String name, String email, HttpServletRequest request) {
         Member member = this.findByNameAndEmail(name,email);
         if(member == null){
-            return new ResultModel(-1,"会员不存在");
+            return new Result(-1,"会员不存在");
         }
         String randomCode = RandomCodeUtil.uuid();
         ValidateCode validateCode = new ValidateCode(email,randomCode,1);
         if(validateCodeService.save(validateCode)){
             if(EmailSendUtil.forgetpwd(request, email,randomCode)){
-                return new ResultModel(0,"邮件发送成功");
+                return new Result(0,"邮件发送成功");
             }
         }
-        return new ResultModel(-1,"邮件发送失败，请重试");
+        return new Result(-1,"邮件发送失败，请重试");
     }
 
     @Transactional
-    public ResultModel resetpwd(String email, String token, String password, HttpServletRequest request) {
+    public Result resetpwd(String email, String token, String password, HttpServletRequest request) {
         Member member = memberDao.findByEmail(email);
         if(member == null){
-            return new ResultModel(-1,"会员不存在");
+            return new Result(-1,"会员不存在");
         }
         ValidateCode validateCode = validateCodeService.valid(email,token,1);
         if(validateCode == null){
-            return new ResultModel(-1,"验证码错误");
+            return new Result(-1,"验证码错误");
         }
         password = Md5Util.getMD5Code(password);
         if(memberDao.changepwd(member.getId(),password) == 1){
             validateCodeService.used(validateCode.getId());
             actionLogService.save(IpUtil.getIpAddress(request),member.getId(), ActionUtil.FIND_PWD);
-            return new ResultModel(2,"密码重置成功",request.getContextPath()+"/member/login");
+            return new Result(2,"密码重置成功",request.getContextPath()+"/member/login");
         }
-        return new ResultModel(-1,"密码重置失败");
+        return new Result(-1,"密码重置失败");
     }
 
     @Transactional
-    public ResultModel follows(Member loginMember, Integer followWhoId) {
+    public Result follows(Member loginMember, Integer followWhoId) {
         if(loginMember == null){
             throw new NotLoginException();
         }
         if(this.findById(followWhoId) == null){
-            return new ResultModel(-1,"关注的会员不存在");
+            return new Result(-1,"关注的会员不存在");
         }
         if(loginMember.getId().intValue() == followWhoId.intValue()){
-            return new ResultModel(-1,"不能关注自己");
+            return new Result(-1,"不能关注自己");
         }
         if(memberFansService.find(loginMember.getId(),followWhoId) == null){
             //关注
             memberFansService.save(loginMember.getId(),followWhoId);
             memberDao.follows(loginMember.getId());
             memberDao.fans(followWhoId);
-            return new ResultModel(1,"关注成功");
+            return new Result(1,"关注成功");
         }else {
             //取消关注
             memberFansService.delete(loginMember.getId(),followWhoId);
             memberDao.follows(loginMember.getId());
             memberDao.fans(followWhoId);
-            return new ResultModel(0,"取消关注成功");
+            return new Result(0,"取消关注成功");
         }
     }
 
-    public ResultModel isFollowed(Member loginMember, Integer followWhoId) {
+    public Result isFollowed(Member loginMember, Integer followWhoId) {
         int loginMemberId = 0;
         if(loginMember != null){
             loginMemberId = loginMember.getId().intValue();
         }
         if(memberFansService.find(loginMemberId,followWhoId) == null){
-            return new ResultModel(0,"未关注");
+            return new Result(0,"未关注");
         }else {
-            return new ResultModel(1,"已关注");
+            return new Result(1,"已关注");
         }
     }
 
@@ -490,7 +490,7 @@ public class MemberService extends BaseServiceImpl<Member> {
      * @param memberId
      * @return
      */
-    public ResultModel<Member> listContactMembers(Page page, Integer memberId) {
+    public Result<Member> listContactMembers(Page page, Integer memberId) {
         List<Member> memberIdList = this.listContactMemberIds(page,memberId);
         List<Member> list = new ArrayList<>();
         if(memberIdList.size() > 0){
@@ -509,7 +509,7 @@ public class MemberService extends BaseServiceImpl<Member> {
                 list = memberDao.listContactMembers(memberId, idList, idString);
             }
         }
-        ResultModel model = new ResultModel(0, page);
+        Result model = new Result(0, page);
         model.setData(list);
         return model;
     }

jeesns-service/src/main/java/com/lxinet/jeesns/service/member/MemberTokenService.java

 package com.lxinet.jeesns.service.member;
 
-import com.lxinet.jeesns.core.service.impl.BaseServiceImpl;
+import com.lxinet.jeesns.core.service.BaseService;
 import com.lxinet.jeesns.dao.member.IMemberTokenDao;
 import com.lxinet.jeesns.model.member.MemberToken;
 import org.springframework.stereotype.Service;
@@ -12,7 +12,7 @@ import java.util.Date;
  * Created by zchuanzhao on 16/9/29.
  */
 @Service("memberTokenService")
-public class MemberTokenService extends BaseServiceImpl<MemberToken>{
+public class MemberTokenService extends BaseService<MemberToken>{
     @Resource
     private IMemberTokenDao memberTokenDao;