CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CY:ba510ac671c335ae891cf2ecd86265b2c79a55f6
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment
..
compare: CY:ecc03229bd905dfaacb7063eccc9be0dc36f37c9
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment

No commits in common. "ba510ac671c335ae891cf2ecd86265b2c79a55f6" and "ecc03229bd905dfaacb7063eccc9be0dc36f37c9" have entirely different histories.
ba510ac671 ... ecc03229bd

17 changed files with 38 additions and 149 deletions
Show Stats Expand all files Collapse all files

2
mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberLevelController.java
View File

@ -18,7 +18,7 @@ import java.util.ArrayList;
import java.util.List;
/***
* 会员等级
* 模型评论
*/
@RestController
@RequestMapping("memberLevel")

6
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java
View File

@ -2,11 +2,13 @@ package com.mcwl.web.controller.resource;
import com.github.pagehelper.PageInfo;
import com.mcwl.common.annotation.RepeatSubmit;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.resource.domain.SysUserInfo;
import com.mcwl.resource.domain.vo.PageVo;
import com.mcwl.resource.service.SysUserAttentionService;
import com.mcwl.resource.service.impl.SysUserAttentionServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -74,7 +76,7 @@ public class SysUserAttentionController {
*/
@ApiOperation(value = "查询关注列表")
@PostMapping("/selectAttention")
public R<PageInfo<SysUser>> selectAttention(@RequestBody PageVo pageVo){
public R<PageInfo<SysUser>> selectAttention(PageVo pageVo){
PageInfo<SysUser> sysUserList = sysUserAttentionService.selectAttentionPage(pageVo);
@ -88,7 +90,7 @@ public class SysUserAttentionController {
*/
@ApiOperation(value = "查询粉丝列表")
@PostMapping("/selectToAttention")
public R<PageInfo<SysUser>> selectToAttention(@RequestBody PageVo pageVo){
public R<PageInfo<SysUser>> selectToAttention(PageVo pageVo){
PageInfo<SysUser> sysUserList = sysUserAttentionService.selectToAttentionPage(pageVo);

10
mcwl-admin/src/main/resources/application-dev.yml
View File

@ -99,16 +99,6 @@ spring:
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 43200
# 公众号配置
wechat:
# 应用ID

10
mcwl-admin/src/main/resources/application-druid.yml
View File

@ -99,16 +99,6 @@ spring:
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 30
# 公众号配置
wechat:
# 应用ID

10
mcwl-admin/src/main/resources/application.yml
View File

@ -66,6 +66,16 @@ spring:
# 热部署开关
enabled: true
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 30
# MyBatis Plus配置
mybatis-plus:
# 不支持多包, 如有需要可在注解配置 或 提升扫包等级

6
mcwl-common/src/main/java/com/mcwl/common/constant/Constants.java
View File

@ -163,11 +163,7 @@ public class Constants
/**
* 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
*/
public static final String[] JOB_WHITELIST_STR = {
"com.mcwl.quartz.task",
"com.mcwl.memberCenter.task",
"com.mcwl.pay.task"
};
public static final String[] JOB_WHITELIST_STR = { "com.mcwl.quartz.task" };
/**
* 定时任务违规的字符

10
mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
View File

@ -120,8 +120,6 @@ public class SysUser extends BaseEntity
*/
private Double wallet;
private Boolean isAttention;
public SysUser()
{
@ -407,12 +405,4 @@ public class SysUser extends BaseEntity
", freePoints=" + freePoints +
'}';
}
public Boolean getAttention() {
return isAttention;
}
public void setAttention(Boolean attention) {
isAttention = attention;
}
}

10
mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java
View File

@ -135,9 +135,6 @@ public class SecurityConfig {
"/file/**",
"/model/modelSquare",
"/model/selectModelById",
"/model/selectByUserIdModel",
"/model/selectByUserIdWorkFlow",
"/model/selectByUserIdImage",
"/model/finbyid",
"/ModelVersion/finbyid",
"/ModelComment/getComment",
@ -145,18 +142,13 @@ public class SecurityConfig {
"/WorkFlow/workFlowList",
"/WorkFlow/selectWorkFlowById",
"/WorkFlowComment/getComment",
"/WorkFlowComment/commentCount",
"/image/imageList",
"/image/detail",
"/imageComment/getComment",
"/imageComment/commentCount",
"/system/user/selectUserById",
"/system/dict/data/type/**",
"/attention/selectAttention",
"/attention/selectUserInfo",
"/WorkFlowVersion/selectVersionByWorkId",
"/memberLevel/list",
"/memberLevel/getMemberBenefitList"
"/attention/selectUserInfo"
).permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

2
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/EmptyPointsRemindConsumer.java
View File

@ -39,7 +39,7 @@ public class EmptyPointsRemindConsumer {
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(sysUser.getUserId());
sysAdvice.setReceiverId(member.getUserId());
sysAdvice.setType(AdviceEnum.SYSTEM_NOTICE);
sysAdvice.setType(AdviceEnum.NEW_MESSAGE_REMIND);
sysAdvice.setTitle("积分清零提醒");
sysAdvice.setContent("您的积分即将清零，请及时消费");
sysAdvice.setCreateBy(sysUser.getUserName());

2
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/consumer/MemberBillingConsumer.java
View File

@ -39,7 +39,7 @@ public class MemberBillingConsumer {
SysAdvice sysAdvice = new SysAdvice();
sysAdvice.setSenderId(sysUser.getUserId());
sysAdvice.setReceiverId(member.getUserId());
sysAdvice.setType(AdviceEnum.SYSTEM_NOTICE);
sysAdvice.setType(AdviceEnum.NEW_MESSAGE_REMIND);
sysAdvice.setTitle("会员账单");
sysAdvice.setContent("您的会员即将到期，请及时支付");
sysAdviceService.save(sysAdvice);

9
mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/task/UserMemberTask.java
View File

@ -29,7 +29,7 @@ public class UserMemberTask {
/**
* 积分清零提醒 月底前五天 0 0 9 L-5 * ?
* 积分清零提醒 月底前五天
*/
public void emptyPointsRemindTask() {
List<Member> memberList = memberService.getUseUserMember();
@ -45,7 +45,7 @@ public class UserMemberTask {
/**
* 清空积分 每月月底前两天 0 0 9 L-2 * ?
* 清空积分 每月月底前两天
*/
@Transactional
public void emptyPointsTsk() {
@ -57,6 +57,7 @@ public class UserMemberTask {
}
for (Member member : memberList) {
member.setPoints(0.0);
member.setUpdateTime(new Date());
userIdList.add(member.getUserId());
}
sysUserList = sysUserService.listByIds(userIdList);
@ -68,7 +69,7 @@ public class UserMemberTask {
}
/**
* 更新会员状态 间隔1h检查 0 0 0/1 * * ?
* 更新会员状态 间隔1h检查
*/
public void updateSubscriptionStatusTask() {
LambdaQueryWrapper<Member> qw = new LambdaQueryWrapper<>();
@ -81,6 +82,8 @@ public class UserMemberTask {
return;
}
System.out.println("userMemberList = " + memberList);
for (Member member : memberList) {
MemberEnum subscriptionStatus = member.getSubscriptionStatus();
if (subscriptionStatus == MemberEnum.MEMBER_CENTER_ACTIVE) {

45
mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java
View File

@ -1,45 +0,0 @@
package com.mcwl.pay.task;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mcwl.common.constant.QueueConstants;
import com.mcwl.memberCenter.domain.Member;
import com.mcwl.pay.domain.OrderTrade;
import com.mcwl.pay.service.AliPayService;
import com.mcwl.pay.service.OrderTradeService;
import lombok.RequiredArgsConstructor;
import org.joda.time.LocalDateTime;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
@Component("payTask")
@RequiredArgsConstructor
public class PayTask {
private final OrderTradeService orderTradeService;
/**
* 删除失效订单 间隔1h检查 0 0 0/1 * * ?
*/
public void deleteInvalidOrderTask() {
Date date = LocalDateTime.now().plusMinutes(-15).toDate();
List<OrderTrade> orderTradeList = orderTradeService.lambdaQuery()
.le(OrderTrade::getCreateTime, date)
.and(wrapper -> wrapper
.eq(OrderTrade::getOrderStatus, 4)
.or()
.eq(OrderTrade::getPayStatus, 1)
)
.list();
orderTradeService.removeBatchByIds(orderTradeList);
}
}

2
mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/PageVo.java
View File

@ -31,5 +31,5 @@ public class PageVo {
@ApiModelProperty(value = "排序")
private Integer order;
@ApiModelProperty(value = "条件过滤")
private Long type;
private Integer type;
}

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
View File

@ -176,7 +176,7 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
@Override
public TableDataInfo listByPage(ModelImagePageRes imagePageRes) {
if (Objects.isNull(imagePageRes.getUserId())) {
imagePageRes.setUserId(SecurityUtils.getUserIdMax());
imagePageRes.setUserId(SecurityUtils.getUserId());
}
Page<ModelImage> page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize());
if (StringUtils.isEmpty(imagePageRes.getOrderByColumn())) {

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
View File

@ -159,7 +159,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
public TableDataInfo listByPage(ModelImagePageRes imagePageRes) {
if (Objects.isNull(imagePageRes.getUserId())) {
imagePageRes.setUserId(SecurityUtils.getUserIdMax());
imagePageRes.setUserId(SecurityUtils.getUserId());
}
Page<ModelProduct> page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize());

57
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.resource.domain.ModelLike;
import com.mcwl.resource.domain.SysAdvice;
import com.mcwl.resource.domain.SysUserAttention;
import com.mcwl.resource.domain.SysUserInfo;
@ -18,7 +19,6 @@ import com.mcwl.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -37,6 +37,9 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
@Autowired
private ModelMapper modelMapper;
@Autowired
private MallProductLikeMapper mallProductLikeMapper;
@Autowired
private SysUserAttentionMapper sysUserAttentionMapper;
@ -94,7 +97,7 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
public SysUserInfo selectUserInfo(Long userId) {
if (userId == null) {
userId = SecurityUtils.getUserIdMax();
userId = SecurityUtils.getUserId();
}
@ -136,31 +139,11 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
public PageInfo<SysUser> selectAttentionPage(PageVo pageVo) {
PageHelper pageHelper = new PageHelper();
pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize());
pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize());
Long userIdMax = SecurityUtils.getUserIdMax();
if (userIdMax == 0L) {
return new PageInfo<SysUser>(new ArrayList<SysUser>());
}
if (pageVo.getType() == null) {
pageVo.setType(userIdMax);
}
//条件构造器
List<SysUser> sysUserList = sysUserMapper.selectUserPage(pageVo.getType());
List<SysUser> sysUserList = sysUserMapper.selectUserPage(SecurityUtils.getUserId());
for (SysUser sysUser : sysUserList) {
if (sysUser != null){
sysUser.setAttention(selectAttention(sysUser.getUserId()));
}
}
return new PageInfo<SysUser>(sysUserList);
}
@ -169,32 +152,10 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
public PageInfo<SysUser> selectToAttentionPage(PageVo pageVo) {
PageHelper pageHelper = new PageHelper();
pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize());
Long userIdMax = SecurityUtils.getUserIdMax();
if (userIdMax == 0L) {
return new PageInfo<SysUser>(new ArrayList<SysUser>());
}
if (pageVo.getType() == null) {
pageVo.setType(userIdMax);
}
pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize());
//条件构造器
List<SysUser> sysUserList = sysUserMapper.selectToUserPage(pageVo.getType());
for (SysUser sysUser : sysUserList) {
if (sysUser != null){
sysUser.setAttention(selectAttention(sysUser.getUserId()));
}
}
List<SysUser> sysUserList = sysUserMapper.selectToUserPage(SecurityUtils.getUserId());
return new PageInfo<SysUser>(sysUserList);

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java
View File

@ -409,7 +409,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
public TableDataInfo listByPage(ModelImagePageRes imagePageRes) {
if (Objects.isNull(imagePageRes.getUserId())) {
imagePageRes.setUserId(SecurityUtils.getUserIdMax());
imagePageRes.setUserId(SecurityUtils.getUserId());
}
Page<WorkFlow> page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize());