分服务

jiangqs

2023-04-30 dca0031ad5552679d6dfbb80d6edd7adbfc7ec2c

分服务

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.system.api;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.factory.RemoteActivityFallbackFactory;
import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @author jqs34
 * @version 1.0
 * @classname RemoteActivityService
 * @description: TODO
 * @date 2023 2023/4/30 15:12
 */
@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
public interface RemoteActivityService {

    @PostMapping("/activity/getActivityGoods")
    public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId);
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.system.api;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.factory.RemoteActivityFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @author jqs34
 * @version 1.0
 * @classname RemoteConfigService
 * @description: TODO
 * @date 2023 2023/4/30 15:58
 */
@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
public interface RemoteConfigService {

    @PostMapping("/config/getSysTag")
    public R<SysTag> getSysTag(@RequestBody Long sysTagId);
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java

@@ -13,7 +13,7 @@
/**
 * 文件服务
 * 
 * @author ruoyi
 * @author jqs
 */
@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
public interface RemoteFileService

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java

@@ -14,7 +14,7 @@
/**
 * 日志服务
 * 
 * @author ruoyi
 * @author jqs
 */
@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
public interface RemoteLogService

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java

@@ -16,4 +16,12 @@
    @PostMapping("/member/getMember")
    public R<Member> getMember(@RequestBody Long userId);

    /**
     * 小程序登录
     * @param appMiniLoginDto
     * @return
     */
    @PostMapping("/user/miniLogin")
    public R<AppMiniLoginVo> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto);

}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -18,7 +18,7 @@
/**
 * 用户服务
 * 
 * @author ruoyi
 * @author jqs
 */
@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
public interface RemoteUserService
@@ -43,12 +43,36 @@
    @PostMapping("/user/register")
    public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);




    /**
     * 小程序登录
     * @param appMiniLoginDto
     * @return
    * @description: TODO
    * @author jqs34
    * @date 2023/4/30 15:36
    * @version 1.0
    */
    @PostMapping("/user/getSysUser")
    public R<SysUser> getSysUser(@RequestBody Long userId);

    /**
     * @description: 更新用户手机
     * @author jqs34
     * @date 2023/4/30 15:32
     * @version 1.0
     */
    @PostMapping("/user/miniLogin")
    public R<AppMiniLoginVo> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto);
    @PostMapping("/user/registerUser")
    public R registerUser(@RequestBody SysUser sysUser);



    /**
    * @description: 更新用户手机
    * @author jqs34
    * @date 2023/4/30 15:32
    * @version 1.0
    */
    @PostMapping("/user/updateUserMobile")
    public R updateUserMobile(@RequestBody SysUser sysUser);

}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/activity/ActivityGoods.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/activity/ActivityGoods.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.activity;
package com.ruoyi.system.api.domain.poji.activity;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysClassification.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysClassification.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.config;
package com.ruoyi.system.api.domain.poji.config;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysTag.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysTag.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.config;
package com.ruoyi.system.api.domain.poji.config;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java

@@ -13,7 +13,7 @@
/**
 * 部门表 sys_dept
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysDept extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictData.java

@@ -12,7 +12,7 @@
/**
 * 字典数据表 sys_dict_data
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysDictData extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictType.java

@@ -12,7 +12,7 @@
/**
 * 字典类型表 sys_dict_type
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysDictType extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysFile.java

@@ -6,7 +6,7 @@
/**
 * 文件信息
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysFile
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java

@@ -9,7 +9,7 @@
/**
 * 系统访问记录表 sys_logininfor
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysLogininfor extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java

@@ -9,7 +9,7 @@
/**
 * 操作日志记录表 oper_log
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysOperLog extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysRole.java

@@ -13,7 +13,7 @@
/**
 * 角色表 sys_role
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysRole extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java

@@ -15,7 +15,7 @@
/**
 * 用户对象 sys_user
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysUser extends BaseEntity
{

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java

New file
@@ -0,0 +1,41 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 活动服务
 * 
 * @author jqs
 */
@Component
public class RemoteActivityFallbackFactory implements FallbackFactory<RemoteActivityService>
{
    private static final Logger log = LoggerFactory.getLogger(RemoteActivityFallbackFactory.class);

    @Override
    public RemoteActivityService create(Throwable throwable)
    {
        log.error("活动服务调用失败:{}", throwable.getMessage());
        return new RemoteActivityService()
        {

            @Override
            public R<ActivityGoods> getActivityGoods(String goodsId) {
                return R.fail("获取活动商品失败:" + throwable.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java

New file
@@ -0,0 +1,36 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.system.api.RemoteConfigService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

/**
 * 系统配置服务
 * 
 * @author jqs
 */
@Component
public class RemoteConfigFallbackFactory implements FallbackFactory<RemoteConfigService>
{
    private static final Logger log = LoggerFactory.getLogger(RemoteConfigFallbackFactory.class);

    @Override
    public RemoteConfigService create(Throwable throwable)
    {
        log.error("系统配置服务调用失败:{}", throwable.getMessage());
        return new RemoteConfigService()
        {

            @Override
            public R<SysTag> getSysTag(Long sysTagId) {
                return R.fail("获取系统标签失败:" + throwable.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java

@@ -12,7 +12,7 @@
/**
 * 文件服务降级处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java

@@ -12,7 +12,7 @@
/**
 * 日志服务降级处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java

@@ -16,9 +16,9 @@
import org.springframework.web.multipart.MultipartFile;

/**
 * 用户服务降级处理
 * 会员服务
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class RemoteMemberFallbackFactory implements FallbackFactory<RemoteMemberService>
@@ -36,6 +36,12 @@
            {
                return R.fail("获取会员失败:" + throwable.getMessage());
            }

            @Override
            public R<AppMiniLoginVo> miniLogin(AppMiniLoginDto appMiniLoginDto)
            {
                return R.fail("登录用户失败:" + throwable.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java

@@ -8,9 +8,9 @@
import org.springframework.stereotype.Component;

/**
 * 用户服务降级处理
 * 订单服务
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class RemoteOrderFallbackFactory implements FallbackFactory<RemoteOrderService>

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java

@@ -8,9 +8,9 @@
import org.springframework.stereotype.Component;

/**
 * 用户服务降级处理
 * 商户服务
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class RemoteShopFallbackFactory implements FallbackFactory<RemoteShopService>

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -12,9 +12,9 @@
import com.ruoyi.system.api.model.LoginUser;

/**
 * 用户服务降级处理
 * 用户服务
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
@@ -39,10 +39,21 @@
                return R.fail("注册用户失败:" + throwable.getMessage());
            }



            @Override
            public R<AppMiniLoginVo> miniLogin(AppMiniLoginDto appMiniLoginDto)
            {
                return R.fail("登录用户失败:" + throwable.getMessage());
            public R<SysUser> getSysUser(Long userId) {
                return R.fail("获取用户失败:" + throwable.getMessage());
            }

            @Override
            public R registerUser(SysUser sysUser) {
                return R.fail("注册用户失败:" + throwable.getMessage());
            }

            @Override
            public R updateUserMobile(SysUser sysUser) {
                return R.fail("更新用户手机失败:" + throwable.getMessage());
            }
        };
    }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java

@@ -7,7 +7,7 @@
/**
 * 用户信息
 *
 * @author ruoyi
 * @author jqs
 */
public class LoginUser implements Serializable
{

 ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -8,7 +8,7 @@
/**
 * 认证授权中心
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -24,7 +24,7 @@
/**
 * token 控制
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
public class TokenController

 ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java

@@ -3,7 +3,7 @@
/**
 * 用户登录对象
 * 
 * @author ruoyi
 * @author jqs
 */
public class LoginBody
{

 ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java

@@ -3,7 +3,7 @@
/**
 * 用户注册对象
 * 
 * @author ruoyi
 * @author jqs
 */
public class RegisterBody extends LoginBody
{

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,5 +1,6 @@
package com.ruoyi.auth.service;

import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,13 +24,16 @@
/**
 * 登录校验方法
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class SysLoginService
{
    @Autowired
    private RemoteUserService remoteUserService;

    @Autowired
    private RemoteMemberService remoteMemberService;

    @Autowired
    private SysPasswordService passwordService;
@@ -109,7 +113,7 @@
    public AppMiniLoginVo miniLogin(AppMiniLoginDto appMiniLoginDto)
    {
        // 查询用户信息
        R<AppMiniLoginVo> userResult = remoteUserService.miniLogin(appMiniLoginDto);
        R<AppMiniLoginVo> userResult = remoteMemberService.miniLogin(appMiniLoginDto);
        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java

@@ -13,7 +13,7 @@
/**
 * 登录密码方法
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class SysPasswordService

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java

@@ -12,7 +12,7 @@
/**
 * 记录日志方法
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class SysRecordLogService

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java

@@ -12,7 +12,7 @@
/**
 * 自定义导出Excel数据注解
 * 
 * @author ruoyi
 * @author jqs
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java

@@ -8,7 +8,7 @@
/**
 * Excel注解集
 * 
 * @author ruoyi
 * @author jqs
 */
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java

@@ -3,7 +3,7 @@
/**
 * 缓存常量信息
 * 
 * @author ruoyi
 * @author jqs
 */
public class CacheConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -3,7 +3,7 @@
/**
 * 通用常量信息
 * 
 * @author ruoyi
 * @author jqs
 */
public class Constants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java

@@ -3,7 +3,7 @@
/**
 * 代码生成通用常量
 * 
 * @author ruoyi
 * @author jqs
 */
public class GenConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java

@@ -3,7 +3,7 @@
/**
 * 返回状态码
 * 
 * @author ruoyi
 * @author jqs
 */
public class HttpStatus
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java

@@ -3,7 +3,7 @@
/**
 * 任务调度通用常量
 * 
 * @author ruoyi
 * @author jqs
 */
public class ScheduleConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@@ -3,7 +3,7 @@
/**
 * 权限相关通用常量
 * 
 * @author ruoyi
 * @author jqs
 */
public class SecurityConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -3,7 +3,7 @@
/**
 * 服务名称
 * 
 * @author ruoyi
 * @author jqs
 */
public class ServiceNameConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java

@@ -3,7 +3,7 @@
/**
 * Token的Key常量
 * 
 * @author ruoyi
 * @author jqs
 */
public class TokenConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java

@@ -3,7 +3,7 @@
/**
 * 用户常量信息
 * 
 * @author ruoyi
 * @author jqs
 */
public class UserConstants
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@@ -11,7 +11,7 @@
 * 获取当前线程变量中的 用户id、用户名称、Token等信息 
 * 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
 *
 * @author ruoyi
 * @author jqs
 */
public class SecurityContextHolder
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -6,7 +6,7 @@
/**
 * 响应信息主体
 *
 * @author ruoyi
 * @author jqs
 */
public class R<T> implements Serializable
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java

@@ -3,7 +3,7 @@
/**
 * 用户状态
 * 
 * @author ruoyi
 * @author jqs
 */
public enum UserStatus
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java

@@ -3,7 +3,7 @@
/**
 * 验证码错误异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class CaptchaException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java

@@ -3,7 +3,7 @@
/**
 * 检查异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class CheckedException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java

@@ -3,7 +3,7 @@
/**
 * 演示模式异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class DemoModeException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java

@@ -3,7 +3,7 @@
/**
 * 全局异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class GlobalException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java

@@ -3,7 +3,7 @@
/**
 * 内部认证异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class InnerAuthException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java

@@ -3,7 +3,7 @@
/**
 * 权限异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class PreAuthorizeException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java

@@ -3,7 +3,7 @@
/**
 * 业务异常
 * 
 * @author ruoyi
 * @author jqs
 */
public final class ServiceException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java

@@ -3,7 +3,7 @@
/**
 * 工具类异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class UtilException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java

@@ -3,7 +3,7 @@
/**
 * 未能通过的登录认证异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class NotLoginException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java

@@ -5,7 +5,7 @@
/**
 * 未能通过的权限认证异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class NotPermissionException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java

@@ -5,7 +5,7 @@
/**
 * 未能通过的角色认证异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class NotRoleException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java

@@ -3,7 +3,7 @@
/**
 * 基础异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class BaseException extends RuntimeException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java

@@ -5,7 +5,7 @@
/**
 * 文件信息异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class FileException extends BaseException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -3,7 +3,7 @@
/**
 * 文件名称超长限制异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class FileNameLengthLimitExceededException extends FileException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java

@@ -3,7 +3,7 @@
/**
 * 文件名大小限制异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class FileSizeLimitExceededException extends FileException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java

@@ -6,7 +6,7 @@
/**
 * 文件上传异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class FileUploadException extends Exception
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java

@@ -5,7 +5,7 @@
/**
 * 文件上传 误异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class InvalidExtensionException extends FileUploadException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java

@@ -3,7 +3,7 @@
/**
 * 计划策略异常
 * 
 * @author ruoyi
 * @author jqs
 */
public class TaskException extends Exception
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java

@@ -3,7 +3,7 @@
/**
 * 验证码失效异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class CaptchaExpireException extends UserException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java

@@ -5,7 +5,7 @@
/**
 * 用户信息异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class UserException extends BaseException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java

@@ -3,7 +3,7 @@
/**
 * 用户密码不正确或不符合规范异常类
 * 
 * @author ruoyi
 * @author jqs
 */
public class UserPasswordNotMatchException extends UserException
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java

@@ -7,7 +7,7 @@
/**
 * 字符集工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class CharsetKit
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java

@@ -11,7 +11,7 @@
/**
 * 类型转换器
 * 
 * @author ruoyi
 * @author jqs
 */
public class Convert
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java

@@ -5,7 +5,7 @@
/**
 * 字符串格式化
 * 
 * @author ruoyi
 * @author jqs
 */
public class StrFormatter
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -14,7 +14,7 @@
/**
 * 时间工具类
 *
 * @author ruoyi
 * @author jqs
 */
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java

@@ -7,7 +7,7 @@
/**
 * 错误信息处理类。
 *
 * @author ruoyi
 * @author jqs
 */
public class ExceptionUtil
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java

@@ -11,7 +11,7 @@
/**
 * Jwt工具类
 *
 * @author ruoyi
 * @author jqs
 */
public class JwtUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java

@@ -8,7 +8,7 @@
/**
 * 分页工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class PageUtils extends PageHelper
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java

@@ -30,7 +30,7 @@
/**
 * 客户端工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class ServletUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java

@@ -10,7 +10,7 @@
/**
 * spring工具类 方便在非spring管理环境中获取bean
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public final class SpringUtils implements BeanFactoryPostProcessor

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java

@@ -10,7 +10,7 @@
/**
 * 字符串工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class StringUtils extends org.apache.commons.lang3.StringUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java

@@ -9,7 +9,7 @@
/**
 * Bean 工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class BeanUtils extends org.springframework.beans.BeanUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java

@@ -8,7 +8,7 @@
/**
 * bean对象属性验证
 * 
 * @author ruoyi
 * @author jqs
 */
public class BeanValidators
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java

@@ -9,7 +9,7 @@
/**
 * 文件类型工具类
 *
 * @author ruoyi
 * @author jqs
 */
public class FileTypeUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java

@@ -16,7 +16,7 @@
/**
 * 文件处理工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class FileUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java

@@ -12,7 +12,7 @@
/**
 * 图片处理工具类
 *
 * @author ruoyi
 * @author jqs
 */
public class ImageUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java

@@ -3,7 +3,7 @@
/**
 * 媒体类型工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class MimeTypeUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java

@@ -5,7 +5,7 @@
/**
 * 转义和反转义工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class EscapeUtil
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java

@@ -13,7 +13,7 @@
/**
 * HTML过滤器，用于去除XSS漏洞隐患。
 *
 * @author ruoyi
 * @author jqs
 */
public final class HTMLFilter
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java

@@ -9,7 +9,7 @@
/**
 * 获取IP方法
 * 
 * @author ruoyi
 * @author jqs
 */
public class IpUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java

@@ -3,7 +3,7 @@
/**
 * Excel数据格式处理适配器
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ExcelHandlerAdapter
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -65,7 +65,7 @@
/**
 * Excel相关处理
 *
 * @author ruoyi
 * @author jqs
 */
public class ExcelUtil<T>
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java

@@ -18,7 +18,7 @@
/**
 * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
 * 
 * @author ruoyi
 * @author jqs
 */
@SuppressWarnings("rawtypes")
public class ReflectUtils

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java

@@ -3,7 +3,7 @@
/**
 * Base64工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public final class Base64
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java

@@ -6,7 +6,7 @@
/**
 * sql操作工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class SqlUtil
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java

@@ -3,7 +3,7 @@
/**
 * ID生成器工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class IdUtils
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java

@@ -5,7 +5,7 @@
import com.ruoyi.common.core.utils.StringUtils;

/**
 * @author ruoyi 序列生成类
 * @author jqs 序列生成类
 */
public class Seq
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java

@@ -10,7 +10,7 @@
/**
 * 提供通用唯一识别码（universally unique identifier）（UUID）实现
 *
 * @author ruoyi
 * @author jqs
 */
public final class UUID implements java.io.Serializable, Comparable<UUID>
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

@@ -17,7 +17,7 @@
/**
 * web层通用数据处理
 * 
 * @author ruoyi
 * @author jqs
 */
public class BaseController
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java

@@ -8,7 +8,7 @@
/**
 * 操作消息提醒
 * 
 * @author ruoyi
 * @author jqs
 */
public class AjaxResult extends HashMap<String, Object>
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java

@@ -11,7 +11,7 @@
/**
 * Entity基类
 * 
 * @author ruoyi
 * @author jqs
 */
public class BaseEntity implements Serializable
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java

@@ -6,7 +6,7 @@
/**
 * Tree基类
 * 
 * @author ruoyi
 * @author jqs
 */
public class TreeEntity extends BaseEntity
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java

@@ -5,7 +5,7 @@
/**
 * 分页数据
 * 
 * @author ruoyi
 * @author jqs
 */
public class PageDomain
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java

@@ -6,7 +6,7 @@
/**
 * 表格分页数据对象
 * 
 * @author ruoyi
 * @author jqs
 */
public class TableDataInfo implements Serializable
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java

@@ -6,7 +6,7 @@
/**
 * 表格数据处理
 * 
 * @author ruoyi
 * @author jqs
 */
public class TableSupport
{

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java

@@ -10,7 +10,7 @@
/**
 * 自定义xss校验注解
 * 
 * @author ruoyi
 * @author jqs
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER })

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java

@@ -9,7 +9,7 @@
/**
 * 自定义xss校验注解实现
 * 
 * @author ruoyi
 * @author jqs
 */
public class XssValidator implements ConstraintValidator<Xss, String>
{

 ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java

@@ -9,7 +9,7 @@
/**
 * 数据权限过滤注解
 * 
 * @author ruoyi
 * @author jqs
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -19,7 +19,7 @@
/**
 * 数据过滤处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Aspect
@Component

 ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java

@@ -10,7 +10,7 @@
/**
 * 主库数据源
 * 
 * @author ruoyi
 * @author jqs
 */
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java

@@ -10,7 +10,7 @@
/**
 * 从库数据源
 * 
 * @author ruoyi
 * @author jqs
 */
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java

@@ -11,7 +11,7 @@
/**
 * 自定义操作日志记录注解
 * 
 * @author ruoyi
 * @author jqs
 *
 */
@Target({ ElementType.PARAMETER, ElementType.METHOD })

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -32,7 +32,7 @@
/**
 * 操作日志记录处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Aspect
@Component

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java

@@ -3,7 +3,7 @@
/**
 * 操作状态
 * 
 * @author ruoyi
 * @author jqs
 *
 */
public enum BusinessStatus

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java

@@ -3,7 +3,7 @@
/**
 * 业务操作类型
 * 
 * @author ruoyi
 * @author jqs
 */
public enum BusinessType
{

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java

@@ -3,7 +3,7 @@
/**
 * 操作人类别
 * 
 * @author ruoyi
 * @author jqs
 */
public enum OperatorType
{

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java

@@ -5,7 +5,7 @@
/**
 * 排除JSON敏感属性
 * 
 * @author ruoyi
 * @author jqs
 */
public class PropertyPreExcludeFilter extends SimplePropertyPreFilter
{

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java

@@ -10,7 +10,7 @@
/**
 * 异步调用日志服务
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class AsyncLogService

 ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java

@@ -10,7 +10,7 @@
/**
 * Redis使用FastJson序列化
 * 
 * @author ruoyi
 * @author jqs
 */
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{

 ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java

@@ -13,7 +13,7 @@
/**
 * redis配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
@EnableCaching

 ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java

@@ -16,7 +16,7 @@
/**
 * spring redis 工具类
 * 
 * @author ruoyi
 * @author jqs
 **/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java

@@ -7,7 +7,7 @@
 * 自定义feign注解
 * 添加basePackages路径
 * 
 * @author ruoyi
 * @author jqs
 */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java

@@ -5,7 +5,7 @@
/**
 * 内部认证注解
 * 
 * @author ruoyi
 * @author jqs
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java

@@ -3,7 +3,7 @@
/**
 * 权限注解的验证模式
 * 
 * @author ruoyi
 * @author jqs
 *
 */
public enum Logical

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java

@@ -8,7 +8,7 @@
/**
 * 登录认证：只有登录之后才能进入该方法
 * 
 * @author ruoyi
 * @author jqs
 *
 */
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java

@@ -8,7 +8,7 @@
/**
 * 权限认证：必须具有指定权限才能进入该方法
 * 
 * @author ruoyi
 * @author jqs
 *
 */
@Retention(RetentionPolicy.RUNTIME)

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java

@@ -8,7 +8,7 @@
/**
 * 角色认证：必须具有指定角色标识才能进入该方法
 * 
 * @author ruoyi
 * @author jqs
 */
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD, ElementType.TYPE })

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java

@@ -14,7 +14,7 @@
/**
 * 内部服务调用验证处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Aspect
@Component

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java

@@ -21,7 +21,7 @@
/**
 * Token 权限验证，逻辑实现类
 * 
 * @author ruoyi
 * @author jqs
 */
public class AuthLogic
{

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java

@@ -7,7 +7,7 @@
/**
 * Token 权限验证工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class AuthUtil
{

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java

@@ -7,7 +7,7 @@
/**
 * 系统配置
 *
 * @author ruoyi
 * @author jqs
 */
public class ApplicationConfig
{

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java

@@ -7,7 +7,7 @@
/**
 * 拦截器配置
 *
 * @author ruoyi
 * @author jqs
 */
public class WebMvcConfig implements WebMvcConfigurer
{

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java

@@ -7,7 +7,7 @@
/**
 * Feign 配置注册
 *
 * @author ruoyi
 * @author jqs
 **/
@Configuration
public class FeignAutoConfiguration

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java

@@ -13,7 +13,7 @@
/**
 * feign 请求拦截器
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class FeignRequestInterceptor implements RequestInterceptor

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -20,7 +20,7 @@
/**
 * 全局异常处理器
 * 
 * @author ruoyi
 * @author jqs
 */
@RestControllerAdvice
public class GlobalExceptionHandler

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java

@@ -16,7 +16,7 @@
 * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取
 * 注意：此拦截器会同时验证当前用户有效期自动刷新有效期
 *
 * @author ruoyi
 * @author jqs
 */
public class HeaderInterceptor implements AsyncHandlerInterceptor
{

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -22,7 +22,7 @@
/**
 * token验证处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class TokenService

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java

@@ -12,7 +12,7 @@
/**
 * 字典工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class DictUtils
{

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -12,7 +12,7 @@
/**
 * 权限获取工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class SecurityUtils
{

 ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java

@@ -13,7 +13,7 @@
/**
 * swagger 在 springboot 2.6.x 不兼容问题的处理
 *
 * @author ruoyi
 * @author jqs
 */
public class SwaggerBeanPostProcessor implements BeanPostProcessor
{

 ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java

@@ -6,7 +6,7 @@
/**
 * swagger 资源映射路径
 * 
 * @author ruoyi
 * @author jqs
 */
public class SwaggerWebConfiguration implements WebMvcConfigurer
{

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java

@@ -7,7 +7,7 @@
/**
 * 网关启动程序
 * 
 * @author ruoyi
 * @author jqs
 */
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
public class RuoYiGatewayApplication

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java

@@ -10,7 +10,7 @@
/**
 * 验证码配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
public class CaptchaConfig

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java

@@ -9,7 +9,7 @@
/**
 * 网关限流配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
public class GatewayConfig

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java

@@ -6,7 +6,7 @@
/**
 * 验证码文本生成器
 * 
 * @author ruoyi
 * @author jqs
 */
public class KaptchaTextCreator extends DefaultTextCreator
{

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java

@@ -12,7 +12,7 @@
/**
 * 路由配置信息
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
public class RouterFunctionConfiguration

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java

@@ -16,7 +16,7 @@
/**
 * 聚合系统接口
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java

@@ -7,7 +7,7 @@
/**
 * 验证码配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
@RefreshScope

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java

@@ -9,7 +9,7 @@
/**
 * 放行白名单配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
@RefreshScope

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java

@@ -9,7 +9,7 @@
/**
 * XSS跨站脚本配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
@RefreshScope

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java

@@ -24,7 +24,7 @@
/**
 * 网关鉴权
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class AuthFilter implements GlobalFilter, Ordered

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java

@@ -11,7 +11,7 @@
/**
 * 黑名单过滤器
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUrlFilter.Config>

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java

@@ -15,7 +15,7 @@
/**
 * 获取body请求数据（解决流不能重复读取问题）
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
public class CacheRequestFilter extends AbstractGatewayFilterFactory<CacheRequestFilter.Config>

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java

@@ -21,7 +21,7 @@
/**
 * 验证码过滤器
 *
 * @author ruoyi
 * @author jqs
 */
@Component
public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java

@@ -28,7 +28,7 @@
/**
 * 跨站脚本过滤器
 *
 * @author ruoyi
 * @author jqs
 */
@Component
@ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true")

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java

@@ -15,7 +15,7 @@
/**
 * 网关统一异常处理
 *
 * @author ruoyi
 * @author jqs
 */
@Order(-1)
@Configuration

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java

@@ -11,7 +11,7 @@
/**
 * 自定义限流异常处理
 *
 * @author ruoyi
 * @author jqs
 */
public class SentinelFallbackHandler implements WebExceptionHandler
{

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java

@@ -16,7 +16,7 @@
/**
 * 验证码获取
 *
 * @author ruoyi
 * @author jqs
 */
@Component
public class ValidateCodeHandler implements HandlerFunction<ServerResponse>

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java

@@ -7,7 +7,7 @@
/**
 * 验证码处理
 *
 * @author ruoyi
 * @author jqs
 */
public interface ValidateCodeService
{

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -23,7 +23,7 @@
/**
 * 验证码实现处理
 *
 * @author ruoyi
 * @author jqs
 */
@Service
public class ValidateCodeServiceImpl implements ValidateCodeService

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java

@@ -8,7 +8,7 @@
/**
 * 文件服务
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomSwagger2
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java

@@ -8,7 +8,7 @@
/**
 * Minio 配置信息
 *
 * @author ruoyi
 * @author jqs
 */
@Configuration
@ConfigurationProperties(prefix = "minio")

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java

@@ -10,7 +10,7 @@
/**
 * 通用映射配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Configuration
public class ResourcesConfig implements WebMvcConfigurer

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -14,7 +14,7 @@
/**
 * 文件请求处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
public class SysFileController

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java

@@ -13,7 +13,7 @@
/**
 * FastDFS 文件存储
 *
 * @author ruoyi
 * @author jqs
 */
@Service
public class FastDfsSysFileServiceImpl implements ISysFileService

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java

@@ -5,7 +5,7 @@
/**
 * 文件上传接口
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysFileService
{

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java

@@ -9,7 +9,7 @@
/**
 * 本地文件存储
 * 
 * @author ruoyi
 * @author jqs
 */
@Primary
@Service

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

@@ -13,7 +13,7 @@
/**
 * Minio 文件存储
 *
 * @author ruoyi
 * @author jqs
 */
@Service
public class MinioSysFileServiceImpl implements ISysFileService

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java

@@ -19,7 +19,7 @@
/**
 * 文件上传工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class FileUploadUtils
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java

@@ -9,7 +9,7 @@
/**
 * 代码生成
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java

@@ -6,7 +6,7 @@
/**
 * 代码生成相关配置
 * 
 * @author ruoyi
 * @author jqs
 */
@Component
@ConfigurationProperties(prefix = "gen")

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -31,7 +31,7 @@
/**
 * 代码生成 操作处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RequestMapping("/gen")
@RestController

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -11,7 +11,7 @@
/**
 * 业务表 gen_table
 * 
 * @author ruoyi
 * @author jqs
 */
public class GenTable extends BaseEntity
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java

@@ -8,7 +8,7 @@
/**
 * 代码生成业务字段表 gen_table_column
 * 
 * @author ruoyi
 * @author jqs
 */
public class GenTableColumn extends BaseEntity
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java

@@ -6,7 +6,7 @@
/**
 * 业务字段 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface GenTableColumnMapper
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java

@@ -6,7 +6,7 @@
/**
 * 业务 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface GenTableMapper
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java

@@ -10,7 +10,7 @@
/**
 * 业务字段 服务层实现
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService 

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -40,7 +40,7 @@
/**
 * 业务 服务层实现
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class GenTableServiceImpl implements IGenTableService

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java

@@ -6,7 +6,7 @@
/**
 * 业务字段 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface IGenTableColumnService
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java

@@ -7,7 +7,7 @@
/**
 * 业务 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface IGenTableService
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java

@@ -11,7 +11,7 @@
/**
 * 代码生成器 工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class GenUtils
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java

@@ -7,7 +7,7 @@
/**
 * VelocityEngine工厂
 * 
 * @author ruoyi
 * @author jqs
 */
public class VelocityInitializer
{

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

@@ -16,7 +16,7 @@
/**
 * 模板工具类
 * 
 * @author ruoyi
 * @author jqs
 */
public class VelocityUtils
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java

@@ -9,7 +9,7 @@
/**
 * 定时任务
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java

@@ -9,7 +9,7 @@
///**
// * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效）
// * 
// * @author ruoyi
// * @author jqs
// */
//@Configuration
//public class ScheduleConfig

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -31,7 +31,7 @@
/**
 * 调度任务信息操作处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/job")

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java

@@ -22,7 +22,7 @@
/**
 * 调度日志操作处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/job/log")

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java

@@ -16,7 +16,7 @@
/**
 * 定时任务调度表 sys_job
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysJob extends BaseEntity
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java

@@ -9,7 +9,7 @@
/**
 * 定时任务调度日志表 sys_job_log
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysJobLog extends BaseEntity
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java

@@ -6,7 +6,7 @@
/**
 * 调度任务日志信息 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysJobLogMapper
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java

@@ -6,7 +6,7 @@
/**
 * 调度任务信息 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysJobMapper
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java

@@ -6,7 +6,7 @@
/**
 * 定时任务调度日志信息信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysJobLogService
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java

@@ -8,7 +8,7 @@
/**
 * 定时任务调度信息信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysJobService
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java

@@ -9,7 +9,7 @@
/**
 * 定时任务调度日志信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysJobLogServiceImpl implements ISysJobLogService

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * 定时任务调度信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysJobServiceImpl implements ISysJobService

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -6,7 +6,7 @@
/**
 * 定时任务调度测试
 * 
 * @author ruoyi
 * @author jqs
 */
@Component("ryTask")
public class RyTask

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java

@@ -18,7 +18,7 @@
/**
 * 抽象quartz调用
 *
 * @author ruoyi
 * @author jqs
 */
public abstract class AbstractQuartzJob implements Job
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java

@@ -7,7 +7,7 @@
/**
 * cron表达式工具类
 * 
 * @author ruoyi
 * @author jqs
 *
 */
public class CronUtils

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java

@@ -11,7 +11,7 @@
/**
 * 任务执行工具
 *
 * @author ruoyi
 * @author jqs
 */
public class JobInvokeUtil
{

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java

@@ -8,7 +8,7 @@
/**
 * 定时任务处理（禁止并发执行）
 * 
 * @author ruoyi
 * @author jqs
 *
 */
@DisallowConcurrentExecution

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java

@@ -7,7 +7,7 @@
/**
 * 定时任务处理（允许并发执行）
 * 
 * @author ruoyi
 * @author jqs
 *
 */
public class QuartzJobExecution extends AbstractQuartzJob

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java

@@ -21,7 +21,7 @@
/**
 * 定时任务工具类
 * 
 * @author ruoyi
 * @author jqs
 *
 */
public class ScheduleUtils

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiSystemApplication.java

@@ -9,7 +9,7 @@
/**
 * 系统模块
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java

@@ -9,10 +9,7 @@
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/member")
@@ -38,4 +35,19 @@
        }
        return R.ok(member);
    }

    /**
     * 小程序登录
     */
    @InnerAuth
    @PostMapping("/miniLogin")
    @ApiOperation("小程序登录")
    public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
    {
        AppMiniLoginVo appMiniLoginVo = memberService.getMemberByCode(appMiniLoginDto);
        if(appMiniLoginVo ==null){
            return R.fail("登录失败！");
        }
        return R.ok(appMiniLoginVo);
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MetaVo.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/RouterVo.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/TreeSelect.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -3,24 +3,20 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.AppNearbyShopDto;
import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
import com.ruoyi.member.domain.vo.AppNearbyShopVo;
import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.member.mapper.member.MemberMapper;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.domain.pojo.shop.Shop;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.service.shop.ShopService;
import com.ruoyi.system.service.sys.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -39,17 +35,15 @@
 */
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {

    @Resource
    private RemoteUserService sysUserService;

    @Resource
    private WxMaService wxMaService;

    @Resource
    private ISysUserService sysUserService;

    @Resource
    private MemberMapper memberMapper;

    @Resource
    private ShopService shopService;

    @Resource
    private StringRedisTemplate stringRedisTemplate;
@@ -111,7 +105,7 @@
                member.setCreateTime(new Date());
                this.save(member);
            }else{
                sysUser = sysUserService.selectUserById(member.getUserId());
                sysUser = sysUserService.getSysUser(member.getUserId()).getData();
            }
            appMiniLoginVo.setMiniOpenid(openid);
            appMiniLoginVo.setWxUnionid(unionid);
@@ -156,9 +150,10 @@
            e.printStackTrace();
        }
        //更新用户手机信息
        SysUser sysUser = sysUserService.selectUserById(appUserAuthorizeDto.getUserId());
        SysUser sysUser = new SysUser();
        sysUser.setUserId(appUserAuthorizeDto.getUserId());
        sysUser.setPhonenumber(mobile);
        sysUserService.updateUser(sysUser);
        sysUserService.updateUserMobile(sysUser);
        member.setMobile(mobile);
        this.saveOrUpdate(member);
        appUserAuthorizeVo.setMobile(mobile);
@@ -168,28 +163,5 @@
        return appUserAuthorizeVo;
    }

    /**
     * 获取附近门店
     * @param appNearbyShopDto
     * @return
     */
    @Override
    public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto){
        Member member = this.getById(appNearbyShopDto.getUserId());
        AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
        Shop shop = null;
        if(member.getRealtionShopId()!=null){
            //获取绑定商户
            shop = shopService.getById(member.getRealtionShopId());
        }else{
            //获取附近商户
            shop = shopService.getById(1L);
        }
        appNearbyShopVo.setShopId(shop.getShopId());
        appNearbyShopVo.setShopName(shop.getShopName());
        appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
        appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
        appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
        return appNearbyShopVo;
    }

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java

@@ -40,10 +40,5 @@
     */
    AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto);

    /**
     * 获取附近门店
     * @param appNearbyShopDto
     * @return
     */
    AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto);

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiSystemApplication.java

@@ -9,7 +9,7 @@
/**
 * 系统模块
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java

New file
@@ -0,0 +1,35 @@
package com.ruoyi.order.controller.concole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @author jqs34
 * @version 1.0
 * @classname ActivityController
 * @description: TODO
 * @date 2023 2023/4/30 15:17
 */
@RestController
@RequestMapping("/activity")
public class ActivityController {


    @Autowired
    private ActivityGoodsService activityGoodsService;

    @InnerAuth
    @PostMapping("/getActivityGoods")
    public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId)
    {
        ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goodsId);
        return R.ok(activityGoods);
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppGoodsController.java
@@ -1,16 +1,17 @@
package com.ruoyi.member.controller.miniapp;
package com.ruoyi.order.controller.miniapp;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.AppBaseBathDto;
import com.ruoyi.member.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.member.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.member.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.member.domain.vo.AppGoodsInfoVo;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.order.domain.dto.AppBaseBathDto;
import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.service.goods.GoodsService;
import com.ruoyi.system.service.order.ShoppingCartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,18 +36,17 @@
    private GoodsService goodsService;

    @Autowired
    private MemberService memberService;
    private RemoteMemberService memberService;

    @Autowired
    private ShoppingCartService shoppingCartService;

    @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取商品详情")

    public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = remoteMemberService.getMember(userId).getData();
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRealtionShopId()!=null){
                appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
            }
@@ -60,7 +60,7 @@
    public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            Member member = memberService.getMember(userId).getData();
            appShoppingCartAddDto.setUserId(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShoppingCartAddDto.setShopId(member.getRealtionShopId());
@@ -75,7 +75,7 @@
    public R changeShoppingCart(@RequestBody AppShoppingCartChangeDto appShoppingCartChangeDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            Member member = memberService.getMember(userId).getData();
            appShoppingCartChangeDto.setUserId(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
@@ -90,7 +90,7 @@
    public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            Member member = memberService.getMember(userId).getData();
            appBaseBathDto.setUserId(userId);
        }
        shoppingCartService.deleteShoppingCart(appBaseBathDto);

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java
@@ -1,15 +1,16 @@
package com.ruoyi.member.controller.miniapp;
package com.ruoyi.order.controller.miniapp;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.order.domain.dto.AppPageDto;
import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,52 +35,12 @@


    @Autowired
    private RemoteMemberService remoteMemberService;

    @Autowired
    private BannerService bannerService;

    @Autowired
    private QuickEntryService quickEntryService;

    @Autowired
    private AdvertService advertService;
    private RemoteMemberService memberService;

    @Autowired
    private GoodsService goodsService;

    @Autowired
    private ShopService shopService;

    @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
    @ApiOperation(value = "获取最近商户")
    public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
        Long userId = SecurityUtils.getUserId();
        appNearbyShopDto.setUserId(userId);
        AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
        return R.ok(appNearbyShopVo);
    }

    @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页banner")
    public R<List<AppBannerVo>> getHomeBanner() {
        List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
        return R.ok(appBannerVoList);
    }

    @RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页快速入口")
    public R<List<AppQuickEntryVo>> getQuickEntry() {
        List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
        return R.ok(appQuickEntryVoList);
    }

    @RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页广告")
    public R<AppAdvertVo> getAdvert() {
        AppAdvertVo appAdvertVo = advertService.getAdvertVo();
        return R.ok(appAdvertVo);
    }

    @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
    @ApiOperation(value = "推荐商品")
@@ -87,7 +48,7 @@
        Long userId = SecurityUtils.getUserId();
        Long shopId = null;
        if(userId!=null){
            Member member = remoteMemberService.getMember(userId).getData();
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRealtionShopId()!=null){
                shopId = member.getRealtionShopId();
            }
@@ -104,7 +65,7 @@
    public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = remoteMemberService.getMember(userId).getData();
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRealtionShopId()!=null){
                appShopGoodsPageDto.setShopId(member.getRealtionShopId());
            }
@@ -121,7 +82,7 @@
    public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = remoteMemberService.getMember(userId).getData();
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRealtionShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
            }
@@ -138,7 +99,7 @@
    public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = remoteMemberService.getMember(userId).getData();
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRealtionShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
            }
@@ -150,12 +111,6 @@
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户详情")
    public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
        AppShopInfoVo appShopInfoVo = shopService.getAppShopInfo(Long.valueOf(appBaseGetDto.getId()));
        return R.ok(appShopInfoVo);
    }


}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopGoods.java
@@ -1,4 +1,4 @@
package com.ruoyi.shop.domain.pojo.shop;
package com.ruoyi.order.domain.pojo.goods;

import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MetaVo.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/RouterVo.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/TreeSelect.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/activity/ActivityGoodsMapper.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper.activity;
package com.ruoyi.order.mapper.activity;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;


/**

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopGoodsMapper.java
@@ -1,7 +1,8 @@
package com.ruoyi.shop.mapper.shop;
package com.ruoyi.order.mapper.goods;

import com.ruoyi.shop.domain.pojo.shop.ShopGoods;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;

/**
 * <p>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/activity/ActivityGoodsService.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.service.activity;
package com.ruoyi.order.service.activity;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;


/**

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopGoodsService.java
@@ -1,7 +1,8 @@
package com.ruoyi.shop.service.shop;
package com.ruoyi.order.service.goods;

import com.ruoyi.shop.domain.pojo.shop.ShopGoods;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;

/**
 * <p>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/activity/ActivityGoodsServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.system.service.impl.activity;
package com.ruoyi.order.service.impl.activity;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
import com.ruoyi.system.mapper.activity.ActivityGoodsMapper;
import com.ruoyi.system.service.activity.ActivityGoodsService;
import com.ruoyi.order.mapper.activity.ActivityGoodsMapper;
import com.ruoyi.order.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;


import org.springframework.stereotype.Service;


 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.goods;

import com.ruoyi.system.domain.pojo.goods.GoodsFile;
import com.ruoyi.system.mapper.goods.GoodsFileMapper;
import com.ruoyi.system.service.goods.GoodsFileService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商品图片 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class GoodsFileServiceImpl extends ServiceImpl<GoodsFileMapper, GoodsFile> implements GoodsFileService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.goods;

import com.ruoyi.system.domain.pojo.goods.GoodsRelNurse;
import com.ruoyi.system.mapper.goods.GoodsRelNurseMapper;
import com.ruoyi.system.service.goods.GoodsRelNurseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商品调理问题 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class GoodsRelNurseServiceImpl extends ServiceImpl<GoodsRelNurseMapper, GoodsRelNurse> implements GoodsRelNurseService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.goods;

import com.ruoyi.system.domain.pojo.goods.GoodsRelTag;
import com.ruoyi.system.mapper.goods.GoodsRelTagMapper;
import com.ruoyi.system.service.goods.GoodsRelTagService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商品标签 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class GoodsRelTagServiceImpl extends ServiceImpl<GoodsRelTagMapper, GoodsRelTag> implements GoodsRelTagService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java

New file
@@ -0,0 +1,144 @@
package com.ruoyi.order.service.impl.goods;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.order.mapper.goods.GoodsMapper;
import com.ruoyi.order.service.activity.ActivityGoodsService;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;

/**
 * <p>
 * 商品表 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {

    @Resource
    private GoodsMapper goodsMapper;

    @Resource
    private ActivityGoodsService activityGoodsService;

    @Resource
    private ShopGoodsService shopGoodsService;

    /**
     * 获取推荐商品列表
     * @param page
     * @return
     */
    @Override
    public List<AppSimpleGoodsVo> pageRecommendGoods(Page page, Long shopId){
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageRecommendGoods(page,shopId);
        return appSimpleGoodsVoList;
    }

    /**
     * 获取商城商品列表
     * @param page
     * @param appShopGoodsPageDto
     * @return
     */
    @Override
    public List<AppSimpleGoodsVo> pageShopGoods(Page page, AppShopGoodsPageDto appShopGoodsPageDto){
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageShopGoods(page,appShopGoodsPageDto);
        return appSimpleGoodsVoList;
    }

    /**
     * 获取搜索商品列表
     * @param page
     * @param appSearchGoodsPageDto
     * @return
     */
    @Override
    public List<AppSimpleGoodsVo> pageSearchGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto){
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageSearchGoods(page,appSearchGoodsPageDto);
        return appSimpleGoodsVoList;
    }

    /**
     * 获取搜索商品列表
     * @param page
     * @param appSearchGoodsPageDto
     * @return
     */
    @Override
    public List<AppSimpleActivityGoodsVo> pageSearchActivityGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto){
        List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsMapper.pageSearchActivityGoods(page,appSearchGoodsPageDto);
        Integer activityNumber;
        BigDecimal activityNumberBig;
        Integer salesNumber;
        BigDecimal salesNumberBig;
        BigDecimal salesPercent;
        for(AppSimpleActivityGoodsVo appSimpleActivityGoodsVo : appSimpleGoodsVoList){
            activityNumber = appSimpleActivityGoodsVo.getActivityNumber();
            salesNumber = appSimpleActivityGoodsVo.getSalesNumber();
            activityNumberBig = BigDecimal.valueOf(activityNumber);
            salesNumberBig = BigDecimal.valueOf(salesNumber);
            salesPercent = salesNumberBig.divide(activityNumberBig,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00"));
            appSimpleActivityGoodsVo.setSalesPercent(salesPercent);
        }
        return appSimpleGoodsVoList;
    }

    /**
     * 获取商品详情
     * @param appGoodsInfoGetDto
     * @return
     */
    @Override
    public AppGoodsInfoVo getGoodsInfo(AppGoodsInfoGetDto appGoodsInfoGetDto){
        AppGoodsInfoVo appGoodsInfoVo = new AppGoodsInfoVo();
        Goods goods = this.getById(appGoodsInfoGetDto.getId());
        BeanUtils.copyProperties(goods, appGoodsInfoVo);
        //商户定制价格
        ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appGoodsInfoGetDto.getShopId(),goods.getGoodsId());
        if(shopGoods!=null){
            appGoodsInfoVo.setSalesPrice(shopGoods.getSalesPrice());
            appGoodsInfoVo.setSalesNum(shopGoods.getServiceNum());
        }
        //活动商品判断
        if(appGoodsInfoGetDto.getActivityFlag()==1){
            ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goods.getGoodsId());
            //原价取较大值
            if(shopGoods!=null&&goods.getSalesPrice().compareTo(shopGoods.getSalesPrice())>0){
                appGoodsInfoVo.setSalesPrice(goods.getSalesPrice());
            }
            appGoodsInfoVo.setActivityFlag(1);
            appGoodsInfoVo.setActivityPrice(activityGoods.getActivityPrice());
            appGoodsInfoVo.setSalesNum(activityGoods.getSalesNumber());
            appGoodsInfoVo.setActivityDeadline(activityGoods.getActivityDeadline());
            //售罄判断
            if(activityGoods.getActivityNumber()==activityGoods.getSalesNumber()){
                appGoodsInfoVo.setSellOutFlag(1);
            }else{
                appGoodsInfoVo.setSellOutFlag(0);
            }
        }else{
            appGoodsInfoVo.setActivityFlag(0);
        }
        return appGoodsInfoVo;
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.goods;

import com.ruoyi.system.domain.pojo.goods.GoodsTotal;
import com.ruoyi.system.mapper.goods.GoodsTotalMapper;
import com.ruoyi.system.service.goods.GoodsTotalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商品统计 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class GoodsTotalServiceImpl extends ServiceImpl<GoodsTotalMapper, GoodsTotal> implements GoodsTotalService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopGoodsServiceImpl.java
@@ -1,11 +1,11 @@
package com.ruoyi.shop.service.impl.shop;
package com.ruoyi.order.service.impl.goods;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.shop.domain.pojo.shop.ShopGoods;
import com.ruoyi.shop.mapper.shop.ShopGoodsMapper;
import com.ruoyi.shop.service.shop.ShopGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.order.mapper.goods.ShopGoodsMapper;
import com.ruoyi.order.service.goods.ShopGoodsService;
import org.springframework.stereotype.Service;

/**

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.order;

import com.ruoyi.system.domain.pojo.order.ConsumerGoods;
import com.ruoyi.system.mapper.order.ConsumerGoodsMapper;
import com.ruoyi.system.service.order.ConsumerGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 服务 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class ConsumerGoodsServiceImpl extends ServiceImpl<ConsumerGoodsMapper, ConsumerGoods> implements ConsumerGoodsService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.order;

import com.ruoyi.system.domain.pojo.order.OrderGoods;
import com.ruoyi.system.mapper.order.OrderGoodsMapper;
import com.ruoyi.system.service.order.OrderGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 订单商品 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements OrderGoodsService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.order;

import com.ruoyi.system.domain.pojo.order.Order;
import com.ruoyi.system.mapper.order.OrderMapper;
import com.ruoyi.system.service.order.OrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 订单 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java

New file
@@ -0,0 +1,95 @@
package com.ruoyi.order.service.impl.order;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.exception.ServiceException;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.dto.AppBaseBathDto;
import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.order.mapper.order.ShoppingCartMapper;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * <p>
 * 购物车 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, ShoppingCart> implements ShoppingCartService {

    @Resource
    private GoodsService goodsService;

    @Resource
    private ShoppingCartMapper shoppingCartMapper;

    /**
     * 添加购物车
     * @param appShoppingCartAddDto
     */
    @Override
    public void addShoppingCart(AppShoppingCartAddDto appShoppingCartAddDto){
        Long goodsId = appShoppingCartAddDto.getGoodsId();
        Goods goods = goodsService.getById(goodsId);
        if(goods.getGoodsStatus()!=1){
            throw new ServiceException(AppErrorConstant.GOODS_DOWN);
        }
        LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
        ShoppingCart shoppingCart = this.getOne(queryWrapper);
        if(shoppingCart==null){
            shoppingCart = new ShoppingCart();
            shoppingCart.setUserId(appShoppingCartAddDto.getUserId());
            shoppingCart.setShopId(appShoppingCartAddDto.getShopId());
            shoppingCart.setBuyNum(appShoppingCartAddDto.getBuyNum());
            shoppingCart.setDelFlag(0);
            shoppingCart.setCreateTime(new Date());
            this.save(shoppingCart);
        }else{
            shoppingCart.setBuyNum(shoppingCart.getBuyNum()+appShoppingCartAddDto.getBuyNum());
            shoppingCart.setUpdateTime(new Date());
            this.saveOrUpdate(shoppingCart);
        }
    }

    /**
     * 修改购物车数量
     * @param appShoppingCartChangeDto
     */
    @Override
    public void changeShoppingCart(AppShoppingCartChangeDto appShoppingCartChangeDto){
        Long goodsId = appShoppingCartChangeDto.getGoodsId();
        Goods goods = goodsService.getById(goodsId);
        if(goods.getGoodsStatus()!=1){
            throw new ServiceException(AppErrorConstant.GOODS_DOWN);
        }
        LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
        ShoppingCart shoppingCart = this.getOne(queryWrapper);
        shoppingCart.setBuyNum(appShoppingCartChangeDto.getBuyNum());
        shoppingCart.setUpdateTime(new Date());
        this.saveOrUpdate(shoppingCart);
    }

    /**
     * 删除购物车
     * @param appBaseBathDto
     */
    @Override
    public void deleteShoppingCart(AppBaseBathDto appBaseBathDto){
        String ids = appBaseBathDto.getIds();
        shoppingCartMapper.deleteShoppingCartByIds(ids);
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl.order;

import com.ruoyi.system.domain.pojo.order.UserServiceRecord;
import com.ruoyi.system.mapper.order.UserServiceRecordMapper;
import com.ruoyi.system.service.order.UserServiceRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 服务记录 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class UserServiceRecordServiceImpl extends ServiceImpl<UserServiceRecordMapper, UserServiceRecord> implements UserServiceRecordService {

}

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/activity/ActivityGoodsMapper.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.ruoyi.system.mapper.activity.ActivityGoodsMapper">
<mapper namespace="com.ruoyi.order.mapper.activity.ActivityGoodsMapper">

    <resultMap type="com.ruoyi.system.domain.pojo.activity.ActivityGoods" id="ActivityGoodsResult">
    <resultMap type="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" id="ActivityGoodsResult">
        <result property="agId"    column="ag_id"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="goodsId"    column="goods_id"    />
@@ -17,7 +17,7 @@
        select ag_id, del_flag, goods_id, activity_id, activity_price, activity_number, sales_number, activity_deadline from t_activity_goods
    </sql>

    <select id="selectActivityGoodsList" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" resultMap="ActivityGoodsResult">
    <select id="selectActivityGoodsList" parameterType="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" resultMap="ActivityGoodsResult">
        <include refid="selectActivityGoodsVo"/>
        <where>
            <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
@@ -34,7 +34,7 @@
        where ag_id = #{agId}
    </select>

    <insert id="insertActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" useGeneratedKeys="true" keyProperty="agId">
    <insert id="insertActivityGoods" parameterType="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" useGeneratedKeys="true" keyProperty="agId">
        insert into t_activity_goods
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -56,7 +56,7 @@
        </trim>
    </insert>

    <update id="updateActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods">
    <update id="updateActivityGoods" parameterType="com.ruoyi.system.api.domain.poji.activity.ActivityGoods">
        update t_activity_goods
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml

File was renamed from ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopGoodsMapper.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.ruoyi.shop.mapper.shop.ShopGoodsMapper">
<mapper namespace="com.ruoyi.order.mapper.goods.ShopGoodsMapper">

    <resultMap type="ShopGoods" id="ShopGoodsResult">
        <result property="id"    column="id"    />

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiSystemApplication.java

@@ -9,7 +9,7 @@
/**
 * 系统模块
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppGoodsController.java

File was deleted

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -1,15 +1,14 @@
package com.ruoyi.shop.controller.miniapp;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.pojo.member.Member;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.service.config.AdvertService;
import com.ruoyi.system.service.config.BannerService;
import com.ruoyi.system.service.config.QuickEntryService;
import com.ruoyi.system.service.goods.GoodsService;
import com.ruoyi.system.service.shop.ShopService;
import com.ruoyi.shop.domain.dto.AppBaseGetDto;
import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +16,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @author jqs34
@@ -34,19 +31,7 @@


    @Autowired
    private MemberService memberService;

    @Autowired
    private BannerService bannerService;

    @Autowired
    private QuickEntryService quickEntryService;

    @Autowired
    private AdvertService advertService;

    @Autowired
    private GoodsService goodsService;
    private RemoteMemberService memberService;

    @Autowired
    private ShopService shopService;
@@ -55,100 +40,12 @@
    @ApiOperation(value = "获取最近商户")
    public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
        Long userId = SecurityUtils.getUserId();
        Member member = memberService.getMember(userId).getData();
        appNearbyShopDto.setUserId(userId);
        AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
        AppNearbyShopVo appNearbyShopVo = shopService.getNearbyShop(appNearbyShopDto,member);
        return R.ok(appNearbyShopVo);
    }

    @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页banner")
    public R<List<AppBannerVo>> getHomeBanner() {
        List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
        return R.ok(appBannerVoList);
    }

    @RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页快速入口")
    public R<List<AppQuickEntryVo>> getQuickEntry() {
        List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
        return R.ok(appQuickEntryVoList);
    }

    @RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页广告")
    public R<AppAdvertVo> getAdvert() {
        AppAdvertVo appAdvertVo = advertService.getAdvertVo();
        return R.ok(appAdvertVo);
    }

    @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
    @ApiOperation(value = "推荐商品")
    public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
        Long userId = SecurityUtils.getUserId();
        Long shopId = null;
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                shopId = member.getRealtionShopId();
            }
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appPageDto.getPageSize());
        page.setCurrent(appPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/pageShopGoods", method = RequestMethod.POST)
    @ApiOperation(value = "商城商品")
    public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShopGoodsPageDto.setShopId(member.getRealtionShopId());
            }
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appShopGoodsPageDto.getPageSize());
        page.setCurrent(appShopGoodsPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageShopGoods(page,appShopGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/pageSearchGoods", method = RequestMethod.POST)
    @ApiOperation(value = "搜索商品")
    public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
            }
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
        page.setCurrent(appSearchGoodsPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchGoods(page,appSearchGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/pageSearchActivityGoods", method = RequestMethod.POST)
    @ApiOperation(value = "搜索活动商品")
    public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
            }
        }
        Page<AppSimpleActivityGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
        page.setCurrent(appSearchGoodsPageDto.getPageNum());
        List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchActivityGoods(page,appSearchGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户详情")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MetaVo.java

File was deleted

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/RouterVo.java

File was deleted

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/TreeSelect.java

File was deleted

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -1,24 +1,22 @@
package com.ruoyi.shop.service.impl.shop;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.util.CodeFactoryUtil;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.system.api.RemoteConfigService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
import com.ruoyi.shop.domain.dto.MgtEditShopDto;
import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
import com.ruoyi.shop.domain.dto.MgtShopPageDto;
import com.ruoyi.system.domain.pojo.config.SysTag;
import com.ruoyi.system.domain.pojo.shop.*;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
import com.ruoyi.system.service.config.SysTagService;
import com.ruoyi.system.service.shop.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.service.sys.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -51,7 +49,10 @@
    private ShopCertificateService shopCertificateService;

    @Resource
    private SysTagService sysTagService;
    private RemoteConfigService configService;

    @Resource
    private RemoteUserService sysUserService;

    @Resource
    private ShopRelTagService shopRelTagService;
@@ -59,8 +60,6 @@
    @Resource
    private ShopRelUserService shopRelUserService;

    @Resource
    private ISysUserService sysUserService;

    /**
     * 获取商户详情
@@ -136,7 +135,7 @@
            for(String str : shopTagIdArray){
                shopRelTag = new ShopRelTag();
                tagid = Long.valueOf(str);
                sysTag = sysTagService.getById(tagid);
                sysTag = configService.getSysTag(tagid).getData();
                shopRelTag.setDelFlag(0);
                shopRelTag.setShopId(shop.getShopId());
                shopRelTag.setTagId(tagid);
@@ -156,7 +155,7 @@
            for(String str : relUserIdArray){
                shopRelUser = new ShopRelUser();
                userId = Long.valueOf(str);
                sysUser = sysUserService.selectUserById(userId);
                sysUser = sysUserService.getSysUser(userId).getData();
                shopRelUser.setDelFlag(0);
                shopRelUser.setShopId(shop.getShopId());
                shopRelUser.setUserId(userId);
@@ -301,7 +300,7 @@
            StringJoiner shopTagSj = new StringJoiner(",");
            for(String str : shopTagIdArray){
                tagId = Long.valueOf(str);
                sysTag = sysTagService.getById(tagId);
                sysTag = configService.getSysTag(tagId).getData();
                shopRelTag = new ShopRelTag();
                shopRelTag.setDelFlag(0);
                shopRelTag.setShopId(shopId);
@@ -316,4 +315,27 @@
        this.saveOrUpdate(shop);
    }

    /**
     * 获取附近门店
     * @param appNearbyShopDto
     * @return
     */
    @Override
    public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto,Member member){
        AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
        Shop shop = null;
        if(member.getRealtionShopId()!=null){
            //获取绑定商户
            shop = this.getById(member.getRealtionShopId());
        }else{
            //获取附近商户
            shop = this.getById(1L);
        }
        appNearbyShopVo.setShopId(shop.getShopId());
        appNearbyShopVo.setShopName(shop.getShopName());
        appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
        appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
        appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
        return appNearbyShopVo;
    }
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java

@@ -1,15 +1,14 @@
package com.ruoyi.shop.service.shop;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
import com.ruoyi.shop.domain.dto.MgtEditShopDto;
import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
import com.ruoyi.shop.domain.dto.MgtShopPageDto;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.Shop;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
import com.ruoyi.system.api.domain.poji.member.Member;

import java.util.List;

@@ -64,6 +63,13 @@
    void editShopTag(MgtEditShopTagDto mgtEditShopTagDto);

    /**
     * 获取附近门店
     * @param appNearbyShopDto
     * @return
     */
    AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto, Member member);

    /**
     * 获取商户详情
     * @param userId
     * @return

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java

@@ -9,7 +9,7 @@
/**
 * 系统模块
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.system.controller.conslole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.service.activity.ActivityGoodsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * @author jqs34
 * @version 1.0
 * @classname ActivityController
 * @description: TODO
 * @date 2023 2023/4/30 15:17
 */
@RestController
@RequestMapping("/activity")
public class ActivityController {


    @Autowired
    private ActivityGoodsService activityGoodsService;

    @InnerAuth
    @PostMapping("/getActivityGoods")
    public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId)
    {
        ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goodsId);
        return R.ok(activityGoods);
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.system.controller.conslole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.service.config.SysTagService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * @author jqs34
 * @version 1.0
 * @classname ConfigController
 * @description: TODO
 * @date 2023 2023/4/30 15:53
 */
@RestController
@RequestMapping("/config")
public class ConfigController {

    @Autowired
    private SysTagService sysTagService;

    @InnerAuth
    @PostMapping("/getSysTag")
    public R<SysTag> getSysTag(@RequestBody Long sysTagId)
    {
        SysTag sysTag = sysTagService.getById(sysTagId);
        return R.ok(sysTag);
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppGoodsController.java

File was deleted

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java

@@ -1,21 +1,15 @@
package com.ruoyi.system.controller.miniapp;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.pojo.member.Member;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.domain.vo.AppAdvertVo;
import com.ruoyi.system.domain.vo.AppBannerVo;
import com.ruoyi.system.domain.vo.AppQuickEntryVo;
import com.ruoyi.system.service.config.AdvertService;
import com.ruoyi.system.service.config.BannerService;
import com.ruoyi.system.service.config.QuickEntryService;
import com.ruoyi.system.service.goods.GoodsService;
import com.ruoyi.system.service.shop.ShopService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -46,14 +40,6 @@
    private AdvertService advertService;


    @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
    @ApiOperation(value = "获取最近商户")
    public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
        Long userId = SecurityUtils.getUserId();
        appNearbyShopDto.setUserId(userId);
        AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
        return R.ok(appNearbyShopVo);
    }

    @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
    @ApiOperation(value = "获取首页banner")
@@ -76,81 +62,8 @@
        return R.ok(appAdvertVo);
    }

    @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
    @ApiOperation(value = "推荐商品")
    public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
        Long userId = SecurityUtils.getUserId();
        Long shopId = null;
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                shopId = member.getRealtionShopId();
            }
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appPageDto.getPageSize());
        page.setCurrent(appPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/pageShopGoods", method = RequestMethod.POST)
    @ApiOperation(value = "商城商品")
    public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appShopGoodsPageDto.setShopId(member.getRealtionShopId());
            }
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appShopGoodsPageDto.getPageSize());
        page.setCurrent(appShopGoodsPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageShopGoods(page,appShopGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/pageSearchGoods", method = RequestMethod.POST)
    @ApiOperation(value = "搜索商品")
    public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
            }
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
        page.setCurrent(appSearchGoodsPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchGoods(page,appSearchGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/pageSearchActivityGoods", method = RequestMethod.POST)
    @ApiOperation(value = "搜索活动商品")
    public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getById(userId);
            if(member!=null&&member.getRealtionShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
            }
        }
        Page<AppSimpleActivityGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
        page.setCurrent(appSearchGoodsPageDto.getPageNum());
        List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchActivityGoods(page,appSearchGoodsPageDto);
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

    @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户详情")
    public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
        AppShopInfoVo appShopInfoVo = shopService.getAppShopInfo(Long.valueOf(appBaseGetDto.getId()));
        return R.ok(appShopInfoVo);
    }


}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysConfigController.java

@@ -26,7 +26,7 @@
/**
 * 参数配置 信息操作处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/config")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java

@@ -26,7 +26,7 @@
/**
 * 部门信息
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/dept")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictDataController.java

@@ -29,7 +29,7 @@
/**
 * 数据字典信息
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/dict/data")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictTypeController.java

@@ -26,7 +26,7 @@
/**
 * 数据字典信息
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/dict/type")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysLogininforController.java

@@ -26,7 +26,7 @@
/**
 * 系统访问记录
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/logininfor")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java

@@ -25,7 +25,7 @@
/**
 * 菜单信息
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/menu")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysNoticeController.java

@@ -24,7 +24,7 @@
/**
 * 公告 信息操作处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/notice")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysOperlogController.java

@@ -24,7 +24,7 @@
/**
 * 操作日志记录
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/operlog")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysPostController.java

@@ -26,7 +26,7 @@
/**
 * 岗位信息操作处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/post")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java

@@ -29,7 +29,7 @@
/**
 * 个人信息 业务处理
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/user/profile")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysRoleController.java

@@ -31,7 +31,7 @@
/**
 * 角色信息
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/role")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java

@@ -1,27 +1,5 @@
package com.ruoyi.system.controller.sys;

import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.service.member.MemberService;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -37,17 +15,23 @@
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.service.sys.ISysConfigService;
import com.ruoyi.system.service.sys.ISysDeptService;
import com.ruoyi.system.service.sys.ISysPermissionService;
import com.ruoyi.system.service.sys.ISysPostService;
import com.ruoyi.system.service.sys.ISysRoleService;
import com.ruoyi.system.service.sys.ISysUserService;
import com.ruoyi.system.service.sys.*;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * 用户信息
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/user")
@@ -70,9 +54,6 @@

    @Autowired
    private ISysConfigService configService;

    @Autowired
    private MemberService memberService;

    /**
     * 获取用户列表
@@ -332,18 +313,48 @@
        return success(deptService.selectDeptTreeList(dept));
    }


    /**
     * 小程序登录
     * @description: TODO
     * @author jqs34
     * @date 2023/4/30 15:36
     * @version 1.0
     */
    @InnerAuth
    @GetMapping("/miniLogin")
    @ApiOperation("小程序登录")
    public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
    {
        AppMiniLoginVo appMiniLoginVo = memberService.getMemberByCode(appMiniLoginDto);
        if(appMiniLoginVo ==null){
            return R.fail("登录失败！");
        }
        return R.ok(appMiniLoginVo);
    @PostMapping("/user/getSysUser")
    public R<SysUser> getSysUser(@RequestBody Long userId){
        SysUser sysUser = userService.selectUserById(userId);
        return R.ok(sysUser);
    }

    /**
     * @description: 更新用户手机
     * @author jqs34
     * @date 2023/4/30 15:32
     * @version 1.0
     */
    @InnerAuth
    @PostMapping("/user/registerUser")
    public R registerUser(@RequestBody SysUser sysUser){
        userService.registerUser(sysUser);
        return R.ok();
    }



    /**
     * @description: 更新用户手机
     * @author jqs34
     * @date 2023/4/30 15:32
     * @version 1.0
     */
    @InnerAuth
    @PostMapping("/user/updateUserMobile")
    public R updateUserMobile(@RequestBody SysUser sysUser){
        userService.updateUserMobile(sysUser);
        return R.ok();
    }



}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserOnlineController.java

@@ -26,7 +26,7 @@
/**
 * 在线用户监控
 * 
 * @author ruoyi
 * @author jqs
 */
@RestController
@RequestMapping("/online")

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysConfig.java

@@ -11,7 +11,7 @@
/**
 * 参数配置表 sys_config
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysConfig extends BaseEntity
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysMenu.java

@@ -12,7 +12,7 @@
/**
 * 菜单权限表 sys_menu
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysMenu extends BaseEntity
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysNotice.java

@@ -10,7 +10,7 @@
/**
 * 通知公告表 sys_notice
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysNotice extends BaseEntity
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysPost.java

@@ -12,7 +12,7 @@
/**
 * 岗位表 sys_post
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysPost extends BaseEntity
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleDept.java

@@ -6,7 +6,7 @@
/**
 * 角色和部门关联 sys_role_dept
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysRoleDept
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleMenu.java

@@ -6,7 +6,7 @@
/**
 * 角色和菜单关联 sys_role_menu
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysRoleMenu
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserOnline.java

@@ -3,7 +3,7 @@
/**
 * 当前在线会话
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysUserOnline
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserPost.java

@@ -6,7 +6,7 @@
/**
 * 用户和岗位关联 sys_user_post
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysUserPost
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserRole.java

@@ -6,7 +6,7 @@
/**
 * 用户和角色关联 sys_user_role
 * 
 * @author ruoyi
 * @author jqs
 */
public class SysUserRole
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

@@ -5,7 +5,7 @@
/**
 * 路由显示信息
 * 
 * @author ruoyi
 * @author jqs
 */
public class MetaVo
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -6,7 +6,7 @@
/**
 * 路由配置信息
 * 
 * @author ruoyi
 * @author jqs
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class RouterVo

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java

@@ -10,7 +10,7 @@
/**
 * Treeselect树结构实体类
 * 
 * @author ruoyi
 * @author jqs
 */
public class TreeSelect implements Serializable
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysClassificationMapper.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.SysClassification;
import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysTagMapper.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.SysTag;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysConfigMapper.java

@@ -6,7 +6,7 @@
/**
 * 参数配置 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysConfigMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDeptMapper.java

@@ -7,7 +7,7 @@
/**
 * 部门管理 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysDeptMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictDataMapper.java

@@ -7,7 +7,7 @@
/**
 * 字典表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysDictDataMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictTypeMapper.java

@@ -6,7 +6,7 @@
/**
 * 字典表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysDictTypeMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysLogininforMapper.java

@@ -6,7 +6,7 @@
/**
 * 系统访问日志情况信息 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysLogininforMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java

@@ -7,7 +7,7 @@
/**
 * 菜单表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysMenuMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysNoticeMapper.java

@@ -6,7 +6,7 @@
/**
 * 通知公告表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysNoticeMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysOperLogMapper.java

@@ -6,7 +6,7 @@
/**
 * 操作日志 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysOperLogMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysPostMapper.java

@@ -6,7 +6,7 @@
/**
 * 岗位信息 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysPostMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleDeptMapper.java

@@ -6,7 +6,7 @@
/**
 * 角色与部门关联表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysRoleDeptMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMapper.java

@@ -6,7 +6,7 @@
/**
 * 角色表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysRoleMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMenuMapper.java

@@ -6,7 +6,7 @@
/**
 * 角色与菜单关联表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysRoleMenuMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java

@@ -7,7 +7,7 @@
/**
 * 用户表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysUserMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserPostMapper.java

@@ -6,7 +6,7 @@
/**
 * 用户与岗位关联表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysUserPostMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserRoleMapper.java

@@ -7,7 +7,7 @@
/**
 * 用户与角色关联表 数据层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface SysUserRoleMapper
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysClassificationService.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.pojo.config.SysClassification;
import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysTagService.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.pojo.config.SysTag;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.domain.dto.AppAgreementDto;
import com.ruoyi.system.domain.pojo.config.Agreement;
import com.ruoyi.system.domain.vo.AppAgreementVo;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.system.domain.pojo.config.SysClassification;
import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.ruoyi.system.mapper.config.SysClassificationMapper;
import com.ruoyi.system.service.config.SysClassificationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.system.domain.pojo.config.SysTag;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.mapper.config.SysTagMapper;
import com.ruoyi.system.service.config.SysTagService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysConfigServiceImpl.java

@@ -18,7 +18,7 @@
/**
 * 参数配置 服务层实现
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysConfigServiceImpl implements ISysConfigService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java

@@ -24,7 +24,7 @@
/**
 * 部门管理 服务实现
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysDeptServiceImpl implements ISysDeptService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictDataServiceImpl.java

@@ -11,7 +11,7 @@
/**
 * 字典 业务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysDictDataServiceImpl implements ISysDictDataService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictTypeServiceImpl.java

@@ -21,7 +21,7 @@
/**
 * 字典 业务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysDictTypeServiceImpl implements ISysDictTypeService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysLogininforServiceImpl.java

@@ -10,7 +10,7 @@
/**
 * 系统访问日志情况信息 服务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysLogininforServiceImpl implements ISysLogininforService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java

@@ -28,7 +28,7 @@
/**
 * 菜单 业务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysMenuServiceImpl implements ISysMenuService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysNoticeServiceImpl.java

@@ -10,7 +10,7 @@
/**
 * 公告 服务层实现
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysNoticeServiceImpl implements ISysNoticeService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysOperLogServiceImpl.java

@@ -10,7 +10,7 @@
/**
 * 操作日志 服务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysOperLogServiceImpl implements ISysOperLogService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPermissionServiceImpl.java

@@ -14,7 +14,7 @@
/**
 * 用户权限处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysPermissionServiceImpl implements ISysPermissionService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPostServiceImpl.java

@@ -14,7 +14,7 @@
/**
 * 岗位信息 服务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysPostServiceImpl implements ISysPostService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysRoleServiceImpl.java

@@ -28,7 +28,7 @@
/**
 * 角色 业务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysRoleServiceImpl implements ISysRoleService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserOnlineServiceImpl.java

@@ -9,7 +9,7 @@
/**
 * 在线用户 服务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java

@@ -33,7 +33,7 @@
/**
 * 用户 业务层处理
 * 
 * @author ruoyi
 * @author jqs
 */
@Service
public class SysUserServiceImpl implements ISysUserService
@@ -542,4 +542,16 @@
        return successMsg.toString();
    }

    /**
     * @description: updateUserMobile
     * @param: sysUser
     * @return: null
     * @author jqs34
     * @date: 2023/4/30 15:43
     */
    public void updateUserMobile(SysUser sysUser){
        SysUser oldSysUser = this.selectUserById(sysUser.getUserId());
        oldSysUser.setPhonenumber(sysUser.getPhonenumber());
        userMapper.updateUser(oldSysUser);
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysConfigService.java

@@ -6,7 +6,7 @@
/**
 * 参数配置 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysConfigService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDeptService.java

@@ -7,7 +7,7 @@
/**
 * 部门管理 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysDeptService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictDataService.java

@@ -6,7 +6,7 @@
/**
 * 字典 业务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysDictDataService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictTypeService.java

@@ -7,7 +7,7 @@
/**
 * 字典 业务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysDictTypeService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysLogininforService.java

@@ -6,7 +6,7 @@
/**
 * 系统访问日志情况信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysLogininforService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java

@@ -9,7 +9,7 @@
/**
 * 菜单 业务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysMenuService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysNoticeService.java

@@ -6,7 +6,7 @@
/**
 * 公告 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysNoticeService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysOperLogService.java

@@ -6,7 +6,7 @@
/**
 * 操作日志 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysOperLogService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPermissionService.java

@@ -7,7 +7,7 @@
/**
 * 权限信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysPermissionService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPostService.java

@@ -6,7 +6,7 @@
/**
 * 岗位信息 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysPostService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysRoleService.java

@@ -8,7 +8,7 @@
/**
 * 角色业务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysRoleService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserOnlineService.java

@@ -6,7 +6,7 @@
/**
 * 在线用户 服务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysUserOnlineService
{

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java

@@ -6,7 +6,7 @@
/**
 * 用户 业务层
 * 
 * @author ruoyi
 * @author jqs
 */
public interface ISysUserService
{
@@ -203,4 +203,13 @@
     * @return 结果
     */
    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);

    /**
    * @description: updateUserMobile
    * @param: sysUser
    * @return: null
    * @author jqs34
    * @date: 2023/4/30 15:43
    */
    public void updateUserMobile(SysUser sysUser);
}

 ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java

@@ -7,7 +7,7 @@
/**
 * 监控中心
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableAdminServer
@SpringBootApplication

 ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java

@@ -10,7 +10,7 @@
/**
 * 监控权限配置
 * 
 * @author ruoyi
 * @author jqs
 */
@EnableWebSecurity
public class WebSecurityConfigurer