diff --git a/pom.xml b/pom.xml index 19e98f56e..8c16ca818 100644 --- a/pom.xml +++ b/pom.xml @@ -369,6 +369,7 @@ ${revision} + org.dromara @@ -395,13 +396,12 @@ org.dromara - ruoyi-pay + ruoyi-im ${revision} - org.dromara - ruoyi-aftersale + ruoyi-goods ${revision} @@ -427,7 +427,6 @@ ruoyi-common ruoyi-extend ruoyi-modules - ruoyi-front pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 433cde3da..d97374e7b 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -63,6 +63,27 @@ ruoyi-system + + org.dromara + ruoyi-im + + + org.dromara + ruoyi-goods + + + org.dromara + ruoyi-content + + + org.dromara + ruoyi-member + + + org.dromara + ruoyi-order + + org.dromara ruoyi-job diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5b9304e9b..946ee2fae 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -143,7 +143,7 @@ mybatis-plus: # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper/**/*.xml # 实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: org.dromara.**.domain,com.wzj.soopin.** + typeAliasesPackage: org.dromara.**.domain,com.wzj.soopin.**.domain global-config: dbConfig: # 主键类型 diff --git a/ruoyi-modules/ruoyi-content/pom.xml b/ruoyi-modules/ruoyi-content/pom.xml index 6775e0aa3..2f9d045f4 100644 --- a/ruoyi-modules/ruoyi-content/pom.xml +++ b/ruoyi-modules/ruoyi-content/pom.xml @@ -42,6 +42,12 @@ com.qcloud vod_api 2.1.5 + + + slf4j-reload4j + org.slf4j + + @@ -130,12 +136,12 @@ org.dromara ruoyi-common-mongo - - com.github.pagehelper - pagehelper - 5.3.2 - compile - + + + + + + com.squareup.okhttp3 okhttp diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/CommentMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/CommentMapper.java similarity index 70% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/CommentMapper.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/CommentMapper.java index 035cf85d8..7fa546b89 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/CommentMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/CommentMapper.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.Comment; import com.wzj.soopin.content.domain.vo.CommentVO; @@ -7,7 +7,5 @@ import org.springframework.stereotype.Repository; @Repository public interface CommentMapper extends BaseMapperPlus { - Comment selectByPrimaryKey(String id); - void delete(Comment pendingDelete); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/CommentMapperCustom.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/CommentMapperCustom.java similarity index 91% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/CommentMapperCustom.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/CommentMapperCustom.java index c844028dd..51ff5f832 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/CommentMapperCustom.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/CommentMapperCustom.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.Comment; import com.wzj.soopin.content.domain.vo.CommentVO; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/FansMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/FansMapper.java similarity index 67% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/FansMapper.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/FansMapper.java index 77307afe1..44c20384e 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/FansMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/FansMapper.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.Fans; import com.wzj.soopin.content.domain.po.Vlog; @@ -13,12 +13,5 @@ import java.util.Map; public interface FansMapper extends BaseMapperPlus { - int updateByPrimaryKeySelective(Fans record); public List> getFollowedVlogerIds(@Param("currentUserId")String currentUserId,@Param("vlogerIds")List vlogerIds); - - int insert(@Param("fansData") Map vlogData); - - public List selectByExample(@Param("paramMap") Map map); - - int delete(@Param("id") String id); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/FansMapperCustom.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/FansMapperCustom.java similarity index 93% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/FansMapperCustom.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/FansMapperCustom.java index e4b71e505..a5caa5e1e 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/FansMapperCustom.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/FansMapperCustom.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.Fans; import com.wzj.soopin.content.domain.po.Vlog; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/MyLikedVlogMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java similarity index 85% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/MyLikedVlogMapper.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java index df0dc83c3..4c5bc271b 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/MyLikedVlogMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.MyLikedVlog; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/UserMemberMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/UserMemberMapper.java similarity index 90% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/UserMemberMapper.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/UserMemberMapper.java index 966da5139..a5e460a3a 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/UserMemberMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/UserMemberMapper.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.UserMember; import com.wzj.soopin.content.domain.po.Users; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/UsersMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/UsersMapper.java similarity index 97% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/UsersMapper.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/UsersMapper.java index 7c69a0e8a..a71946ce9 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/UsersMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/UsersMapper.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/VlogMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java similarity index 97% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/VlogMapper.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java index 2e5e91ef2..560f00d8e 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/VlogMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/VlogMapperCustom.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapperCustom.java similarity index 95% rename from ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/VlogMapperCustom.java rename to ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapperCustom.java index 36845a89f..7de414f07 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/mapper/VlogMapperCustom.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapperCustom.java @@ -1,4 +1,4 @@ -package com.wzj.soopin.content.mapper.mapper; +package com.wzj.soopin.content.mapper; import com.wzj.soopin.content.domain.po.Vlog; import com.wzj.soopin.content.domain.vo.IndexVlogVO; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/result/GraceJSONResult.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/result/GraceJSONResult.java index d9e4f8630..b7f8d7e22 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/result/GraceJSONResult.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/result/GraceJSONResult.java @@ -14,8 +14,7 @@ import java.util.Map; * @Copyright: Copyright (c) 2020 * @Company: www.imooc.com * @author 慕课网 - 风间影月 - * @version V2.0 - */ + * @version V2.0 */ public class GraceJSONResult { // 响应业务状态码 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java index 098d99657..916c0d6fc 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java @@ -9,8 +9,8 @@ import com.wzj.soopin.content.domain.po.Vlog; import com.wzj.soopin.content.domain.vo.CommentVO; import com.wzj.soopin.content.enums.MessageEnum; import com.wzj.soopin.content.enums.YesOrNo; -import com.wzj.soopin.content.mapper.mapper.CommentMapper; -import com.wzj.soopin.content.mapper.mapper.CommentMapperCustom; +import com.wzj.soopin.content.mapper.CommentMapper; +import com.wzj.soopin.content.mapper.CommentMapperCustom; import com.wzj.soopin.content.service.CommentService; import com.wzj.soopin.content.service.MsgService; import com.wzj.soopin.content.service.VlogService; @@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java index b5081b390..9b6463ab6 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java @@ -1,7 +1,6 @@ package com.wzj.soopin.content.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.content.domain.base.BaseInfoProperties; import com.wzj.soopin.content.domain.base.RabbitMQConfig; @@ -10,8 +9,8 @@ import com.wzj.soopin.content.domain.po.Fans; import com.wzj.soopin.content.domain.vo.FansVO; import com.wzj.soopin.content.domain.vo.VlogerVO; import com.wzj.soopin.content.enums.MessageEnum; -import com.wzj.soopin.content.mapper.mapper.FansMapper; -import com.wzj.soopin.content.mapper.mapper.FansMapperCustom; +import com.wzj.soopin.content.mapper.FansMapper; +import com.wzj.soopin.content.mapper.FansMapperCustom; import com.wzj.soopin.content.service.FansService; import com.wzj.soopin.content.service.MsgService; import com.wzj.soopin.content.utils.JsonUtils; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserMemberServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserMemberServiceImpl.java index e57568682..c016c534c 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserMemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserMemberServiceImpl.java @@ -1,7 +1,7 @@ package com.wzj.soopin.content.service.impl; -import com.wzj.soopin.content.mapper.mapper.UserMemberMapper; +import com.wzj.soopin.content.mapper.UserMemberMapper; import com.wzj.soopin.content.service.UserMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserServiceImpl.java index e896888cd..3314ad879 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/UserServiceImpl.java @@ -16,10 +16,10 @@ import com.wzj.soopin.content.domain.vo.UsersVO; import com.wzj.soopin.content.enums.Sex; import com.wzj.soopin.content.enums.UserInfoModifyType; import com.wzj.soopin.content.enums.YesOrNo; -import com.wzj.soopin.content.mapper.mapper.FansMapper; -import com.wzj.soopin.content.mapper.mapper.FansMapperCustom; -import com.wzj.soopin.content.mapper.mapper.UserMemberMapper; -import com.wzj.soopin.content.mapper.mapper.UsersMapper; +import com.wzj.soopin.content.mapper.FansMapper; +import com.wzj.soopin.content.mapper.FansMapperCustom; +import com.wzj.soopin.content.mapper.UserMemberMapper; +import com.wzj.soopin.content.mapper.UsersMapper; import com.wzj.soopin.content.service.FansService; import com.wzj.soopin.content.service.UserService; import com.wzj.soopin.content.utils.*; @@ -31,7 +31,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.LinkedMultiValueMap; @@ -57,8 +56,8 @@ public class UserServiceImpl extends BaseInfoProperties implements UserService { @Autowired private FansService fansService; - @Resource - private PasswordEncoder passwordEncoder; +// @Resource +// private PasswordEncoder passwordEncoder; @Autowired private UserMemberMapper userMemberMapper; @@ -174,7 +173,7 @@ public class UserServiceImpl extends BaseInfoProperties implements UserService { String userId = sid.nextShort(); Users user = new Users(); user.setId(userId); - user.setPassword(passwordEncoder.encode(mobile)); +// user.setPassword(passwordEncoder.encode(mobile)); user.setMobile(mobile); user.setNickname("用户：" + DesensitizationUtil.commonDisplay(mobile)); user.setImoocNum("用户：" + DesensitizationUtil.commonDisplay(mobile)); diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index f463e832d..fc949d401 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -11,11 +11,10 @@ import com.wzj.soopin.content.domain.bo.VlogBO; import com.wzj.soopin.content.domain.po.MyLikedVlog; import com.wzj.soopin.content.domain.po.Vlog; import com.wzj.soopin.content.domain.vo.IndexVlogVO; -import com.wzj.soopin.content.enums.MessageEnum; import com.wzj.soopin.content.enums.YesOrNo; -import com.wzj.soopin.content.mapper.mapper.MyLikedVlogMapper; -import com.wzj.soopin.content.mapper.mapper.VlogMapper; -import com.wzj.soopin.content.mapper.mapper.VlogMapperCustom; +import com.wzj.soopin.content.mapper.MyLikedVlogMapper; +import com.wzj.soopin.content.mapper.VlogMapper; +import com.wzj.soopin.content.mapper.VlogMapperCustom; import com.wzj.soopin.content.service.FansService; import com.wzj.soopin.content.service.MsgService; import com.wzj.soopin.content.service.VlogService; diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapper.xml index c4b56865a..719bb5dd1 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapperCustom.xml index 2f2f4082e..7d4f79977 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapperCustom.xml @@ -1,6 +1,6 @@ - + - SELECT c.id as commentId, @@ -43,4 +43,4 @@ c.create_time DESC - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapper.xml index 86e957bdc..a88923929 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapper.xml @@ -1,11 +1,11 @@ - + - SELECT vloger_id, is_fan_friend_of_mine FROM t_fans WHERE fan_id = #{currentUserId} diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapperCustom.xml index a822bd848..3b75d9e53 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapperCustom.xml @@ -1,8 +1,8 @@ - - - SELECT u.id as vlogerId, @@ -24,7 +24,7 @@ - SELECT u.id as fanId, @@ -46,4 +46,4 @@ - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MyLikedVlogMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MyLikedVlogMapper.xml index ceb9219f2..4668b80bf 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MyLikedVlogMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MyLikedVlogMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UserMemberMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UserMemberMapper.xml index 4448ba619..86312a988 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UserMemberMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UserMemberMapper.xml @@ -1,9 +1,9 @@ - + + type="com.wzj.soopin.content.domain.po.Users"> @@ -42,4 +42,4 @@ r_user_member t2 ON t1.id=t2.user_id WHERE t2.member_id=#{memberId} - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UsersMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UsersMapper.xml index 62fafde66..c8448c6b3 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UsersMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UsersMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml index ecdc68b66..b64289b24 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml @@ -1,7 +1,7 @@ - + UPDATE t_vlog @@ -70,7 +70,7 @@ - SELECT v.id as vlogId, v.vloger_id as vlogerId, @@ -124,7 +124,7 @@ - SELECT v.id as vlogId, v.vloger_id as vlogerId, diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml index 374935082..c0d3b7561 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml @@ -1,8 +1,8 @@ - + - SELECT v.id as vlogId, v.vloger_id as vlogerId, @@ -62,7 +62,7 @@ - SELECT v.id as vlogId, v.vloger_id as vlogerId, @@ -93,7 +93,7 @@ AND v.first_frame_img IS NOT NULL - SELECT v.id as vlogId, v.vloger_id as vlogerId, @@ -144,7 +144,7 @@ DESC - SELECT v.id as vlogId, v.vloger_id as vlogerId, @@ -184,7 +184,7 @@ DESC - SELECT v.id as vlogId, v.vloger_id as vlogerId, @@ -226,4 +226,4 @@ DESC - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-goods/pom.xml b/ruoyi-modules/ruoyi-goods/pom.xml index 5ac8440cd..86ea014e5 100644 --- a/ruoyi-modules/ruoyi-goods/pom.xml +++ b/ruoyi-modules/ruoyi-goods/pom.xml @@ -104,11 +104,6 @@ compile - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.4.6 - diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java index f19f841b9..937cb93e0 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java @@ -35,12 +35,12 @@ public class BrandController extends BaseController { @Autowired private BrandConvert convert; - @ApiOperation("查询品牌管理列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody BrandQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询品牌管理列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody BrandQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("所有品牌管理列表") @PostMapping("/all") public ResponseEntity> all(@RequestBody BrandQuery query) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java index a76e0e470..fb630c7ee 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java @@ -35,12 +35,12 @@ public class ProductController extends BaseController { @Autowired private ProductConvert convert; - @ApiOperation("查询商品信息列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody ProductQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询商品信息列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody ProductQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出商品信息列表") @Log(title = "商品信息", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java index 027ec8826..79d6d3593 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java @@ -34,12 +34,12 @@ public class SkuController extends BaseController { @Autowired private SkuConvert convert; - @ApiOperation("查询sku信息列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody SkuQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询sku信息列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody SkuQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出sku信息列表") @Log(title = "sku信息", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/BrandService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/BrandService.java index fd2c0d0c6..5617ffc45 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/BrandService.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/BrandService.java @@ -2,7 +2,6 @@ package com.wzj.soopin.goods.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.goods.domain.entity.Brand; import com.wzj.soopin.goods.domain.query.BrandQuery; import com.wzj.soopin.goods.mapper.BrandMapper; @@ -43,9 +42,9 @@ public class BrandService { * @return 品牌管理 */ public List selectList(BrandQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } +// if (page != null) { +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// } QueryWrapper qw = new QueryWrapper<>(); String nameLike = query.getNameLike(); if (!StringUtils.isEmpty(nameLike)) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductCategoryService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductCategoryService.java index 69eb5f649..0de03af2d 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductCategoryService.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductCategoryService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.goods.convert.ProductCategoryConvert; import com.wzj.soopin.goods.convert.ProductConvert; import com.wzj.soopin.goods.domain.dto.CategoryDTO; @@ -61,9 +60,9 @@ public class ProductCategoryService { * @return 商品分类 */ public List selectList(ProductCategoryQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } +// if (page != null) { +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// } QueryWrapper qw = new QueryWrapper<>(); Long parentId = query.getParentId(); if (parentId != null) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java index a1445d753..8c56e2d28 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.goods.convert.ProductConvert; import com.wzj.soopin.goods.domain.entity.Product; import com.wzj.soopin.goods.domain.entity.Sku; @@ -70,9 +69,9 @@ public class ProductService { * @return 商品信息 */ public List selectList(ProductQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } +// if (page != null) { +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// } QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNoneEmpty(query.getOrderField())){ if (StringUtils.isNotEmpty(query.getOrderSort()) && "desc".equalsIgnoreCase(query.getOrderSort())) { @@ -141,10 +140,10 @@ public class ProductService { if (dbProduct == null) { return 0; } - Long userId = SecurityUtils.getUserId(); +// Long userId = SecurityUtils.getUserId(); Product product = convert.vo2do(productVO); List skuList = productVO.getSkuList(); - product.setUpdateBy(userId); +// product.setUpdateBy(userId); product.setUpdateTime(LocalDateTime.now()); productMapper.updateById(product); //查找库中所有的sku @@ -157,7 +156,7 @@ public class ProductService { log.info("共有{}个sku需要修改，{}，productId：{}",updateList.size(), JSONUtil.toJsonStr(updateList),productVO.getId()); updateList.forEach(it->{ Sku sku = skuMap.get(it.getId()); - sku.setUpdateBy(SecurityUtils.getUserId()); +// sku.setUpdateBy(SecurityUtils.getUserId()); sku.setUpdateTime(LocalDateTime.now()); sku.setPrice(it.getPrice()); sku.setSpData(it.getSpData()); diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/SkuService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/SkuService.java index 4f3c20c0e..944022f07 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/SkuService.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/SkuService.java @@ -1,7 +1,6 @@ package com.wzj.soopin.goods.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.goods.domain.entity.Sku; import com.wzj.soopin.goods.domain.query.SkuQuery; import com.wzj.soopin.goods.mapper.SkuMapper; @@ -43,9 +42,9 @@ public class SkuService { * @return sku信息 */ public List selectList(SkuQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } +// if (page != null) { +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// } QueryWrapper qw = new QueryWrapper<>(); Long productId = query.getProductId(); if (productId != null) { diff --git a/ruoyi-modules/ruoyi-im/pom.xml b/ruoyi-modules/ruoyi-im/pom.xml index 533b40e91..fc941a9da 100644 --- a/ruoyi-modules/ruoyi-im/pom.xml +++ b/ruoyi-modules/ruoyi-im/pom.xml @@ -1,37 +1,113 @@ - 4.0.0 org.dromara ruoyi-modules - 5.3.1 + ${revision} + 4.0.0 ruoyi-im - Maven - http://maven.apache.org/ - 2001 + + system系统模块 + - - - website - scp://webhost.company.com/www/website - - + + + + org.dromara + ruoyi-common-core + - - UTF-8 - + + org.dromara + ruoyi-common-doc + - - - - maven-site-plugin - - en,fr - - - - + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-translation + + + + + org.dromara + ruoyi-common-oss + + + + org.dromara + ruoyi-common-log + + + + + org.dromara + ruoyi-common-excel + + + + + org.dromara + ruoyi-common-sms + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + org.dromara + ruoyi-common-websocket + + + + org.dromara + ruoyi-common-sse + + + io.swagger + swagger-annotations + 1.6.2 + compile + + + + + + + + diff --git a/ruoyi-modules/ruoyi-im/src/site/apt/format.apt b/ruoyi-modules/ruoyi-im/src/site/apt/format.apt deleted file mode 100644 index 864419fdc..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - The APT format - ----- - The Maven Team - ----- - ----- - -The APT format -~~~~~~~~~~~~~~ - - In the following section, boxes containing text in typewriter-like font are - examples of APT source. - -* Document structure -~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionaly be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/ruoyi-modules/ruoyi-im/src/site/apt/index.apt b/ruoyi-modules/ruoyi-im/src/site/apt/index.apt deleted file mode 100644 index 985ddeba3..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/apt/index.apt +++ /dev/null @@ -1,16 +0,0 @@ - ----- - The Site - ----- - The Maven Team - ----- - -Maven Site for your project - - Congratulations! If you are looking at this page then you have successfully generated a - template site employing the site archetype and you have run: - -+-----+ - -mvn site - -+-----+ diff --git a/ruoyi-modules/ruoyi-im/src/site/fml/faq.fml b/ruoyi-modules/ruoyi-im/src/site/fml/faq.fml deleted file mode 100644 index b8c4d47a3..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Where did Maven come from? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

- - - - Why is Maven so wildly popular? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

- - - - diff --git a/ruoyi-modules/ruoyi-im/src/site/fr/apt/format.apt b/ruoyi-modules/ruoyi-im/src/site/fr/apt/format.apt deleted file mode 100644 index f8e67c213..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/fr/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - Le format APT - ----- - L'équipe Maven - ----- - ----- - -Le format APT -~~~~~~~~~~~~~ - - Dans la section suivante, les boîtes contenant du texte dans la police - de type machine à écrire sont des exemples de source APT. - -* Structure du document -~~~~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionaly be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/ruoyi-modules/ruoyi-im/src/site/fr/apt/index.apt b/ruoyi-modules/ruoyi-im/src/site/fr/apt/index.apt deleted file mode 100644 index dde1c9fcc..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/fr/apt/index.apt +++ /dev/null @@ -1,17 +0,0 @@ - ----- - Le Site - ----- - L'équipe Maven - ----- - -Site Maven pour votre projet - - Félicitations! Si vous regardez cette page alors vous avez - généré avec succès un modèle de site en utilisant l'archétype - de site et vous avez lancé : - -+-----+ - -mvn site - -+-----+ diff --git a/ruoyi-modules/ruoyi-im/src/site/fr/fml/faq.fml b/ruoyi-modules/ruoyi-im/src/site/fr/fml/faq.fml deleted file mode 100644 index 22ab25566..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/fr/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - D'où vient Maven ? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

- - - - Pourquoi Maven est-il si populaire ? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

- - - - diff --git a/ruoyi-modules/ruoyi-im/src/site/fr/xdoc/xdoc.xml b/ruoyi-modules/ruoyi-im/src/site/fr/xdoc/xdoc.xml deleted file mode 100644 index 49e79bb4a..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/fr/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Bienvenue - The Maven Team - - - -
-

- Ceci est du texte pour le fichier xdoc. -

-
- - - diff --git a/ruoyi-modules/ruoyi-im/src/site/site.xml b/ruoyi-modules/ruoyi-im/src/site/site.xml deleted file mode 100644 index 843a968b9..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/site.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Maven - http://maven.apache.org/images/apache-maven-project.png - http://maven.apache.org/ - - - http://maven.apache.org/images/maven-small.gif - - - - - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-im/src/site/site_fr.xml b/ruoyi-modules/ruoyi-im/src/site/site_fr.xml deleted file mode 100644 index d1fd75788..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/site_fr.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Maven - http://maven.apache.org/images/apache-maven-project.png - http://maven.apache.org/ - - - http://maven.apache.org/images/maven-small.gif - - - - - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-im/src/site/xdoc/xdoc.xml b/ruoyi-modules/ruoyi-im/src/site/xdoc/xdoc.xml deleted file mode 100644 index 557034e08..000000000 --- a/ruoyi-modules/ruoyi-im/src/site/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Welcome - The Maven Team - - - -
-

- This is some text for the xdoc file. -

-
- - - diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java index d4f46be57..960be3221 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAddressBO.java @@ -2,6 +2,8 @@ package com.wzj.soopin.member.domain.bo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.databind.ser.Serializers; +import com.wzj.soopin.member.domain.po.Member; +import com.wzj.soopin.member.domain.po.MemberAddress; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,7 +48,7 @@ public class MemberAddressBO extends BaseBO { private Integer isDefault; @Override - public QueryWrapper toWrapper() { - return super.toWrapper(); + public QueryWrapper toWrapper() { + return null; } } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java index cda06e2de..531d1102d 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java @@ -113,14 +113,14 @@ public class MemberAddressServiceImpl { public Integer deleteUserIds(List ids) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId()); +// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId()); qw.in(MemberAddress::getId, ids); return memberAddressMapper.delete(qw); } public MemberAddress selectByUserAndId(Long id) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId()); +// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId()); qw.eq(MemberAddress::getId, id); return memberAddressMapper.selectOne(qw); } diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/AddressMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/AddressMapper.xml index e19506e65..1759e7a7e 100644 --- a/ruoyi-modules/ruoyi-member/src/main/resources/ums/AddressMapper.xml +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/AddressMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + and type = #{type} and content = #{content} and images = #{images} diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAccountMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAccountMapper.xml index d1677012d..6f07b83b2 100644 --- a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAccountMapper.xml +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAccountMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + and member_id = #{memberId} and name like concat('%', #{name}, '%') and default_status = #{defaultStatus} diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberCartMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberCartMapper.xml index 0ae91ce4d..a086919ca 100644 --- a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberCartMapper.xml +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberCartMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + and phone = #{phone} and member_id = #{memberId} and ipaddr = #{ipaddr} diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml index d0ce8e1c6..ce5eaece7 100644 --- a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + and member_id = #{memberId} and unionid = #{unionid} and openid = #{openid} diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml index 45b148a50..d0fd47a17 100644 --- a/ruoyi-modules/ruoyi-order/pom.xml +++ b/ruoyi-modules/ruoyi-order/pom.xml @@ -103,12 +103,12 @@ 1.6.2 compile - - com.github.pagehelper - pagehelper - 5.3.2 - compile - + + + + + + org.dromara ruoyi-member @@ -119,7 +119,6 @@ org.dromara ruoyi-goods 5.3.1 - compile com.alibaba @@ -133,7 +132,6 @@ com.google.api.grpc proto-google-common-protos 2.41.0 - compile org.springframework.security diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java index 8f2dcba1d..a95fee23f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java @@ -46,12 +46,12 @@ public class AftersaleController extends BaseController { @Autowired private RedisService redisService; - @ApiOperation("查询订单售后列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody ManagerAftersaleOrderForm query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询订单售后列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody ManagerAftersaleOrderForm query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出订单售后列表") @Log(title = "订单售后", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java index db0112440..400859d51 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java @@ -35,12 +35,12 @@ public class AftersaleItemController extends BaseController { @Autowired private AftersaleItemConvert convert; - @ApiOperation("查询订单售后列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody AftersaleItemQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询订单售后列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody AftersaleItemQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出订单售后列表") @Log(title = "订单售后", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java index 74bb2af0b..b10816394 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java @@ -34,12 +34,12 @@ public class OrderDeliveryHistoryController extends BaseController { @Autowired private OrderDeliveryHistoryConvert convert; - @ApiOperation("查询订单发货记录列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody OrderDeliveryHistoryQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询订单发货记录列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody OrderDeliveryHistoryQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出订单发货记录列表") @Log(title = "订单发货记录", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java index bf517071d..e5be3e4d4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java @@ -34,12 +34,12 @@ public class OrderItemController extends BaseController { @Autowired private OrderItemConvert convert; - @ApiOperation("查询订单中所包含的商品列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody OrderItemQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询订单中所包含的商品列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody OrderItemQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出订单中所包含的商品列表") @Log(title = "订单中所包含的商品", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java index f464f6a3d..ae0e5ec63 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java @@ -34,12 +34,12 @@ public class OrderOperateHistoryController extends BaseController { @Autowired private OrderOperateHistoryConvert convert; - @ApiOperation("查询订单操作历史记录列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody OrderOperateHistoryQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询订单操作历史记录列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody OrderOperateHistoryQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出订单操作历史记录列表") @Log(title = "订单操作历史记录", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java index 72797cf20..8af7bc09e 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java @@ -34,12 +34,12 @@ public class WechatPaymentHistoryController extends BaseController { @Autowired private WechatPaymentHistoryConvert convert; - @ApiOperation("查询微信订单表列表") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody WechatPaymentHistoryQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } +// @ApiOperation("查询微信订单表列表") +// @PostMapping("/list") +// public ResponseEntity> list(@RequestBody WechatPaymentHistoryQuery query, Pageable page) { +// List list = service.selectList(query, page); +// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); +// } @ApiOperation("导出微信订单表列表") @Log(title = "微信订单表", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/MemberDataStatisticsVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/MemberDataStatisticsVO.java index 6729cc5b2..edf37bce8 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/MemberDataStatisticsVO.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/MemberDataStatisticsVO.java @@ -3,11 +3,13 @@ package com.wzj.soopin.order.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.ibatis.type.Alias; import java.math.BigDecimal; @Data @ApiModel("会员下单数据统计对象") +@Alias("OrderMemberDataStatisticsVO") public class MemberDataStatisticsVO { @ApiModelProperty("购物车数") private Integer cartCount; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleItemService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleItemService.java index be79b267e..ce62e79a3 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleItemService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleItemService.java @@ -1,7 +1,6 @@ package com.wzj.soopin.order.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.order.domain.entity.AftersaleItem; import com.wzj.soopin.order.domain.query.AftersaleItemQuery; import com.wzj.soopin.order.mapper.AftersaleItemMapper; @@ -42,9 +41,9 @@ public class AftersaleItemService { * @return 订单售后 */ public List selectList(AftersaleItemQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } +// if (page != null) { +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// } QueryWrapper qw = new QueryWrapper<>(); Long memberId = query.getMemberId(); if (memberId != null) { diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleService.java index a66b7921e..5cfed0299 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/AftersaleService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageHelper; import com.wechat.pay.java.service.refund.model.Refund; import com.wechat.pay.java.service.refund.model.RefundNotification; import com.wzj.soopin.goods.mapper.SkuMapper; @@ -161,7 +160,7 @@ public class AftersaleService { */ public List selectList(ManagerAftersaleOrderForm query, Pageable page) { if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } if (StrUtil.isNotBlank(query.getOrderSn()) && query.getOrderSn().length() > 7) { query.setOrderSn(query.getOrderSn().substring(7)); diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderDeliveryHistoryService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderDeliveryHistoryService.java index 9967aed2b..48d880e1a 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderDeliveryHistoryService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderDeliveryHistoryService.java @@ -1,7 +1,6 @@ package com.wzj.soopin.order.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; import com.wzj.soopin.order.domain.query.OrderDeliveryHistoryQuery; import com.wzj.soopin.order.mapper.OrderDeliveryHistoryMapper; @@ -43,7 +42,7 @@ public class OrderDeliveryHistoryService { */ public List selectList(OrderDeliveryHistoryQuery query, Pageable page) { if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); Long orderId = query.getOrderId(); diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java index b635db81f..82b5bebcb 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java @@ -2,7 +2,6 @@ package com.wzj.soopin.order.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.member.domain.po.Member; import com.wzj.soopin.order.domain.dto.OrderProductListDTO; import com.wzj.soopin.order.domain.entity.OrderItem; @@ -50,7 +49,7 @@ public class OrderItemService extends ServiceImpl { */ public List selectList(OrderItemQuery query, Pageable page) { if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); Long orderId = query.getOrderId(); diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderOperateHistoryService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderOperateHistoryService.java index 5990c7ac6..20c67134d 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderOperateHistoryService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderOperateHistoryService.java @@ -3,7 +3,6 @@ package com.wzj.soopin.order.service; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.order.domain.entity.OrderOperateHistory; import com.wzj.soopin.order.domain.query.OrderOperateHistoryQuery; import com.wzj.soopin.order.mapper.OrderOperateHistoryMapper; @@ -45,7 +44,7 @@ public class OrderOperateHistoryService extends ServiceImpl selectList(OrderOperateHistoryQuery query, Pageable page) { if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); String orderSn = query.getOrderSn(); diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java index 5219412f5..bfd5f7127 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.goods.convert.SkuConvert; import com.wzj.soopin.goods.mapper.ProductMapper; import com.wzj.soopin.goods.mapper.SkuMapper; @@ -151,7 +150,7 @@ public class OrderService { */ public PageImpl selectList(ManagerOrderQueryForm query, Pageable page) { if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } if (!StringUtils.isEmpty(query.getUserPhone())){ query.setUserPhone(AesCryptoUtils.encrypt(aesKey, query.getUserPhone())); @@ -160,7 +159,7 @@ public class OrderService { if (CollectionUtil.isEmpty(managerOrderVOList)){ return new PageImpl<>(managerOrderVOList, page, 0); } - long total = ((com.github.pagehelper.Page) managerOrderVOList).getTotal(); + long total = managerOrderVOList.size(); Map orderMap = managerOrderVOList.stream().collect(Collectors.toMap(ManagerOrderVO::getId, it -> it, (v1,v2) -> v2, LinkedHashMap::new)); //查orderItem QueryWrapper qw = new QueryWrapper<>(); diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/WechatPaymentHistoryService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/WechatPaymentHistoryService.java index 7336a09d5..1577a6999 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/WechatPaymentHistoryService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/WechatPaymentHistoryService.java @@ -1,7 +1,6 @@ package com.wzj.soopin.order.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.wzj.soopin.order.domain.entity.WechatPaymentHistory; import com.wzj.soopin.order.domain.query.WechatPaymentHistoryQuery; import com.wzj.soopin.order.mapper.WechatPaymentHistoryMapper; @@ -44,7 +43,7 @@ public class WechatPaymentHistoryService { */ public List selectList(WechatPaymentHistoryQuery query, Pageable page) { if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); +// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); String paymentId = query.getPaymentId(); diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml index f0863dcdc..de475f4d2 100644 --- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and handle_man = #{handleMan} - SELECT a.id id, a.return_amount applyReturnAmount, a.quantity refundNum, @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where member_id=#{memberId} - select a.id, a.order_sn orderSn, @@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by a.create_time desc - select id orderId, pay_id, @@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - select id orderId, pay_id, @@ -220,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete_status=0 and id=#{orderId} - select IFNULL(sum(case when status=0 and aftersale_status=1 then 1 else 0 end),0) unpaid, IFNULL(sum(case when status=1 and aftersale_status=1 then 1 else 0 end),0) nosend, @@ -229,7 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from oms_order where member_id=#{memberId} and delete_status=0 - select IFNULL(count(id), 0) orderCount, IFNULL(sum(pay_amount), 0) orderAmount @@ -239,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select IFNULL(sum(case when status in (2,3) then 1 else 0 end), 0) todayHasDeliveredCount, IFNULL(count(id), 0) todayOrderCount, @@ -247,7 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from oms_order where create_time between #{startTime} and #{endTime} - select IFNULL(count(distinct member_id), 0) createOrderMemberCount, IFNULL(count(id), 0) orderCount,