Commit d126e9e5 d126e9e5de92957b929e13f9a93eafb33e2e4e5f by xianghan@topdraw.cn

1.修改coron-core依赖版本

1 parent e8085c67
Showing 27 changed files with 32 additions and 26 deletions
...@@ -40,6 +40,11 @@ ...@@ -40,6 +40,11 @@
40 <artifactId>cronos-generator</artifactId> 40 <artifactId>cronos-generator</artifactId>
41 <version>1.1.0</version> 41 <version>1.1.0</version>
42 </dependency> 42 </dependency>
43 <dependency>
44 <groupId>com.topdraw</groupId>
45 <artifactId>cronos-system</artifactId>
46 <version>1.1.0</version>
47 </dependency>
43 48
44 <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 --> 49 <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 -->
45 <dependency> 50 <dependency>
......
1 package com.topdraw.business.basicdata.coupon.history.rest; 1 package com.topdraw.business.basicdata.coupon.history.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory; 5 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
6 import com.topdraw.business.basicdata.coupon.history.service.CouponHistoryService; 6 import com.topdraw.business.basicdata.coupon.history.service.CouponHistoryService;
7 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria; 7 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria;
......
1 package com.topdraw.business.basicdata.coupon.rest; 1 package com.topdraw.business.basicdata.coupon.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.coupon.domain.Coupon; 5 import com.topdraw.business.basicdata.coupon.domain.Coupon;
6 import com.topdraw.business.basicdata.coupon.service.CouponService; 6 import com.topdraw.business.basicdata.coupon.service.CouponService;
7 import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria; 7 import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria;
......
1 package com.topdraw.business.basicdata.exp.detail.rest; 1 package com.topdraw.business.basicdata.exp.detail.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail; 5 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
6 import com.topdraw.business.basicdata.exp.detail.service.ExpDetailService; 6 import com.topdraw.business.basicdata.exp.detail.service.ExpDetailService;
7 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria; 7 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria;
......
1 package com.topdraw.business.basicdata.exp.history.rest; 1 package com.topdraw.business.basicdata.exp.history.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory; 5 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
6 import com.topdraw.business.basicdata.exp.history.service.ExpHistoryService; 6 import com.topdraw.business.basicdata.exp.history.service.ExpHistoryService;
7 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria; 7 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria;
......
...@@ -3,7 +3,7 @@ package com.topdraw.business.basicdata.member.address.rest; ...@@ -3,7 +3,7 @@ package com.topdraw.business.basicdata.member.address.rest;
3 import com.topdraw.business.basicdata.member.service.MemberService; 3 import com.topdraw.business.basicdata.member.service.MemberService;
4 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 4 import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
5 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
6 import com.topdraw.annotation.Log; 6 import com.topdraw.aop.log.Log;
7 import com.topdraw.business.basicdata.member.address.domain.MemberAddress; 7 import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
8 import com.topdraw.business.basicdata.member.address.service.MemberAddressService; 8 import com.topdraw.business.basicdata.member.address.service.MemberAddressService;
9 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria; 9 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria;
......
1 package com.topdraw.business.basicdata.member.group.rest; 1 package com.topdraw.business.basicdata.member.group.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.member.group.domain.MemberGroup; 5 import com.topdraw.business.basicdata.member.group.domain.MemberGroup;
6 import com.topdraw.business.basicdata.member.group.service.MemberGroupService; 6 import com.topdraw.business.basicdata.member.group.service.MemberGroupService;
7 import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupQueryCriteria; 7 import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupQueryCriteria;
......
1 package com.topdraw.business.basicdata.member.level.rest; 1 package com.topdraw.business.basicdata.member.level.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.member.level.domain.MemberLevel; 5 import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
6 import com.topdraw.business.basicdata.member.level.service.MemberLevelService; 6 import com.topdraw.business.basicdata.member.level.service.MemberLevelService;
7 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria; 7 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria;
......
...@@ -4,7 +4,7 @@ import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDT ...@@ -4,7 +4,7 @@ import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDT
4 import com.topdraw.business.basicdata.member.service.MemberService; 4 import com.topdraw.business.basicdata.member.service.MemberService;
5 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 5 import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
6 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
7 import com.topdraw.annotation.Log; 7 import com.topdraw.aop.log.Log;
8 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile; 8 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
9 import com.topdraw.business.basicdata.member.profile.service.MemberProfileService; 9 import com.topdraw.business.basicdata.member.profile.service.MemberProfileService;
10 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria; 10 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria;
......
...@@ -3,7 +3,7 @@ package com.topdraw.business.basicdata.member.relatedinfo.rest; ...@@ -3,7 +3,7 @@ package com.topdraw.business.basicdata.member.relatedinfo.rest;
3 import com.topdraw.business.basicdata.member.service.MemberService; 3 import com.topdraw.business.basicdata.member.service.MemberService;
4 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 4 import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
5 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
6 import com.topdraw.annotation.Log; 6 import com.topdraw.aop.log.Log;
7 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo; 7 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
8 import com.topdraw.business.basicdata.member.relatedinfo.service.MemberRelatedInfoService; 8 import com.topdraw.business.basicdata.member.relatedinfo.service.MemberRelatedInfoService;
9 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria; 9 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
......
1 package com.topdraw.business.basicdata.member.rest; 1 package com.topdraw.business.basicdata.member.rest;
2 2
3 import com.topdraw.annotation.Log; 3
4 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.basicdata.member.domain.Member; 5 import com.topdraw.business.basicdata.member.domain.Member;
5 import com.topdraw.business.basicdata.member.service.MemberService; 6 import com.topdraw.business.basicdata.member.service.MemberService;
6 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 7 import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
......
1 package com.topdraw.business.basicdata.points.available.rest; 1 package com.topdraw.business.basicdata.points.available.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.points.available.domain.PointsAvailable; 5 import com.topdraw.business.basicdata.points.available.domain.PointsAvailable;
6 import com.topdraw.business.basicdata.points.available.service.PointsAvailableService; 6 import com.topdraw.business.basicdata.points.available.service.PointsAvailableService;
7 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria; 7 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria;
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.rest; 1 package com.topdraw.business.basicdata.points.detail.detailhistory.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory; 5 import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory;
6 import com.topdraw.business.basicdata.points.detail.detailhistory.service.PointsDetailHistoryService; 6 import com.topdraw.business.basicdata.points.detail.detailhistory.service.PointsDetailHistoryService;
7 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria; 7 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
......
1 package com.topdraw.business.basicdata.points.detail.rest; 1 package com.topdraw.business.basicdata.points.detail.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.points.detail.domain.PointsDetail; 5 import com.topdraw.business.basicdata.points.detail.domain.PointsDetail;
6 import com.topdraw.business.basicdata.points.detail.service.PointsDetailService; 6 import com.topdraw.business.basicdata.points.detail.service.PointsDetailService;
7 import com.topdraw.business.basicdata.points.detail.service.dto.PointsDetailQueryCriteria; 7 import com.topdraw.business.basicdata.points.detail.service.dto.PointsDetailQueryCriteria;
......
1 package com.topdraw.business.basicdata.points.rest; 1 package com.topdraw.business.basicdata.points.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.points.domain.Points; 5 import com.topdraw.business.basicdata.points.domain.Points;
6 import com.topdraw.business.basicdata.points.service.PointsService; 6 import com.topdraw.business.basicdata.points.service.PointsService;
7 import com.topdraw.business.basicdata.points.service.dto.PointsQueryCriteria; 7 import com.topdraw.business.basicdata.points.service.dto.PointsQueryCriteria;
......
1 package com.topdraw.business.basicdata.points.standingbook.rest; 1 package com.topdraw.business.basicdata.points.standingbook.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.points.standingbook.domain.PointsStandingBook; 5 import com.topdraw.business.basicdata.points.standingbook.domain.PointsStandingBook;
6 import com.topdraw.business.basicdata.points.standingbook.service.PointsStandingBookService; 6 import com.topdraw.business.basicdata.points.standingbook.service.PointsStandingBookService;
7 import com.topdraw.business.basicdata.points.standingbook.service.dto.PointsStandingBookQueryCriteria; 7 import com.topdraw.business.basicdata.points.standingbook.service.dto.PointsStandingBookQueryCriteria;
......
...@@ -2,7 +2,7 @@ package com.topdraw.business.basicdata.rights.history.rest; ...@@ -2,7 +2,7 @@ package com.topdraw.business.basicdata.rights.history.rest;
2 2
3 import com.topdraw.business.basicdata.rights.history.service.dto.RightsHistoryQueryType; 3 import com.topdraw.business.basicdata.rights.history.service.dto.RightsHistoryQueryType;
4 import com.topdraw.common.ResultInfo; 4 import com.topdraw.common.ResultInfo;
5 import com.topdraw.annotation.Log; 5 import com.topdraw.aop.log.Log;
6 import com.topdraw.business.basicdata.rights.history.domain.RightsHistory; 6 import com.topdraw.business.basicdata.rights.history.domain.RightsHistory;
7 import com.topdraw.business.basicdata.rights.history.service.RightsHistoryService; 7 import com.topdraw.business.basicdata.rights.history.service.RightsHistoryService;
8 import com.topdraw.business.basicdata.rights.history.service.dto.RightsHistoryQueryCriteria; 8 import com.topdraw.business.basicdata.rights.history.service.dto.RightsHistoryQueryCriteria;
......
1 package com.topdraw.business.basicdata.rights.permanentrights.rest; 1 package com.topdraw.business.basicdata.rights.permanentrights.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.rights.permanentrights.domain.PermanentRights; 5 import com.topdraw.business.basicdata.rights.permanentrights.domain.PermanentRights;
6 import com.topdraw.business.basicdata.rights.permanentrights.service.PermanentRightsService; 6 import com.topdraw.business.basicdata.rights.permanentrights.service.PermanentRightsService;
7 import com.topdraw.business.basicdata.rights.permanentrights.service.dto.PermanentRightsQueryCriteria; 7 import com.topdraw.business.basicdata.rights.permanentrights.service.dto.PermanentRightsQueryCriteria;
......
1 package com.topdraw.business.basicdata.task.progress.rest; 1 package com.topdraw.business.basicdata.task.progress.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.task.progress.domain.TrTaskProgress; 5 import com.topdraw.business.basicdata.task.progress.domain.TrTaskProgress;
6 import com.topdraw.business.basicdata.task.progress.service.TrTaskProgressService; 6 import com.topdraw.business.basicdata.task.progress.service.TrTaskProgressService;
7 import com.topdraw.business.basicdata.task.progress.service.dto.TrTaskProgressQueryCriteria; 7 import com.topdraw.business.basicdata.task.progress.service.dto.TrTaskProgressQueryCriteria;
......
1 package com.topdraw.business.basicdata.task.rest; 1 package com.topdraw.business.basicdata.task.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.task.domain.Task; 5 import com.topdraw.business.basicdata.task.domain.Task;
6 import com.topdraw.business.basicdata.task.service.TaskService; 6 import com.topdraw.business.basicdata.task.service.TaskService;
7 import com.topdraw.business.basicdata.task.service.dto.TaskQueryCriteria; 7 import com.topdraw.business.basicdata.task.service.dto.TaskQueryCriteria;
......
1 package com.topdraw.business.basicdata.task.template.rest; 1 package com.topdraw.business.basicdata.task.template.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.task.template.domain.TaskTemplate; 5 import com.topdraw.business.basicdata.task.template.domain.TaskTemplate;
6 import com.topdraw.business.basicdata.task.template.service.TaskTemplateService; 6 import com.topdraw.business.basicdata.task.template.service.TaskTemplateService;
7 import com.topdraw.business.basicdata.task.template.service.dto.TaskTemplateQueryCriteria; 7 import com.topdraw.business.basicdata.task.template.service.dto.TaskTemplateQueryCriteria;
......
...@@ -4,7 +4,7 @@ import com.topdraw.business.basicdata.member.domain.Member; ...@@ -4,7 +4,7 @@ import com.topdraw.business.basicdata.member.domain.Member;
4 import com.topdraw.business.basicdata.member.service.MemberService; 4 import com.topdraw.business.basicdata.member.service.MemberService;
5 import com.topdraw.business.basicdata.user.iptv.service.dto.UserTvDTO; 5 import com.topdraw.business.basicdata.user.iptv.service.dto.UserTvDTO;
6 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
7 import com.topdraw.annotation.Log; 7 import com.topdraw.aop.log.Log;
8 import com.topdraw.business.basicdata.user.iptv.domain.UserTv; 8 import com.topdraw.business.basicdata.user.iptv.domain.UserTv;
9 import com.topdraw.business.basicdata.user.iptv.service.UserTvService; 9 import com.topdraw.business.basicdata.user.iptv.service.UserTvService;
10 import com.topdraw.business.basicdata.user.iptv.service.dto.UserTvQueryCriteria; 10 import com.topdraw.business.basicdata.user.iptv.service.dto.UserTvQueryCriteria;
......
1 package com.topdraw.business.basicdata.user.weixin.rest; 1 package com.topdraw.business.basicdata.user.weixin.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.basicdata.user.weixin.domain.UserWeixin; 5 import com.topdraw.business.basicdata.user.weixin.domain.UserWeixin;
6 import com.topdraw.business.basicdata.user.weixin.service.UserWeixinService; 6 import com.topdraw.business.basicdata.user.weixin.service.UserWeixinService;
7 import com.topdraw.business.basicdata.user.weixin.service.dto.UserWeixinQueryCriteria; 7 import com.topdraw.business.basicdata.user.weixin.service.dto.UserWeixinQueryCriteria;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.process.domian.TempCoupon; 4 import com.topdraw.business.process.domian.TempCoupon;
5 import com.topdraw.business.process.service.CouponOperationService; 5 import com.topdraw.business.process.service.CouponOperationService;
6 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.process.domian.TempCoupon; 4 import com.topdraw.business.process.domian.TempCoupon;
5 import com.topdraw.business.process.domian.TempExp; 5 import com.topdraw.business.process.domian.TempExp;
6 import com.topdraw.business.process.service.CouponOperationService; 6 import com.topdraw.business.process.service.CouponOperationService;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.basicdata.member.domain.Member; 4 import com.topdraw.business.basicdata.member.domain.Member;
5 import com.topdraw.business.basicdata.member.service.MemberService; 5 import com.topdraw.business.basicdata.member.service.MemberService;
6 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 6 import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.process.domian.TempIptvUser; 4 import com.topdraw.business.process.domian.TempIptvUser;
5 import com.topdraw.business.process.service.TaskOperationService; 5 import com.topdraw.business.process.service.TaskOperationService;
6 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
......