[fix]修改各个模块的结构，启动项目

pom.xml

@@ -369,6 +369,7 @@
                 <version>${revision}</version>
             </dependency>
 
+
             <!--  工作流模块  -->
             <dependency>
                 <groupId>org.dromara</groupId>
@@ -395,13 +396,12 @@
 
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-pay</artifactId>
+                <artifactId>ruoyi-im</artifactId>
                 <version>${revision}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-aftersale</artifactId>
+                <artifactId>ruoyi-goods</artifactId>
                 <version>${revision}</version>
             </dependency>
 
@@ -427,7 +427,6 @@
         <module>ruoyi-common</module>
         <module>ruoyi-extend</module>
         <module>ruoyi-modules</module>
-        <module>ruoyi-front</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -63,6 +63,27 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-im</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-goods</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-content</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-member</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-order</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-job</artifactId>

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:
       # 主键类型

ruoyi-modules/ruoyi-content/pom.xml

@@ -42,6 +42,12 @@
             <groupId>com.qcloud</groupId>
             <artifactId>vod_api</artifactId>
             <version>2.1.5</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-reload4j</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- 通用工具-->
         <dependency>
@@ -130,12 +136,12 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-mongo</artifactId>
         </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.github.pagehelper</groupId>
+<!--            <groupId>com.github.pagehelper</groupId>-->
-            <artifactId>pagehelper</artifactId>
+<!--            <artifactId>pagehelper</artifactId>-->
-            <version>5.3.2</version>
+<!--            <version>5.3.2</version>-->
-            <scope>compile</scope>
+<!--            <scope>compile</scope>-->
-        </dependency>
+<!--        </dependency>-->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>

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, CommentVO> {
-    Comment selectByPrimaryKey(String id);
 
-    void delete(Comment pendingDelete);
 }

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;

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<Fans, FansVO> {
-    int updateByPrimaryKeySelective(Fans record);
     public List<Map<String, Object>> getFollowedVlogerIds(@Param("currentUserId")String currentUserId,@Param("vlogerIds")List<String> vlogerIds);
-
-    int insert(@Param("fansData") Map<String, Object> vlogData);
-
-    public List<VlogerVO> selectByExample(@Param("paramMap") Map<String, Object> map);
-
-    int delete(@Param("id") String id);
 }

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;

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;

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;

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;

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;

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;

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 {
 
     // 响应业务状态码

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.CommentMapper;
-import com.wzj.soopin.content.mapper.mapper.CommentMapperCustom;
+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;

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.FansMapper;
-import com.wzj.soopin.content.mapper.mapper.FansMapperCustom;
+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;

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;

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.FansMapper;
-import com.wzj.soopin.content.mapper.mapper.FansMapperCustom;
+import com.wzj.soopin.content.mapper.FansMapperCustom;
-import com.wzj.soopin.content.mapper.mapper.UserMemberMapper;
+import com.wzj.soopin.content.mapper.UserMemberMapper;
-import com.wzj.soopin.content.mapper.mapper.UsersMapper;
+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
+//	@Resource
-	private PasswordEncoder passwordEncoder;
+//	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));

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.MyLikedVlogMapper;
-import com.wzj.soopin.content.mapper.mapper.VlogMapper;
+import com.wzj.soopin.content.mapper.VlogMapper;
-import com.wzj.soopin.content.mapper.mapper.VlogMapperCustom;
+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;

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.CommentMapper" >
+<mapper namespace="com.wzj.soopin.content.mapper.CommentMapper" >
-  <resultMap id="BaseResultMap" type="com.imooc.pojo.Comment" >
+  <resultMap id="BaseResultMap" type="com.wzj.soopin.content.domain.po.Comment" >
     <!--
       WARNING - @mbg.generated
     -->
@@ -14,4 +14,4 @@
     <result column="like_counts" property="likeCounts" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
   </resultMap>
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/CommentMapperCustom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.CommentMapperCustom" >
+<mapper namespace="com.wzj.soopin.content.mapper.CommentMapperCustom" >
 
   <!--
       FIXME
@@ -8,7 +8,7 @@
       我们应该如何优化呢？使得sql脚本查询表位三表或者两表查询
       来实现呢又或者说我们能不能不使用数据库，使用别的手段（中间件）？mycat
    -->
-  <select id="getCommentList" parameterType="map" resultType="com.imooc.vo.CommentVO">
+  <select id="getCommentList" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.CommentVO">
 
       SELECT
           c.id as commentId,
@@ -43,4 +43,4 @@
           c.create_time DESC
   </select>
 
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapper.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.FansMapper" >
+<mapper namespace="com.wzj.soopin.content.mapper.FansMapper" >
 
 
 
 
-  <select id="getFollowedVlogerIds" resultType="com.imooc.pojo.Fans" parameterType="map">
+  <select id="getFollowedVlogerIds" resultType="com.wzj.soopin.content.domain.po.Fans" parameterType="map">
 
     SELECT vloger_id, is_fan_friend_of_mine FROM t_fans
     WHERE fan_id = #{currentUserId}

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/FansMapperCustom.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.FansMapperCustom" >
+<mapper namespace="com.wzj.soopin.content.mapper.FansMapperCustom" >
-  
+
-    <select id="queryMyFollows" resultType="com.imooc.vo.VlogerVO" parameterType="map">
+    <select id="queryMyFollows" resultType="com.wzj.soopin.content.domain.vo.VlogerVO" parameterType="map">
 
         SELECT
             u.id as vlogerId,
@@ -24,7 +24,7 @@
 
     </select>
 
-  <select id="queryMyFans" resultType="com.imooc.vo.FansVO" parameterType="map">
+  <select id="queryMyFans" resultType="com.wzj.soopin.content.domain.vo.FansVO" parameterType="map">
 
         SELECT
             u.id as fanId,
@@ -46,4 +46,4 @@
 
     </select>
 
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MyLikedVlogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.MyLikedVlogMapper" >
+<mapper namespace="com.wzj.soopin.content.mapper.MyLikedVlogMapper" >
-  <resultMap id="BaseResultMap" type="com.imooc.pojo.MyLikedVlog" >
+  <resultMap id="BaseResultMap" type="com.wzj.soopin.content.domain.po.MyLikedVlog" >
     <!--
       WARNING - @mbg.generated
     -->
@@ -11,4 +11,4 @@
     <result column="created_time" property="createdTime" jdbcType="TIMESTAMP" />
 
   </resultMap>
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UserMemberMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.UserMemberMapper">
+<mapper namespace="com.wzj.soopin.content.mapper.UserMemberMapper">
 
 	<resultMap id="BaseResultMap"
-		type="com.imooc.pojo.Users">
+		type="com.wzj.soopin.content.domain.po.Users">
 		<id column="id" property="id" jdbcType="VARCHAR" />
 		<result column="mobile" property="mobile" jdbcType="VARCHAR" />
 		<result column="nickname" property="nickname" jdbcType="VARCHAR" />
@@ -42,4 +42,4 @@
 		r_user_member t2 ON t1.id=t2.user_id
 		WHERE t2.member_id=#{memberId}
 	</select>
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/UsersMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.UsersMapper" >
+<mapper namespace="com.wzj.soopin.content.mapper.UsersMapper" >
-  <resultMap id="BaseResultMap" type="com.imooc.pojo.Users" >
+  <resultMap id="BaseResultMap" type="com.wzj.soopin.content.domain.po.Users" >
     <!--
       WARNING - @mbg.generated
     -->
@@ -24,4 +24,4 @@
     <result column="password" property="password" jdbcType="VARCHAR" />
 
   </resultMap>
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
-<mapper namespace="com.imooc.mapper.VlogMapper">
+<mapper namespace="com.wzj.soopin.content.mapper.VlogMapper">
 <!--  通用更新  -->
   <update id="dynamicUpdate">
     UPDATE t_vlog
@@ -70,7 +70,7 @@
   </insert>
 
 <!-- 查询 -->
-  <select id="selectMyPublic" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+  <select id="selectMyPublic" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
     SELECT
     v.id as vlogId,
     v.vloger_id as vlogerId,
@@ -124,7 +124,7 @@
   </select>
 
 
-  <select id="getVlogDetailFromId" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+  <select id="getVlogDetailFromId" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
     SELECT
     v.id as vlogId,
     v.vloger_id as vlogerId,

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.imooc.mapper.VlogMapperCustom" >
+<mapper namespace="com.wzj.soopin.content.mapper.VlogMapperCustom" >
 
-  <select id="getIndexVlogList" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+  <select id="getIndexVlogList" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
     SELECT
 		v.id as vlogId,
         v.vloger_id as vlogerId,
@@ -62,7 +62,7 @@
   </select>
 
 
-    <select id="getVlogDetailById" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+    <select id="getVlogDetailById" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
         SELECT
             v.id as vlogId,
             v.vloger_id as vlogerId,
@@ -93,7 +93,7 @@
           AND v.first_frame_img IS NOT NULL
     </select>
 
-    <select id="getMyLikedVlogList" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+    <select id="getMyLikedVlogList" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
         SELECT
             v.id as vlogId,
             v.vloger_id as vlogerId,
@@ -144,7 +144,7 @@
         DESC
     </select>
 
-    <select id="getMyFollowVlogList" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+    <select id="getMyFollowVlogList" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
         SELECT
             v.id as vlogId,
             v.vloger_id as vlogerId,
@@ -184,7 +184,7 @@
         DESC
     </select>
 
-    <select id="getMyFriendVlogList" parameterType="map" resultType="com.imooc.vo.IndexVlogVO">
+    <select id="getMyFriendVlogList" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
         SELECT
             v.id as vlogId,
             v.vloger_id as vlogerId,
@@ -226,4 +226,4 @@
         DESC
     </select>
 
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-goods/pom.xml

@@ -104,11 +104,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.6</version>
-        </dependency>
 
     </dependencies>
 </project>

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("查询品牌管理列表")
+//    @ApiOperation("查询品牌管理列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<Brand>> list(@RequestBody BrandQuery query, Pageable page) {
+//    public ResponseEntity<Page<Brand>> list(@RequestBody BrandQuery query, Pageable page) {
-        List<Brand> list = service.selectList(query, page);
+//        List<Brand> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
     @ApiOperation("所有品牌管理列表")
     @PostMapping("/all")
     public ResponseEntity<List<Brand>> all(@RequestBody BrandQuery query) {

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("查询商品信息列表")
+//    @ApiOperation("查询商品信息列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<Product>> list(@RequestBody ProductQuery query, Pageable page) {
+//    public ResponseEntity<Page<Product>> list(@RequestBody ProductQuery query, Pageable page) {
-        List<Product> list = service.selectList(query, page);
+//        List<Product> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出商品信息列表")
     @Log(title = "商品信息", businessType = BusinessType.EXPORT)

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信息列表")
+//    @ApiOperation("查询sku信息列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<Sku>> list(@RequestBody SkuQuery query, Pageable page) {
+//    public ResponseEntity<Page<Sku>> list(@RequestBody SkuQuery query, Pageable page) {
-        List<Sku> list = service.selectList(query, page);
+//        List<Sku> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出sku信息列表")
     @Log(title = "sku信息", businessType = BusinessType.EXPORT)

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<Brand> selectList(BrandQuery query, Pageable page) {
-        if (page != null) {
+//        if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
-        }
+//        }
         QueryWrapper<Brand> qw = new QueryWrapper<>();
         String nameLike = query.getNameLike();
         if (!StringUtils.isEmpty(nameLike)) {

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<ProductCategoryVO> selectList(ProductCategoryQuery query, Pageable page) {
-        if (page != null) {
+//        if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
-        }
+//        }
         QueryWrapper<ProductCategory> qw = new QueryWrapper<>();
         Long parentId = query.getParentId();
         if (parentId != null) {

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<Product> selectList(ProductQuery query, Pageable page) {
-        if (page != null) {
+//        if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
-        }
+//        }
         QueryWrapper<Product> 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<Sku> 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());

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<Sku> selectList(SkuQuery query, Pageable page) {
-        if (page != null) {
+//        if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
-        }
+//        }
         QueryWrapper<Sku> qw = new QueryWrapper<>();
         Long productId = query.getProductId();
         if (productId != null) {

ruoyi-modules/ruoyi-im/pom.xml

@@ -1,37 +1,113 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.dromara</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>5.3.1</version>
+        <version>${revision}</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ruoyi-im</artifactId>
 
-    <name>Maven</name>
+    <description>
-    <url>http://maven.apache.org/</url>
+        system系统模块
-    <inceptionYear>2001</inceptionYear>
+    </description>
 
-    <distributionManagement>
+    <dependencies>
-        <site>
+        <!-- 通用工具-->
-            <id>website</id>
+        <dependency>
-            <url>scp://webhost.company.com/www/website</url>
+            <groupId>org.dromara</groupId>
-        </site>
+            <artifactId>ruoyi-common-core</artifactId>
-    </distributionManagement>
+        </dependency>
 
-    <properties>
+        <dependency>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            <groupId>org.dromara</groupId>
-    </properties>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
 
-    <build>
+        <dependency>
-        <plugins>
+            <groupId>org.dromara</groupId>
-            <plugin>
+            <artifactId>ruoyi-common-mybatis</artifactId>
-                <artifactId>maven-site-plugin</artifactId>
+        </dependency>
-                <configuration>
+
-                    <locales>en,fr</locales>
+        <dependency>
-                </configuration>
+            <groupId>org.dromara</groupId>
-            </plugin>
+            <artifactId>ruoyi-common-translation</artifactId>
-        </plugins>
+        </dependency>
-    </build>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sse</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.github.pagehelper</groupId>-->
+<!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
+<!--            <version>1.4.6</version>-->
+<!--        </dependency>-->
+    </dependencies>
 </project>

ruoyi-modules/ruoyi-im/src/site/apt/format.apt

@@ -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
-  <<</home/joe/docs/mylogo.jpeg>>>, the figure name is
-  <<</home/joe/docs/mylogo>>>.
-
-  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 <<</home/joe/docs/mylogo>>>. A APT processor will
-  first try to load <<</home/joe/docs/mylogo.eps>>>. 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
-  <<</home/joe/docs/mylogo.jpeg>>> 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
-~~~~~~~~
-
-+-----------------------------------------------------+
-  <Italic> font. <<Bold>> font. <<<Monospaced>>> 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 <external> anchors. Text beginning
-  with <<<http:/>>>, <<<https:/>>>, <<<ftp:/>>>, <<<file:/>>>, <<<mailto:>>>,
-  <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as
-  an external anchor name.
-
-  When the construct <<\{\{\{>><name><<}>><text><<}}>> is used, the link text
-  <text> may differ from the link name <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>>><NN> notation, where <NN> are two hexadecimal
-  digits.
-
-  Unicode characters may be specified by their codes using the <<<\u>>><NNNN>
-  notation, where <NNNN> 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.
-
-  <Italic> font. <<Bold>> font. <<<Monospaced>>> 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.
-
-------------------------------------------------------------------------------
-

ruoyi-modules/ruoyi-im/src/site/apt/index.apt

@@ -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
-
-+-----+

ruoyi-modules/ruoyi-im/src/site/fml/faq.fml

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/FML/1.0"
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"
-  id="General FAQ">
-  <part id="General">
-    <faq id="where">
-      <question>Where did Maven come from?</question>
-      <answer>
-        <p>
-          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!
-        </p>
-      </answer>
-    </faq>
-    <faq id="why">
-      <question>Why is Maven so wildly popular?</question>
-      <answer>
-        <p>
-          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!
-        </p>
-      </answer>
-    </faq>
-  </part>
-</faqs>

ruoyi-modules/ruoyi-im/src/site/fr/apt/format.apt

@@ -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
-  <<</home/joe/docs/mylogo.jpeg>>>, the figure name is
-  <<</home/joe/docs/mylogo>>>.
-
-  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 <<</home/joe/docs/mylogo>>>. A APT processor will
-  first try to load <<</home/joe/docs/mylogo.eps>>>. 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
-  <<</home/joe/docs/mylogo.jpeg>>> 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
-~~~~~~~~
-
-+-----------------------------------------------------+
-  <Italic> font. <<Bold>> font. <<<Monospaced>>> 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 <external> anchors. Text beginning
-  with <<<http:/>>>, <<<https:/>>>, <<<ftp:/>>>, <<<file:/>>>, <<<mailto:>>>,
-  <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as
-  an external anchor name.
-
-  When the construct <<\{\{\{>><name><<}>><text><<}}>> is used, the link text
-  <text> may differ from the link name <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>>><NN> notation, where <NN> are two hexadecimal
-  digits.
-
-  Unicode characters may be specified by their codes using the <<<\u>>><NNNN>
-  notation, where <NNNN> 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.
-
-  <Italic> font. <<Bold>> font. <<<Monospaced>>> 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.
-
-------------------------------------------------------------------------------
-

ruoyi-modules/ruoyi-im/src/site/fr/apt/index.apt

@@ -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
-
-+-----+

ruoyi-modules/ruoyi-im/src/site/fr/fml/faq.fml

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/FML/1.0"
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"
-  id="FAQ Général">
-  <part id="General">
-    <faq id="where">
-      <question>D'où vient Maven ?</question>
-      <answer>
-        <p>
-          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!
-        </p>
-      </answer>
-    </faq>
-    <faq id="why">
-      <question>Pourquoi Maven est-il si populaire ?</question>
-      <answer>
-        <p>
-          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!
-        </p>
-      </answer>
-    </faq>
-  </part>
-</faqs>

ruoyi-modules/ruoyi-im/src/site/fr/xdoc/xdoc.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title>Bienvenue</title>
-    <author email="dev@maven.apache.org">The Maven Team</author>
-  </properties>
-
-  <body>
-    <section name="Bienvenue dans un fichier XDOC!">
-      <p>
-        Ceci est du texte pour le fichier xdoc.
-      </p>
-    </section>
-  </body>
-</document>
-

ruoyi-modules/ruoyi-im/src/site/site.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
-  <bannerLeft>
-    <name>Maven</name>
-    <src>http://maven.apache.org/images/apache-maven-project.png</src>
-    <href>http://maven.apache.org/</href>
-  </bannerLeft>
-  <bannerRight>
-    <src>http://maven.apache.org/images/maven-small.gif</src>
-  </bannerRight>
-
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Maven 1.0" href="http://maven.apache.org/"/>
-      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
-    </links>
-
-    <menu name="Maven 2.0">
-      <item name="APT Format" href="format.html"/>
-      <item name="FAQ" href="faq.html"/>
-      <item name="Xdoc Example" href="xdoc.html"/>
-    </menu>
-  </body>
-</project>

ruoyi-modules/ruoyi-im/src/site/site_fr.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
-  <bannerLeft>
-    <name>Maven</name>
-    <src>http://maven.apache.org/images/apache-maven-project.png</src>
-    <href>http://maven.apache.org/</href>
-  </bannerLeft>
-  <bannerRight>
-    <src>http://maven.apache.org/images/maven-small.gif</src>
-  </bannerRight>
-
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Maven 1.0" href="http://maven.apache.org/"/>
-      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
-    </links>
-
-    <menu name="Maven 2.0">
-      <item name="Format APT" href="format.html"/>
-      <item name="FAQ" href="faq.html"/>
-      <item name="Exemple Xdoc" href="xdoc.html"/>
-    </menu>
-  </body>
-</project>

ruoyi-modules/ruoyi-im/src/site/xdoc/xdoc.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-  <properties>
-    <title>Welcome</title>
-    <author email="dev@maven.apache.org">The Maven Team</author>
-  </properties>
-
-  <body>
-    <section name="Welcome to an XDOC file!">
-      <p>
-        This is some text for the xdoc file.
-      </p>
-    </section>
-  </body>
-</document>
-

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() {
+    public QueryWrapper<MemberAddress> toWrapper() {
-        return super.toWrapper();
+        return null;
     }
 }

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<Long> ids) {
         LambdaQueryWrapper<MemberAddress> 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<MemberAddress> qw = new LambdaQueryWrapper<>();
-        qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId());
+//        qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId());
         qw.eq(MemberAddress::getId, id);
         return memberAddressMapper.selectOne(qw);
     }

ruoyi-modules/ruoyi-member/src/main/resources/ums/AddressMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.AddressMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.AddressMapper">
-    
+
     <resultMap type="Address" id="AddressResult">
         <result property="id" column="id"/>
         <result property="code" column="code"/>
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="Address" resultMap="AddressResult">
         <include refid="selectAddressVo"/>
-        <where>  
+        <where>
             <if test="code != null "> and code = #{code}</if>
             <if test="parentCode != null "> and parent_code = #{parentCode}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>

ruoyi-modules/ruoyi-member/src/main/resources/ums/FeedbackMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.FeedbackMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.FeedbackMapper">
-    
+
     <resultMap type="Feedback" id="FeedbackResult">
         <result property="id" column="id"/>
         <result property="type" column="type"/>
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="Feedback" resultMap="FeedbackResult">
         <include refid="selectFeedbackVo"/>
-        <where>  
+        <where>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="images != null  and images != ''"> and images = #{images}</if>

ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAccountMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.MemberAccountMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.MemberAccountMapper">
-    
+
     <resultMap type="MemberAccount" id="MemberAccountResult">
         <result property="memberId" column="member_id"/>
         <result property="integralBalance" column="integral_balance"/>
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="MemberAccount" resultMap="MemberAccountResult">
         <include refid="selectMemberAccountVo"/>
-        <where>  
+        <where>
             <if test="integralBalance != null "> and integral_balance = #{integralBalance}</if>
             <if test="totalIntegralBalance != null "> and total_integral_balance = #{totalIntegralBalance}</if>
         </where>

ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAddressMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.MemberAddressMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.MemberAddressMapper">
-    
+
     <resultMap type="MemberAddress" id="MemberAddressResult">
         <result property="id" column="id"/>
         <result property="memberId" column="member_id"/>
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="MemberAddress" resultMap="MemberAddressResult">
         <include refid="selectMemberAddressVo"/>
-        <where>  
+        <where>
             <if test="memberId != null "> and member_id = #{memberId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="defaultStatus != null "> and default_status = #{defaultStatus}</if>

ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberCartMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.MemberCartMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.MemberCartMapper">
-    
+
     <resultMap type="MemberCart" id="MemberCartResult">
         <result property="id" column="id"/>
         <result property="status" column="status"/>
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="MemberCart" resultMap="MemberCartResult">
         <include refid="selectMemberCartVo"/>
-        <where>  
+        <where>
             <if test="status != null "> and status = #{status}</if>
             <if test="memberId != null "> and member_id = #{memberId}</if>
             <if test="productId != null "> and product_id = #{productId}</if>

ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberLogininforMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.MemberLogininforMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.MemberLogininforMapper">
-    
+
     <resultMap type="MemberLogininfor" id="MemberLogininforResult">
         <result property="id" column="id"/>
         <result property="phone" column="phone"/>
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="MemberLogininfor" resultMap="MemberLogininforResult">
         <include refid="selectMemberLogininforVo"/>
-        <where>  
+        <where>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="memberId != null "> and member_id = #{memberId}</if>
             <if test="ipaddr != null  and ipaddr != ''"> and ipaddr = #{ipaddr}</if>

ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.MemberMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.MemberMapper">
-    
+
     <resultMap type="Member" id="MemberResult">
         <result property="id" column="id"/>
         <result property="nickname" column="nickname"/>
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="Member" resultMap="MemberResult">
         <include refid="selectMemberVo"/>
-        <where>  
+        <where>
             <if test="nickname != null  and nickname != ''"> and nickname like concat('%', #{nickname}, '%')</if>
             <if test="password != null  and password != ''"> and password = #{password}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>

ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberWechatMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyl.manager.ums.mapper.MemberWechatMapper">
+<mapper namespace="com.wzj.soopin.member.mapper.MemberWechatMapper">
-    
+
     <resultMap type="MemberWechat" id="MemberWechatResult">
         <result property="id" column="id"/>
         <result property="memberId" column="member_id"/>
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByEntity" parameterType="MemberWechat" resultMap="MemberWechatResult">
         <include refid="selectMemberWechatVo"/>
-        <where>  
+        <where>
             <if test="memberId != null "> and member_id = #{memberId}</if>
             <if test="unionid != null  and unionid != ''"> and unionid = #{unionid}</if>
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>

ruoyi-modules/ruoyi-order/pom.xml

@@ -103,12 +103,12 @@
             <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.github.pagehelper</groupId>
+<!--            <groupId>com.github.pagehelper</groupId>-->
-            <artifactId>pagehelper</artifactId>
+<!--            <artifactId>pagehelper</artifactId>-->
-            <version>5.3.2</version>
+<!--            <version>5.3.2</version>-->
-            <scope>compile</scope>
+<!--            <scope>compile</scope>-->
-        </dependency>
+<!--        </dependency>-->
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-member</artifactId>
@@ -119,7 +119,6 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-goods</artifactId>
             <version>5.3.1</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -133,7 +132,6 @@
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-common-protos</artifactId>
             <version>2.41.0</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>

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("查询订单售后列表")
+//    @ApiOperation("查询订单售后列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<ManagerRefundOrderVO>> list(@RequestBody ManagerAftersaleOrderForm query, Pageable page) {
+//    public ResponseEntity<Page<ManagerRefundOrderVO>> list(@RequestBody ManagerAftersaleOrderForm query, Pageable page) {
-        List<ManagerRefundOrderVO> list = service.selectList(query, page);
+//        List<ManagerRefundOrderVO> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出订单售后列表")
     @Log(title = "订单售后", businessType = BusinessType.EXPORT)

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("查询订单售后列表")
+//    @ApiOperation("查询订单售后列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<AftersaleItem>> list(@RequestBody AftersaleItemQuery query, Pageable page) {
+//    public ResponseEntity<Page<AftersaleItem>> list(@RequestBody AftersaleItemQuery query, Pageable page) {
-        List<AftersaleItem> list = service.selectList(query, page);
+//        List<AftersaleItem> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出订单售后列表")
     @Log(title = "订单售后", businessType = BusinessType.EXPORT)

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("查询订单发货记录列表")
+//    @ApiOperation("查询订单发货记录列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<OrderDeliveryHistory>> list(@RequestBody OrderDeliveryHistoryQuery query, Pageable page) {
+//    public ResponseEntity<Page<OrderDeliveryHistory>> list(@RequestBody OrderDeliveryHistoryQuery query, Pageable page) {
-        List<OrderDeliveryHistory> list = service.selectList(query, page);
+//        List<OrderDeliveryHistory> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出订单发货记录列表")
     @Log(title = "订单发货记录", businessType = BusinessType.EXPORT)

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("查询订单中所包含的商品列表")
+//    @ApiOperation("查询订单中所包含的商品列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<OrderItem>> list(@RequestBody OrderItemQuery query, Pageable page) {
+//    public ResponseEntity<Page<OrderItem>> list(@RequestBody OrderItemQuery query, Pageable page) {
-        List<OrderItem> list = service.selectList(query, page);
+//        List<OrderItem> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出订单中所包含的商品列表")
     @Log(title = "订单中所包含的商品", businessType = BusinessType.EXPORT)

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("查询订单操作历史记录列表")
+//    @ApiOperation("查询订单操作历史记录列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<OrderOperateHistory>> list(@RequestBody OrderOperateHistoryQuery query, Pageable page) {
+//    public ResponseEntity<Page<OrderOperateHistory>> list(@RequestBody OrderOperateHistoryQuery query, Pageable page) {
-        List<OrderOperateHistory> list = service.selectList(query, page);
+//        List<OrderOperateHistory> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出订单操作历史记录列表")
     @Log(title = "订单操作历史记录", businessType = BusinessType.EXPORT)

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("查询微信订单表列表")
+//    @ApiOperation("查询微信订单表列表")
-    @PostMapping("/list")
+//    @PostMapping("/list")
-    public ResponseEntity<Page<WechatPaymentHistory>> list(@RequestBody WechatPaymentHistoryQuery query, Pageable page) {
+//    public ResponseEntity<Page<WechatPaymentHistory>> list(@RequestBody WechatPaymentHistoryQuery query, Pageable page) {
-        List<WechatPaymentHistory> list = service.selectList(query, page);
+//        List<WechatPaymentHistory> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+//        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
-    }
+//    }
 
     @ApiOperation("导出微信订单表列表")
     @Log(title = "微信订单表", businessType = BusinessType.EXPORT)

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;

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<AftersaleItem> selectList(AftersaleItemQuery query, Pageable page) {
-        if (page != null) {
+//        if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
-        }
+//        }
         QueryWrapper<AftersaleItem> qw = new QueryWrapper<>();
         Long memberId = query.getMemberId();
         if (memberId != null) {

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<ManagerRefundOrderVO> 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));

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<OrderDeliveryHistory> selectList(OrderDeliveryHistoryQuery query, Pageable page) {
         if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         QueryWrapper<OrderDeliveryHistory> qw = new QueryWrapper<>();
         Long orderId = query.getOrderId();

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<OrderItemMapper, OrderItem> {
      */
     public List<OrderItem> selectList(OrderItemQuery query, Pageable page) {
         if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         QueryWrapper<OrderItem> qw = new QueryWrapper<>();
         Long orderId = query.getOrderId();

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<OrderOperateHistoryM
      */
     public List<OrderOperateHistory> selectList(OrderOperateHistoryQuery query, Pageable page) {
         if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         QueryWrapper<OrderOperateHistory> qw = new QueryWrapper<>();
         String orderSn = query.getOrderSn();

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<ManagerOrderVO> 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<Long, ManagerOrderVO> orderMap = managerOrderVOList.stream().collect(Collectors.toMap(ManagerOrderVO::getId, it -> it, (v1,v2) -> v2, LinkedHashMap::new));
         //查orderItem
         QueryWrapper<OrderItem> qw = new QueryWrapper<>();

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<WechatPaymentHistory> selectList(WechatPaymentHistoryQuery query, Pageable page) {
         if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
+//            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         QueryWrapper<WechatPaymentHistory> qw = new QueryWrapper<>();
         String paymentId = query.getPaymentId();

ruoyi-modules/ruoyi-order/src/main/resources/mapper/AftersaleMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="handleMan != null  and handleMan != ''"> and handle_man = #{handleMan}</if>
         </where>
     </select>
-    <select id="selectManagerRefundOrder" resultType="com.cyl.manager.oms.domain.vo.ManagerRefundOrderVO">
+    <select id="selectManagerRefundOrder" resultType="com.wzj.soopin.order.domain.vo.ManagerRefundOrderVO">
         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>
     <select id="statPendingAndProcessing"
-            resultType="com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO">
+            resultType="com.wzj.soopin.order.domain.vo.OrderAndAftersaleStatisticsVO">
         select
             IFNULL(sum(case when status=0 then 1 else 0 end), 0) pendingAftersaleCount,
             IFNULL(sum(case when status=1 then 1 else 0 end), 0) processingAftersaleCount

ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
         </where>
     </select>
-    <select id="selectManagerOrderPage" resultType="com.cyl.manager.oms.domain.vo.ManagerOrderVO">
+    <select id="selectManagerOrderPage" resultType="com.wzj.soopin.order.domain.vo.ManagerOrderVO">
         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>
 
-    <select id="orderPage" resultType="com.cyl.h5.domain.vo.H5OrderVO">
+    <select id="orderPage" resultType="com.wzj.soopin.order.domain.vo.H5OrderVO">
         select
         id orderId,
         pay_id,
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by create_time desc
     </select>
-    <select id="selectOrderDetail" resultType="com.cyl.h5.domain.vo.H5OrderVO">
+    <select id="selectOrderDetail" resultType="com.wzj.soopin.order.domain.vo.H5OrderVO">
         select
         id orderId,
         pay_id,
@@ -220,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete_status=0
         and id=#{orderId}
     </select>
-    <select id="countByStatusAndMemberId" resultType="com.cyl.h5.domain.vo.CountOrderVO">
+    <select id="countByStatusAndMemberId" resultType="com.wzj.soopin.order.domain.vo.CountOrderVO">
         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>
-    <select id="statOrderCountAndAmount" resultType="com.cyl.manager.ums.domain.vo.MemberDataStatisticsVO">
+    <select id="statOrderCountAndAmount" resultType="com.wzj.soopin.order.domain.vo.MemberDataStatisticsVO">
         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 id="statWaitDelivered" resultType="java.lang.Integer">
         select IFNULL(count(id), 0) from oms_order where status=1 and aftersale_status=1
     </select>
-    <select id="statTodayData" resultType="com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO">
+    <select id="statTodayData" resultType="com.wzj.soopin.order.domain.vo.OrderAndAftersaleStatisticsVO">
         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>
-    <select id="statNewAndDeal" resultType="com.cyl.manager.aws.domain.entity.SystemStatistics">
+    <select id="statNewAndDeal" resultType="com.wzj.soopin.order.domain.entity.SystemStatistics">
         select
             IFNULL(count(distinct member_id), 0) createOrderMemberCount,
             IFNULL(count(id), 0) orderCount,