refactor: 项目结构优化与代码生成模板修复
This commit is contained in:
@@ -20,4 +20,4 @@ CMD java \
|
||||
-jar /app.jar
|
||||
|
||||
# 暴露端口
|
||||
EXPOSE 8989
|
||||
EXPOSE 8000
|
||||
|
||||
12
README.md
12
README.md
@@ -103,21 +103,23 @@ spring:
|
||||
youlai-boot
|
||||
├── docker/ # Docker 部署
|
||||
├── sql/ # 数据库脚本
|
||||
├── src/main/java/com/youlai/boot/
|
||||
├── src/
|
||||
│ ├── auth/ # 认证授权业务
|
||||
│ ├── codegen/ # 代码生成器
|
||||
│ ├── common/ # 全局通用(常量、枚举、工具类、统一响应结果)
|
||||
│ ├── framework/ # 底层技术基座(高内聚积木块)
|
||||
│ ├── framework/ # 底层技术基座(缓存/验证码/安全/Web等)
|
||||
│ │ ├── apidoc/ # OpenAPI/Swagger 文档
|
||||
│ │ ├── cache/ # Redis/Caffeine 缓存
|
||||
│ │ ├── captcha/ # 验证码
|
||||
│ │ ├── integration/ # SMS/Mail/WxMa 集成
|
||||
│ │ ├── job/ # XxlJob 定时任务
|
||||
│ │ ├── mybatis/ # 数据库/MP配置/拦截器
|
||||
│ │ ├── openapi/ # OpenAPI/Swagger 文档
|
||||
│ │ ├── security/ # 鉴权过滤器/Token机制
|
||||
│ │ └── web/ # 跨域/全局异常/限流/Jackson
|
||||
│ ├── module/ # 业务模块(File、Codegen 等)
|
||||
│ ├── message/ # 消息中心
|
||||
│ ├── file/ # 文件中心
|
||||
│ ├── system/ # 核心系统模块(用户/角色/菜单/部门)
|
||||
│ └── YouLaiBootApplication.java # 启动类
|
||||
│ └── YouLaiBootApplication.java # 启动类
|
||||
└── pom.xml # Maven 配置
|
||||
```
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ import com.youlai.boot.framework.security.token.TokenManager;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum;
|
||||
import com.youlai.boot.framework.integration.sms.service.SmsService;
|
||||
import com.youlai.boot.system.service.LogService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
@@ -42,7 +41,7 @@ public class AuthServiceImpl implements AuthService {
|
||||
private final SmsService smsService;
|
||||
private final RedisTemplate<String, Object> redisTemplate;
|
||||
private final CaptchaService captchaService;
|
||||
private final LogService logService;
|
||||
|
||||
/**
|
||||
* 用户名密码登录
|
||||
*
|
||||
|
||||
@@ -11,7 +11,7 @@ import com.youlai.boot.common.constant.RedisConstants;
|
||||
import com.youlai.boot.framework.security.exception.NeedBindMobileException;
|
||||
import com.youlai.boot.framework.security.model.AuthenticationToken;
|
||||
import com.youlai.boot.framework.security.model.SysUserDetails;
|
||||
import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken;
|
||||
import com.youlai.boot.framework.security.model.WxMaAuthenticationToken;
|
||||
import com.youlai.boot.framework.security.token.TokenManager;
|
||||
import com.youlai.boot.system.enums.SocialPlatformEnum;
|
||||
import com.youlai.boot.system.model.entity.SysUser;
|
||||
@@ -55,7 +55,7 @@ public class WxMaAuthServiceImpl implements WxMaAuthService {
|
||||
*/
|
||||
@Override
|
||||
public WxMaLoginResp silentLogin(String code) {
|
||||
WechatMiniAuthenticationToken token = new WechatMiniAuthenticationToken(code);
|
||||
WxMaAuthenticationToken token = new WxMaAuthenticationToken(code);
|
||||
|
||||
try {
|
||||
Authentication authentication = authenticationManager.authenticate(token);
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package com.youlai.boot.module.codegen.config;
|
||||
package com.youlai.boot.codegen.config;
|
||||
|
||||
import cn.hutool.core.io.file.FileNameUtil;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
@@ -16,6 +17,7 @@ import java.util.Map;
|
||||
* @since 2.11.0
|
||||
*/
|
||||
@Component
|
||||
@EnableConfigurationProperties(CodegenProperties.class)
|
||||
@ConfigurationProperties(prefix = "codegen")
|
||||
@Data
|
||||
public class CodegenProperties {
|
||||
@@ -1,18 +1,18 @@
|
||||
package com.youlai.boot.module.codegen.controller;
|
||||
package com.youlai.boot.codegen.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.boot.common.result.PageResult;
|
||||
import com.youlai.boot.common.result.Result;
|
||||
import com.youlai.boot.module.codegen.config.CodegenProperties;
|
||||
import com.youlai.boot.codegen.config.CodegenProperties;
|
||||
import com.youlai.boot.common.enums.ActionTypeEnum;
|
||||
import com.youlai.boot.common.enums.LogModuleEnum;
|
||||
import com.youlai.boot.module.codegen.service.CodegenService;
|
||||
import com.youlai.boot.module.codegen.model.form.GenConfigForm;
|
||||
import com.youlai.boot.module.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO;
|
||||
import com.youlai.boot.module.codegen.model.vo.TablePageVO;
|
||||
import com.youlai.boot.codegen.service.CodegenService;
|
||||
import com.youlai.boot.codegen.model.form.GenConfigForm;
|
||||
import com.youlai.boot.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
|
||||
import com.youlai.boot.codegen.model.vo.TablePageVO;
|
||||
import com.youlai.boot.common.annotation.Log;
|
||||
import com.youlai.boot.module.codegen.service.GenTableService;
|
||||
import com.youlai.boot.codegen.service.GenTableService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.boot.module.codegen.converter;
|
||||
package com.youlai.boot.codegen.converter;
|
||||
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.module.codegen.model.form.GenConfigForm;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.codegen.model.form.GenConfigForm;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.enums;
|
||||
package com.youlai.boot.codegen.enums;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.enums;
|
||||
package com.youlai.boot.codegen.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.enums;
|
||||
package com.youlai.boot.codegen.enums;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.youlai.boot.module.codegen.mapper;
|
||||
package com.youlai.boot.codegen.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.boot.module.codegen.model.vo.ColumnMetaVO;
|
||||
import com.youlai.boot.module.codegen.model.vo.TableMetaVO;
|
||||
import com.youlai.boot.module.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.module.codegen.model.vo.TablePageVO;
|
||||
import com.youlai.boot.codegen.model.vo.ColumnMetaVO;
|
||||
import com.youlai.boot.codegen.model.vo.TableMetaVO;
|
||||
import com.youlai.boot.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.codegen.model.vo.TablePageVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.module.codegen.mapper;
|
||||
package com.youlai.boot.codegen.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.codegen.model.entity.GenTableColumn;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.module.codegen.mapper;
|
||||
package com.youlai.boot.codegen.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.entity;
|
||||
package com.youlai.boot.codegen.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.youlai.boot.module.codegen.model.entity;
|
||||
package com.youlai.boot.codegen.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.youlai.boot.common.base.BaseEntity;
|
||||
import com.youlai.boot.module.codegen.enums.FormTypeEnum;
|
||||
import com.youlai.boot.module.codegen.enums.QueryTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.FormTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.QueryTypeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.module.codegen.model.form;
|
||||
package com.youlai.boot.codegen.model.form;
|
||||
|
||||
import com.youlai.boot.module.codegen.enums.FormTypeEnum;
|
||||
import com.youlai.boot.module.codegen.enums.QueryTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.FormTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.QueryTypeEnum;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.query;
|
||||
package com.youlai.boot.codegen.model.query;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.youlai.boot.common.base.BaseQuery;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.query;
|
||||
package com.youlai.boot.codegen.model.query;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.youlai.boot.common.base.BaseQuery;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.vo;
|
||||
package com.youlai.boot.codegen.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.vo;
|
||||
package com.youlai.boot.codegen.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.vo;
|
||||
package com.youlai.boot.codegen.model.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.model.vo;
|
||||
package com.youlai.boot.codegen.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.boot.module.codegen.service;
|
||||
package com.youlai.boot.codegen.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.boot.module.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO;
|
||||
import com.youlai.boot.module.codegen.model.vo.TablePageVO;
|
||||
import com.youlai.boot.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
|
||||
import com.youlai.boot.codegen.model.vo.TablePageVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.module.codegen.service;
|
||||
package com.youlai.boot.codegen.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.codegen.model.entity.GenTableColumn;
|
||||
|
||||
/**
|
||||
* 代码生成配置接口
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.boot.module.codegen.service;
|
||||
package com.youlai.boot.codegen.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.module.codegen.model.form.GenConfigForm;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.form.GenConfigForm;
|
||||
|
||||
/**
|
||||
* 代码生成配置接口
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.service.impl;
|
||||
package com.youlai.boot.codegen.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
@@ -11,18 +11,18 @@ import cn.hutool.extra.template.TemplateEngine;
|
||||
import cn.hutool.extra.template.TemplateUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.boot.module.codegen.enums.JavaTypeEnum;
|
||||
import com.youlai.boot.module.codegen.config.CodegenProperties;
|
||||
import com.youlai.boot.module.codegen.service.GenTableService;
|
||||
import com.youlai.boot.module.codegen.service.GenTableColumnService;
|
||||
import com.youlai.boot.module.codegen.service.CodegenService;
|
||||
import com.youlai.boot.codegen.enums.JavaTypeEnum;
|
||||
import com.youlai.boot.codegen.config.CodegenProperties;
|
||||
import com.youlai.boot.codegen.service.GenTableService;
|
||||
import com.youlai.boot.codegen.service.GenTableColumnService;
|
||||
import com.youlai.boot.codegen.service.CodegenService;
|
||||
import com.youlai.boot.common.exception.BusinessException;
|
||||
import com.youlai.boot.module.codegen.mapper.DatabaseMapper;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.module.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO;
|
||||
import com.youlai.boot.module.codegen.model.vo.TablePageVO;
|
||||
import com.youlai.boot.codegen.mapper.DatabaseMapper;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.codegen.model.query.TableQuery;
|
||||
import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
|
||||
import com.youlai.boot.codegen.model.vo.TablePageVO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.boot.module.codegen.service.impl;
|
||||
package com.youlai.boot.codegen.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.boot.module.codegen.mapper.GenTableColumnMapper;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.module.codegen.service.GenTableColumnService;
|
||||
import com.youlai.boot.codegen.mapper.GenTableColumnMapper;
|
||||
import com.youlai.boot.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.codegen.service.GenTableColumnService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.codegen.service.impl;
|
||||
package com.youlai.boot.codegen.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.lang.Assert;
|
||||
@@ -7,21 +7,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.boot.YouLaiBootApplication;
|
||||
import com.youlai.boot.common.enums.EnvEnum;
|
||||
import com.youlai.boot.module.codegen.enums.FormTypeEnum;
|
||||
import com.youlai.boot.module.codegen.enums.JavaTypeEnum;
|
||||
import com.youlai.boot.module.codegen.enums.QueryTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.FormTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.JavaTypeEnum;
|
||||
import com.youlai.boot.codegen.enums.QueryTypeEnum;
|
||||
import com.youlai.boot.common.exception.BusinessException;
|
||||
import com.youlai.boot.module.codegen.config.CodegenProperties;
|
||||
import com.youlai.boot.module.codegen.converter.CodegenConverter;
|
||||
import com.youlai.boot.module.codegen.mapper.DatabaseMapper;
|
||||
import com.youlai.boot.module.codegen.mapper.GenTableMapper;
|
||||
import com.youlai.boot.module.codegen.model.vo.ColumnMetaVO;
|
||||
import com.youlai.boot.module.codegen.model.vo.TableMetaVO;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.module.codegen.model.form.GenConfigForm;
|
||||
import com.youlai.boot.module.codegen.service.GenTableService;
|
||||
import com.youlai.boot.module.codegen.service.GenTableColumnService;
|
||||
import com.youlai.boot.codegen.config.CodegenProperties;
|
||||
import com.youlai.boot.codegen.converter.CodegenConverter;
|
||||
import com.youlai.boot.codegen.mapper.DatabaseMapper;
|
||||
import com.youlai.boot.codegen.mapper.GenTableMapper;
|
||||
import com.youlai.boot.codegen.model.vo.ColumnMetaVO;
|
||||
import com.youlai.boot.codegen.model.vo.TableMetaVO;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.entity.GenTableColumn;
|
||||
import com.youlai.boot.codegen.model.form.GenConfigForm;
|
||||
import com.youlai.boot.codegen.service.GenTableService;
|
||||
import com.youlai.boot.codegen.service.GenTableColumnService;
|
||||
import com.youlai.boot.system.service.MenuService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.boot.module.file.controller;
|
||||
package com.youlai.boot.file.controller;
|
||||
|
||||
import com.youlai.boot.common.result.Result;
|
||||
import com.youlai.boot.module.file.service.FileService;
|
||||
import com.youlai.boot.module.file.model.FileInfo;
|
||||
import com.youlai.boot.file.service.FileService;
|
||||
import com.youlai.boot.file.model.FileInfo;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.file.model;
|
||||
package com.youlai.boot.file.model;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.boot.module.file.service;
|
||||
package com.youlai.boot.file.service;
|
||||
|
||||
import com.youlai.boot.module.file.model.FileInfo;
|
||||
import com.youlai.boot.file.model.FileInfo;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
/**
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.file.service.impl;
|
||||
package com.youlai.boot.file.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
@@ -8,8 +8,8 @@ import com.aliyun.oss.OSS;
|
||||
import com.aliyun.oss.OSSClientBuilder;
|
||||
import com.aliyun.oss.model.ObjectMetadata;
|
||||
import com.aliyun.oss.model.PutObjectRequest;
|
||||
import com.youlai.boot.module.file.service.FileService;
|
||||
import com.youlai.boot.module.file.model.FileInfo;
|
||||
import com.youlai.boot.file.service.FileService;
|
||||
import com.youlai.boot.file.model.FileInfo;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import lombok.Data;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.youlai.boot.module.file.service.impl;
|
||||
package com.youlai.boot.file.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.youlai.boot.module.file.model.FileInfo;
|
||||
import com.youlai.boot.module.file.service.FileService;
|
||||
import com.youlai.boot.file.model.FileInfo;
|
||||
import com.youlai.boot.file.service.FileService;
|
||||
import lombok.Data;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.file.service.impl;
|
||||
package com.youlai.boot.file.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
@@ -7,8 +7,8 @@ import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.youlai.boot.common.exception.BusinessException;
|
||||
import com.youlai.boot.common.result.ResultCode;
|
||||
import com.youlai.boot.module.file.model.FileInfo;
|
||||
import com.youlai.boot.module.file.service.FileService;
|
||||
import com.youlai.boot.file.model.FileInfo;
|
||||
import com.youlai.boot.file.service.FileService;
|
||||
import io.minio.*;
|
||||
import io.minio.http.Method;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.framework.openapi;
|
||||
package com.youlai.boot.framework.apidoc;
|
||||
|
||||
|
||||
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.framework.openapi;
|
||||
package com.youlai.boot.framework.apidoc;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import com.youlai.boot.framework.security.config.SecurityProperties;
|
||||
@@ -9,7 +9,7 @@ import com.youlai.boot.framework.security.filter.TokenAuthenticationFilter;
|
||||
import com.youlai.boot.framework.security.handler.MyAccessDeniedHandler;
|
||||
import com.youlai.boot.framework.security.handler.MyAuthenticationEntryPoint;
|
||||
import com.youlai.boot.framework.security.provider.SmsAuthenticationProvider;
|
||||
import com.youlai.boot.framework.security.provider.WechatMiniAuthenticationProvider;
|
||||
import com.youlai.boot.framework.security.provider.WxMaAuthenticationProvider;
|
||||
import com.youlai.boot.framework.security.token.TokenManager;
|
||||
import com.youlai.boot.framework.security.service.SysUserDetailsService;
|
||||
import com.youlai.boot.system.service.ConfigService;
|
||||
@@ -132,11 +132,11 @@ public class SecurityConfig {
|
||||
* 微信小程序认证 Provider
|
||||
*/
|
||||
@Bean
|
||||
public WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider(
|
||||
public WxMaAuthenticationProvider wechatMiniAuthenticationProvider(
|
||||
WxMaService wxMaService,
|
||||
SysUserDetailsService sysUserDetailsService
|
||||
) {
|
||||
return new WechatMiniAuthenticationProvider(wxMaService, sysUserDetailsService);
|
||||
return new WxMaAuthenticationProvider(wxMaService, sysUserDetailsService);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -146,7 +146,7 @@ public class SecurityConfig {
|
||||
public AuthenticationManager authenticationManager(
|
||||
DaoAuthenticationProvider daoAuthenticationProvider,
|
||||
SmsAuthenticationProvider smsAuthenticationProvider,
|
||||
WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider
|
||||
WxMaAuthenticationProvider wechatMiniAuthenticationProvider
|
||||
) {
|
||||
return new ProviderManager(
|
||||
daoAuthenticationProvider,
|
||||
|
||||
@@ -9,8 +9,11 @@ import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 微信小程序认证 Token
|
||||
*
|
||||
* @author Ray.Hao
|
||||
* @since 4.0.0
|
||||
*/
|
||||
public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
|
||||
public class WxMaAuthenticationToken extends AbstractAuthenticationToken {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 622L;
|
||||
@@ -34,7 +37,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
|
||||
*
|
||||
* @param code 微信小程序code
|
||||
*/
|
||||
public WechatMiniAuthenticationToken(String code) {
|
||||
public WxMaAuthenticationToken(String code) {
|
||||
super(AuthorityUtils.NO_AUTHORITIES);
|
||||
this.principal = code;
|
||||
this.credentials = null;
|
||||
@@ -47,7 +50,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
|
||||
* @param principal 用户详情(SysUserDetails)
|
||||
* @param authorities 授权信息
|
||||
*/
|
||||
public WechatMiniAuthenticationToken(Object principal, Collection<? extends GrantedAuthority> authorities) {
|
||||
public WxMaAuthenticationToken(Object principal, Collection<? extends GrantedAuthority> authorities) {
|
||||
super(authorities);
|
||||
this.principal = principal;
|
||||
this.credentials = null;
|
||||
@@ -57,8 +60,8 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
|
||||
/**
|
||||
* 创建已认证的 Token(静态工厂方法)
|
||||
*/
|
||||
public static WechatMiniAuthenticationToken authenticated(Object principal, Collection<? extends GrantedAuthority> authorities) {
|
||||
return new WechatMiniAuthenticationToken(principal, authorities);
|
||||
public static WxMaAuthenticationToken authenticated(Object principal, Collection<? extends GrantedAuthority> authorities) {
|
||||
return new WxMaAuthenticationToken(principal, authorities);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
|
||||
import com.youlai.boot.framework.security.exception.NeedBindMobileException;
|
||||
import com.youlai.boot.framework.security.model.SysUserDetails;
|
||||
import com.youlai.boot.framework.security.model.UserAuthInfo;
|
||||
import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken;
|
||||
import com.youlai.boot.framework.security.model.WxMaAuthenticationToken;
|
||||
import com.youlai.boot.framework.security.service.SysUserDetailsService;
|
||||
import com.youlai.boot.system.model.entity.UserSocial;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -23,7 +23,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class WechatMiniAuthenticationProvider implements AuthenticationProvider {
|
||||
public class WxMaAuthenticationProvider implements AuthenticationProvider {
|
||||
|
||||
private final WxMaService wxMaService;
|
||||
private final SysUserDetailsService sysUserDetailsService;
|
||||
@@ -76,7 +76,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider
|
||||
|
||||
log.info("微信小程序登录成功:username={}, openid={}", userAuthInfo.getUsername(), openid);
|
||||
|
||||
return WechatMiniAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities());
|
||||
return WxMaAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities());
|
||||
|
||||
} catch (WxErrorException e) {
|
||||
log.error("微信小程序登录失败:调用微信接口异常,code={}", code, e);
|
||||
@@ -86,7 +86,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> authentication) {
|
||||
return WechatMiniAuthenticationToken.class.isAssignableFrom(authentication);
|
||||
return WxMaAuthenticationToken.class.isAssignableFrom(authentication);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.boot.module.sse.controller;
|
||||
package com.youlai.boot.message.controller;
|
||||
|
||||
import com.youlai.boot.common.result.Result;
|
||||
import com.youlai.boot.framework.security.model.SysUserDetails;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.boot.module.sse.service.SseService;
|
||||
import com.youlai.boot.message.service.SseService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.sse.dto;
|
||||
package com.youlai.boot.message.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.sse.dto;
|
||||
package com.youlai.boot.message.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.module.sse.job;
|
||||
package com.youlai.boot.message.job;
|
||||
|
||||
import com.youlai.boot.module.sse.registry.SseSessionRegistry;
|
||||
import com.youlai.boot.module.sse.service.SseService;
|
||||
import com.youlai.boot.message.registry.SseSessionRegistry;
|
||||
import com.youlai.boot.message.service.SseService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.boot.module.sse.registry;
|
||||
package com.youlai.boot.message.registry;
|
||||
|
||||
import com.youlai.boot.module.sse.dto.OnlineUserDTO;
|
||||
import com.youlai.boot.message.dto.OnlineUserDTO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.boot.module.sse.service;
|
||||
package com.youlai.boot.message.service;
|
||||
|
||||
import com.youlai.boot.module.sse.dto.DictChangeEvent;
|
||||
import com.youlai.boot.module.sse.dto.OnlineUserDTO;
|
||||
import com.youlai.boot.module.sse.registry.SseSessionRegistry;
|
||||
import com.youlai.boot.module.sse.topic.SseTopics;
|
||||
import com.youlai.boot.message.dto.DictChangeEvent;
|
||||
import com.youlai.boot.message.dto.OnlineUserDTO;
|
||||
import com.youlai.boot.message.registry.SseSessionRegistry;
|
||||
import com.youlai.boot.message.topic.SseTopics;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.boot.module.sse.topic;
|
||||
package com.youlai.boot.message.topic;
|
||||
|
||||
/**
|
||||
* SSE 主题常量
|
||||
@@ -17,7 +17,7 @@ import com.youlai.boot.system.model.form.DictForm;
|
||||
import com.youlai.boot.common.annotation.Log;
|
||||
import com.youlai.boot.system.service.DictItemService;
|
||||
import com.youlai.boot.system.service.DictService;
|
||||
import com.youlai.boot.module.sse.service.SseService;
|
||||
import com.youlai.boot.message.service.SseService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.system.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.system.model.form.MenuForm;
|
||||
import com.youlai.boot.common.model.Option;
|
||||
import com.youlai.boot.system.model.entity.Menu;
|
||||
|
||||
@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.boot.module.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.codegen.model.entity.GenTable;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.boot.system.converter.MenuConverter;
|
||||
import com.youlai.boot.system.mapper.MenuMapper;
|
||||
|
||||
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.boot.common.exception.BusinessException;
|
||||
import com.youlai.boot.module.sse.dto.OnlineUserDTO;
|
||||
import com.youlai.boot.message.dto.OnlineUserDTO;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.boot.system.converter.NoticeConverter;
|
||||
import com.youlai.boot.system.enums.NoticePublishStatusEnum;
|
||||
@@ -26,7 +26,7 @@ import com.youlai.boot.system.model.query.NoticeQuery;
|
||||
import com.youlai.boot.system.service.NoticeService;
|
||||
import com.youlai.boot.system.service.UserNoticeService;
|
||||
import com.youlai.boot.system.service.UserService;
|
||||
import com.youlai.boot.module.sse.service.SseService;
|
||||
import com.youlai.boot.message.service.SseService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.youlai.boot.module.codegen.mapper.DatabaseMapper">
|
||||
<mapper namespace="com.youlai.boot.codegen.mapper.DatabaseMapper">
|
||||
|
||||
<!-- 查询数据库表分页 mysql版本-->
|
||||
<select id="getTablePage" resultType="com.youlai.boot.module.codegen.model.vo.TablePageVO" databaseId="mysql">
|
||||
<select id="getTablePage" resultType="com.youlai.boot.codegen.model.vo.TablePageVO" databaseId="mysql">
|
||||
SELECT
|
||||
t1.TABLE_NAME ,
|
||||
t1.TABLE_COMMENT ,
|
||||
@@ -35,7 +35,7 @@
|
||||
</select>
|
||||
|
||||
<!-- 查询数据库表元数据 mysql版本-->
|
||||
<select id="getTableMetadata" resultType="com.youlai.boot.module.codegen.model.vo.TableMetaVO" databaseId="mysql">
|
||||
<select id="getTableMetadata" resultType="com.youlai.boot.codegen.model.vo.TableMetaVO" databaseId="mysql">
|
||||
SELECT
|
||||
TABLE_NAME ,
|
||||
TABLE_COMMENT ,
|
||||
@@ -50,7 +50,7 @@
|
||||
</select>
|
||||
|
||||
<!-- 获取数据库表字段元数据 mysql版本-->
|
||||
<select id="getTableColumns" resultType="com.youlai.boot.module.codegen.model.vo.ColumnMetaVO" databaseId="mysql">
|
||||
<select id="getTableColumns" resultType="com.youlai.boot.codegen.model.vo.ColumnMetaVO" databaseId="mysql">
|
||||
SELECT
|
||||
COLUMN_NAME,
|
||||
DATA_TYPE,
|
||||
|
||||
@@ -7,7 +7,7 @@ const ${entityName}API = {
|
||||
/** 获取${businessName}分页数据 */
|
||||
getPage(queryParams?: ${entityName}QueryParams) {
|
||||
return request<any, PageResult<${entityName}Item>>({
|
||||
url: `${${entityUpperSnake}_BASE_URL}`,
|
||||
url: \`\${${entityUpperSnake}_BASE_URL}\`,
|
||||
method: "get",
|
||||
params: queryParams,
|
||||
});
|
||||
@@ -20,7 +20,7 @@ const ${entityName}API = {
|
||||
*/
|
||||
getFormData(id: string) {
|
||||
return request<any, ${entityName}Form>({
|
||||
url: `${${entityUpperSnake}_BASE_URL}/${id}/form`,
|
||||
url: \`\${${entityUpperSnake}_BASE_URL}/\${id}/form\`,
|
||||
method: "get",
|
||||
});
|
||||
},
|
||||
@@ -32,7 +32,7 @@ const ${entityName}API = {
|
||||
*/
|
||||
create(data: ${entityName}Form) {
|
||||
return request({
|
||||
url: `${${entityUpperSnake}_BASE_URL}`,
|
||||
url: \`\${${entityUpperSnake}_BASE_URL}\`,
|
||||
method: "post",
|
||||
data,
|
||||
});
|
||||
@@ -46,7 +46,7 @@ const ${entityName}API = {
|
||||
*/
|
||||
update(id: string, data: ${entityName}Form) {
|
||||
return request({
|
||||
url: `${${entityUpperSnake}_BASE_URL}/${id}`,
|
||||
url: \`\${${entityUpperSnake}_BASE_URL}/\${id}\`,
|
||||
method: "put",
|
||||
data,
|
||||
});
|
||||
@@ -59,7 +59,7 @@ const ${entityName}API = {
|
||||
*/
|
||||
deleteByIds(ids: string) {
|
||||
return request({
|
||||
url: `${${entityUpperSnake}_BASE_URL}/${ids}`,
|
||||
url: \`\${${entityUpperSnake}_BASE_URL}/\${ids}\`,
|
||||
method: "delete",
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user