bonus
/
pub_svc_platform_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
方亮 2025-09-11 17:45:09 +08:00
parent bed1d87881 e3407cfe3c
commit 065496ee69
272 changed files with 327 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-base/src/main/java/com/bonus/BaseApplication.java
View File

@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* 启动程序
*
* @author ruoyi
* @author 黑子
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class BaseApplication

2
bonus-base/src/main/java/com/bonus/BaseServletInitializer.java
View File

@ -6,7 +6,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
/**
* web容器中进行部署
*
* @author ruoyi
* @author 黑子
*/
public class BaseServletInitializer extends SpringBootServletInitializer
{

6
bonus-base/src/main/java/com/bonus/base/controller/common/CaptchaController.java
View File

@ -11,7 +11,7 @@ import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.bonus.common.config.RuoYiConfig;
import com.bonus.common.config.BonusConfig;
import com.bonus.common.constant.CacheConstants;
import com.bonus.common.constant.Constants;
import com.bonus.common.core.domain.AjaxResult;
@ -23,7 +23,7 @@ import com.bonus.system.service.ISysConfigService;
/**
* 验证码操作处理
*
* @author ruoyi
* @author 黑子
*/
@RestController
public class CaptchaController
@ -61,7 +61,7 @@ public class CaptchaController
BufferedImage image = null;
// 生成验证码
String captchaType = RuoYiConfig.getCaptchaType();
String captchaType = BonusConfig.getCaptchaType();
if ("math".equals(captchaType))
{
String capText = captchaProducerMath.createText();

12
bonus-base/src/main/java/com/bonus/base/controller/common/CommonController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.bonus.common.config.RuoYiConfig;
import com.bonus.common.config.BonusConfig;
import com.bonus.common.constant.Constants;
import com.bonus.common.core.domain.AjaxResult;
import com.bonus.common.utils.StringUtils;
@ -24,7 +24,7 @@ import com.bonus.framework.config.ServerConfig;
/**
* 通用请求处理
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/common")
@ -53,7 +53,7 @@ public class CommonController
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
}
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
String filePath = RuoYiConfig.getDownloadPath() + fileName;
String filePath = BonusConfig.getDownloadPath() + fileName;
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response, realFileName);
@ -78,7 +78,7 @@ public class CommonController
try
{
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
String filePath = BonusConfig.getUploadPath();
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
@ -104,7 +104,7 @@ public class CommonController
try
{
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
String filePath = BonusConfig.getUploadPath();
List<String> urls = new ArrayList<String>();
List<String> fileNames = new ArrayList<String>();
List<String> newFileNames = new ArrayList<String>();
@ -146,7 +146,7 @@ public class CommonController
throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
}
// 本地资源路径
String localPath = RuoYiConfig.getProfile();
String localPath = BonusConfig.getProfile();
// 数据库资源地址
String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
// 下载名称

2
bonus-base/src/main/java/com/bonus/base/controller/monitor/CacheController.java
View File

@ -25,7 +25,7 @@ import com.bonus.system.domain.SysCache;
/**
* 缓存监控
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/monitor/cache")

2
bonus-base/src/main/java/com/bonus/base/controller/monitor/ServerController.java
View File

@ -10,7 +10,7 @@ import com.bonus.framework.web.domain.Server;
/**
* 服务器监控
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/monitor/server")

2
bonus-base/src/main/java/com/bonus/base/controller/monitor/SysLogininforController.java
View File

@ -23,7 +23,7 @@ import com.bonus.system.service.ISysLogininforService;
/**
* 系统访问记录
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/monitor/logininfor")

2
bonus-base/src/main/java/com/bonus/base/controller/monitor/SysOperlogController.java
View File

@ -22,7 +22,7 @@ import com.bonus.system.service.ISysOperLogService;
/**
* 操作日志记录
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/monitor/operlog")

2
bonus-base/src/main/java/com/bonus/base/controller/monitor/SysUserOnlineController.java
View File

@ -26,7 +26,7 @@ import com.bonus.system.service.ISysUserOnlineService;
/**
* 在线用户监控
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/monitor/online")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysConfigController.java
View File

@ -25,7 +25,7 @@ import com.bonus.system.service.ISysConfigService;
/**
* 参数配置 信息操作处理
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/config")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysDeptController.java
View File

@ -25,7 +25,7 @@ import com.bonus.system.service.ISysDeptService;
/**
* 部门信息
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/dept")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysDictDataController.java
View File

@ -28,7 +28,7 @@ import com.bonus.system.service.ISysDictTypeService;
/**
* 数据字典信息
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/dict/data")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysDictTypeController.java
View File

@ -25,7 +25,7 @@ import com.bonus.system.service.ISysDictTypeService;
/**
* 数据字典信息
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/dict/type")

8
bonus-base/src/main/java/com/bonus/base/controller/system/SysIndexController.java
View File

@ -3,20 +3,20 @@ package com.bonus.base.controller.system;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.config.RuoYiConfig;
import com.bonus.common.config.BonusConfig;
import com.bonus.common.utils.StringUtils;
/**
* 首页
*
* @author ruoyi
* @author 黑子
*/
@RestController
public class SysIndexController
{
/** 系统基础配置 */
@Autowired
private RuoYiConfig ruoyiConfig;
private BonusConfig bonusConfig;
/**
* 访问首页，提示语
@ -24,6 +24,6 @@ public class SysIndexController
@RequestMapping("/")
public String index()
{
return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", bonusConfig.getName(), bonusConfig.getVersion());
}
}

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysLoginController.java
View File

@ -24,7 +24,7 @@ import com.bonus.system.service.ISysMenuService;
/**
* 登录验证
*
* @author ruoyi
* @author 黑子
*/
@RestController
public class SysLoginController

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysMenuController.java
View File

@ -24,7 +24,7 @@ import com.bonus.system.service.ISysMenuService;
/**
* 菜单信息
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/menu")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysNoticeController.java
View File

@ -23,7 +23,7 @@ import com.bonus.system.service.ISysNoticeService;
/**
* 公告 信息操作处理
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/notice")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysPostController.java
View File

@ -25,7 +25,7 @@ import com.bonus.system.service.ISysPostService;
/**
* 岗位信息操作处理
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/post")

9
bonus-base/src/main/java/com/bonus/base/controller/system/SysProfileController.java
View File

@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.bonus.common.annotation.Log;
import com.bonus.common.config.RuoYiConfig;
import com.bonus.common.config.BonusConfig;
import com.bonus.common.core.controller.BaseController;
import com.bonus.common.core.domain.AjaxResult;
import com.bonus.common.core.domain.entity.SysUser;
@ -27,7 +27,7 @@ import com.bonus.system.service.ISysUserService;
/**
* 个人信息 业务处理
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/user/profile")
@ -114,6 +114,9 @@ public class SysProfileController extends BaseController
return error("修改密码异常，请联系管理员");
}
public static void main(String[] args) {
System.err.println(SecurityUtils.encryptPassword("Bonus@admin123"));
}
/**
* 头像上传
*/
@ -124,7 +127,7 @@ public class SysProfileController extends BaseController
if (!file.isEmpty())
{
LoginUser loginUser = getLoginUser();
String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
String avatar = FileUploadUtils.upload(BonusConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
{
AjaxResult ajax = AjaxResult.success();

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysRegisterController.java
View File

@ -14,7 +14,7 @@ import com.bonus.system.service.ISysConfigService;
/**
* 注册验证
*
* @author ruoyi
* @author 黑子
*/
@RestController
public class SysRegisterController extends BaseController

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysRoleController.java
View File

@ -34,7 +34,7 @@ import com.bonus.system.service.ISysUserService;
/**
* 角色信息
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/role")

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysUserController.java
View File

@ -35,7 +35,7 @@ import com.bonus.system.service.ISysUserService;
/**
* 用户信息
*
* @author ruoyi
* @author 黑子
*/
@RestController
@RequestMapping("/system/user")

6
bonus-base/src/main/java/com/bonus/base/controller/tool/TestController.java
View File

@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation;
/**
* swagger 用户测试方法
*
* @author ruoyi
* @author 黑子
*/
@Api("用户信息管理")
@RestController
@ -34,8 +34,8 @@ public class TestController extends BaseController
{
private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
{
users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
users.put(1, new UserEntity(1, "!Admin", "Bonus@admin123", "15888888888"));
users.put(2, new UserEntity(2, "ry", "Bonus@admin123", "15666666666"));
}
@ApiOperation("获取用户列表")

12
bonus-base/src/main/java/com/bonus/base/core/config/SwaggerConfig.java
View File

@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.bonus.common.config.RuoYiConfig;
import com.bonus.common.config.BonusConfig;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder;
@ -25,14 +25,14 @@ import springfox.documentation.spring.web.plugins.Docket;
/**
* Swagger2的接口配置
*
* @author ruoyi
* @author 黑子
*/
@Configuration
public class SwaggerConfig
{
/** 系统基础配置 */
@Autowired
private RuoYiConfig ruoyiConfig;
private BonusConfig bonusConfig;
/** 是否开启swagger */
@Value("${swagger.enabled}")
@ -58,7 +58,7 @@ public class SwaggerConfig
// 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解
// .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
// .apis(RequestHandlerSelectors.basePackage("com.bonus.project.tool.swagger"))
// 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any())
.build()
@ -117,9 +117,9 @@ public class SwaggerConfig
// 描述
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
// 作者信息
.contact(new Contact(ruoyiConfig.getName(), null, null))
.contact(new Contact(bonusConfig.getName(), null, null))
// 版本
.version("版本号:" + ruoyiConfig.getVersion())
.version("版本号:" + bonusConfig.getVersion())
.build();
}
}

8
bonus-base/src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
# 项目相关配置
ruoyi:
bonus:
# 名称
name: 博诺思
# 版本
@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2025
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath
profile: D:/bonus/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
@ -57,9 +57,9 @@ spring:
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
max-file-size: -1
# 设置总上传的文件大小
max-request-size: 20MB
max-request-size: -1
# 服务模块
devtools:
restart:

2
bonus-business/src/main/java/com/bonus/business/controller/MaterialController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
/**
* 宣传物料信息Controller
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@RestController

2
bonus-business/src/main/java/com/bonus/business/domain/TbComponentEval.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 组件星星评价信息对象 tb_component_eval
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbComponentEval extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbComponentInfo.java
View File

@ -10,7 +10,7 @@ import com.bonus.common.annotation.Excel;
/**
* 公共组件信息 通过 评价 、访问、评论 进行汇总对象 tb_component_info
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@EqualsAndHashCode(callSuper = true)

2
bonus-business/src/main/java/com/bonus/business/domain/TbComponentMsg.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 组件评论信息对象 tb_component_msg
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbComponentMsg extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbComponentMsgLike.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 评论点赞信息对象 tb_component_msg_like
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbComponentMsgLike extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFiles.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文件共享文件对象 tb_document_files
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbDocumentFiles extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFilesLabel.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文档中心文件标签记录对象 tb_document_files_label
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbDocumentFilesLabel extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFilesOper.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文件操作记录对象 tb_document_files_oper
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbDocumentFilesOper extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFolder.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文档库文件夹对象 tb_document_folder
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbDocumentFolder extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFolderAuth.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文档中心文件夹权限信息对象 tb_document_folder_auth
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbDocumentFolderAuth extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbFileLabel.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文档标签管理对象 tb_file_label
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbFileLabel extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbFilesShare.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 个人文件共享对象 tb_files_share
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbFilesShare extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbProduct.java
View File

@ -11,7 +11,7 @@ import java.util.List;
/**
* 产品信息对象 tb_product
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@EqualsAndHashCode(callSuper = true)

2
bonus-business/src/main/java/com/bonus/business/domain/TbProductCase.java
View File

@ -12,7 +12,7 @@ import java.util.List;
/**
* 产品案例对象 tb_product_case
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@EqualsAndHashCode(callSuper = true)

2
bonus-business/src/main/java/com/bonus/business/domain/TbPromotionMaterial.java
View File

@ -14,7 +14,7 @@ import java.util.stream.IntStream;
/**
* 宣传物料信息对象 tb_promotion_material
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@Data

2
bonus-business/src/main/java/com/bonus/business/domain/TbPromotionMaterialFiles.java
View File

@ -10,7 +10,7 @@ import com.bonus.common.annotation.Excel;
/**
* 宣传物料文件对象 tb_promotion_material_files
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@EqualsAndHashCode(callSuper = true)

2
bonus-business/src/main/java/com/bonus/business/domain/TbPromotionMaterialProduct.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 宣传物料归属产品对象 tb_promotion_material_product
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbPromotionMaterialProduct extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbPublicComponent.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 公共组件信息对象 tb_public_component
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbPublicComponent extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbPublicComponentBrowse.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 组件浏览悉信息对象 tb_public_component_browse
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbPublicComponentBrowse extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbPublicComponentVersion.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 组件版本信息对象 tb_public_component_version
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbPublicComponentVersion extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbUserDownload.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 文件下载中心记录对象 tb_user_download
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbUserDownload extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbUserFiles.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.annotation.Excel;
/**
* 个人文档文件对象 tb_user_files
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbUserFiles extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbUserFolder.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 个人文档文件夹对象 tb_user_folder
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbUserFolder extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/domain/TbUserLable.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.annotation.Excel;
/**
* 个人文档标签记录对象 tb_user_lable
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public class TbUserLable extends BaseEntity

2
bonus-business/src/main/java/com/bonus/business/mapper/SelectMapper.java
View File

@ -11,7 +11,7 @@ import java.util.List;
/**
* 宣传物料信息Mapper接口
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public interface SelectMapper {

2
bonus-business/src/main/java/com/bonus/business/mapper/TbPromotionMaterialMapper.java
View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* 宣传物料信息Mapper接口
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public interface TbPromotionMaterialMapper {

2
bonus-business/src/main/java/com/bonus/business/service/ITbPromotionMaterialService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* 宣传物料信息Service接口
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public interface ITbPromotionMaterialService

2
bonus-business/src/main/java/com/bonus/business/service/SelectService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* 宣传物料信息Service接口
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
public interface SelectService

2
bonus-business/src/main/java/com/bonus/business/service/impl/SelectServiceImpl.java
View File

@ -17,7 +17,7 @@ import java.util.List;
/**
* 宣传物料信息Service业务层处理
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@Service

2
bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java
View File

@ -26,7 +26,7 @@ import javax.annotation.Resource;
/**
* 宣传物料信息Service业务层处理
*
* @author ruoyi
* @author 黑子
* @date 2025-09-10
*/
@Service

10
bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml
View File

@ -26,14 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where tpt.id=#{id}
</select>
<select id="getMaterialList" resultType="com.bonus.business.domain.ProductScreenVo">
select tpm.id, tpm.type_id,tpm.type_name,tpm.name ,tpm.version ,tpm.description ,tpm.image ,
select tpm.id, tpm.type_id typeId,sdd.dict_label typeName,tpm.name ,tpm.version ,tpm.description ,tpm.image ,
pmf.file_type fileType ,pmf.file_path filePath, pmf.bucket_name bucketName,pmf.original_name originalName
from tb_promotion_material_product pmp
left join tb_promotion_material tpm on tpm.id=pmp.material_id
from tb_promotion_material tpm
left join sys_dict_data sdd on sdd.dict_value=tpm.type_id and sdd.dict_type='tb_product_type'
left join tb_promotion_material_files pmf on tpm.id=pmf.material_id and pmf.del_flag=0 and pmf.type_id=1
where tpm.del_flag=0
<if test="id!=null and id!=''">
and pmp.product_id=#{id}
<if test="typeId!=null and typeId!=''">
and tpm.type_id=#{typeId}
</if>
</select>
</mapper>

2
bonus-common/src/main/java/com/bonus/common/annotation/Anonymous.java
View File

@ -9,7 +9,7 @@ import java.lang.annotation.Target;
/**
* 匿名访问不鉴权注解
*
* @author ruoyi
* @author 黑子
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)

2
bonus-common/src/main/java/com/bonus/common/annotation/DataScope.java
View File

@ -9,7 +9,7 @@ import java.lang.annotation.Target;
/**
* 数据权限过滤注解
*
* @author ruoyi
* @author 黑子
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)

2
bonus-common/src/main/java/com/bonus/common/annotation/DataSource.java
View File

@ -13,7 +13,7 @@ import com.bonus.common.enums.DataSourceType;
*
* 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
*
* @author ruoyi
* @author 黑子
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)

2
bonus-common/src/main/java/com/bonus/common/annotation/Excel.java
View File

@ -12,7 +12,7 @@ import com.bonus.common.utils.poi.ExcelHandlerAdapter;
/**
* 自定义导出Excel数据注解
*
* @author ruoyi
* @author 黑子
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)

2
bonus-common/src/main/java/com/bonus/common/annotation/Excels.java
View File

@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* Excel注解集
*
* @author ruoyi
* @author 黑子
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)

2
bonus-common/src/main/java/com/bonus/common/annotation/Log.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.enums.OperatorType;
/**
* 自定义操作日志记录注解
*
* @author ruoyi
* @author 黑子
*
*/
@Target({ ElementType.PARAMETER, ElementType.METHOD })

2
bonus-common/src/main/java/com/bonus/common/annotation/RateLimiter.java
View File

@ -11,7 +11,7 @@ import com.bonus.common.enums.LimitType;
/**
* 限流注解
*
* @author ruoyi
* @author 黑子
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)

2
bonus-common/src/main/java/com/bonus/common/annotation/RepeatSubmit.java
View File

@ -10,7 +10,7 @@ import java.lang.annotation.Target;
/**
* 自定义注解防止表单重复提交
*
* @author ruoyi
* @author 黑子
*
*/
@Inherited

2
bonus-common/src/main/java/com/bonus/common/annotation/Sensitive.java
View File

@ -12,7 +12,7 @@ import com.bonus.common.enums.DesensitizedType;
/**
* 数据脱敏注解
*
* @author ruoyi
* @author 黑子
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)

12
bonus-common/src/main/java/com/bonus/common/config/RuoYiConfig.java → bonus-common/src/main/java/com/bonus/common/config/BonusConfig.java
View File

@ -6,11 +6,11 @@ import org.springframework.stereotype.Component;
/**
* 读取项目相关配置
*
* @author ruoyi
* @author 黑子
*/
@Component
@ConfigurationProperties(prefix = "ruoyi")
public class RuoYiConfig
@ConfigurationProperties(prefix = "bonus")
public class BonusConfig
{
/** 项目名称 */
private String name;
@ -67,7 +67,7 @@ public class RuoYiConfig
public void setProfile(String profile)
{
RuoYiConfig.profile = profile;
BonusConfig.profile = profile;
}
public static boolean isAddressEnabled()
@ -77,7 +77,7 @@ public class RuoYiConfig
public void setAddressEnabled(boolean addressEnabled)
{
RuoYiConfig.addressEnabled = addressEnabled;
BonusConfig.addressEnabled = addressEnabled;
}
public static String getCaptchaType() {
@ -85,7 +85,7 @@ public class RuoYiConfig
}
public void setCaptchaType(String captchaType) {
RuoYiConfig.captchaType = captchaType;
BonusConfig.captchaType = captchaType;
}
/**

2
bonus-common/src/main/java/com/bonus/common/config/serializer/SensitiveJsonSerializer.java
View File

@ -16,7 +16,7 @@ import com.bonus.common.utils.SecurityUtils;
/**
* 数据脱敏序列化过滤
*
* @author ruoyi
* @author 黑子
*/
public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer
{

2
bonus-common/src/main/java/com/bonus/common/constant/CacheConstants.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.constant;
/**
* 缓存的key 常量
*
* @author ruoyi
* @author 黑子
*/
public class CacheConstants
{

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

@ -6,7 +6,7 @@ import io.jsonwebtoken.Claims;
/**
* 通用常量信息
*
* @author ruoyi
* @author 黑子
*/
public class Constants
{
@ -78,7 +78,7 @@ public class Constants
/**
* 管理员角色权限标识
*/
public static final String SUPER_ADMIN = "admin";
public static final String SUPER_ADMIN = "!Admin";
/**
* 角色权限分隔符
@ -169,5 +169,5 @@ public class Constants
* 定时任务违规的字符
*/
public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
"org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
"org.springframework", "org.apache", "com.bonus.common.utils.file", "com.bonus.common.config", "com.bonus.generator" };
}

2
bonus-common/src/main/java/com/bonus/common/constant/GenConstants.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.constant;
/**
* 代码生成通用常量
*
* @author ruoyi
* @author 黑子
*/
public class GenConstants
{

2
bonus-common/src/main/java/com/bonus/common/constant/HttpStatus.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.constant;
/**
* 返回状态码
*
* @author ruoyi
* @author 黑子
*/
public class HttpStatus
{

2
bonus-common/src/main/java/com/bonus/common/constant/ScheduleConstants.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.constant;
/**
* 任务调度通用常量
*
* @author ruoyi
* @author 黑子
*/
public class ScheduleConstants
{

2
bonus-common/src/main/java/com/bonus/common/constant/UserConstants.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.constant;
/**
* 用户常量信息
*
* @author ruoyi
* @author 黑子
*/
public class UserConstants
{

2
bonus-common/src/main/java/com/bonus/common/core/controller/BaseController.java
View File

@ -24,7 +24,7 @@ import com.bonus.common.utils.sql.SqlUtil;
/**
* web层通用数据处理
*
* @author ruoyi
* @author 黑子
*/
public class BaseController
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/AjaxResult.java
View File

@ -8,7 +8,7 @@ import com.bonus.common.utils.StringUtils;
/**
* 操作消息提醒
*
* @author ruoyi
* @author 黑子
*/
public class AjaxResult extends HashMap<String, Object>
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/BaseEntity.java
View File

@ -12,7 +12,7 @@ import lombok.Data;
/**
* Entity基类
*
* @author ruoyi
* @author 黑子
*/
public class BaseEntity implements Serializable
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/R.java
View File

@ -6,7 +6,7 @@ import com.bonus.common.constant.HttpStatus;
/**
* 响应信息主体
*
* @author ruoyi
* @author 黑子
*/
public class R<T> implements Serializable
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/TreeEntity.java
View File

@ -6,7 +6,7 @@ import java.util.List;
/**
* Tree基类
*
* @author ruoyi
* @author 黑子
*/
public class TreeEntity extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/TreeSelect.java
View File

@ -13,7 +13,7 @@ import com.bonus.common.utils.StringUtils;
/**
* Treeselect树结构实体类
*
* @author ruoyi
* @author 黑子
*/
public class TreeSelect implements Serializable
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysDept.java
View File

@ -13,7 +13,7 @@ import com.bonus.common.core.domain.BaseEntity;
/**
* 部门表 sys_dept
*
* @author ruoyi
* @author 黑子
*/
public class SysDept extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysDictData.java
View File

@ -12,7 +12,7 @@ import com.bonus.common.core.domain.BaseEntity;
/**
* 字典数据表 sys_dict_data
*
* @author ruoyi
* @author 黑子
*/
public class SysDictData extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysDictType.java
View File

@ -13,7 +13,7 @@ import com.bonus.common.annotation.Excel.ColumnType;
/**
* 字典类型表 sys_dict_type
*
* @author ruoyi
* @author 黑子
*/
public class SysDictType extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysMenu.java
View File

@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 菜单权限表 sys_menu
*
* @author ruoyi
* @author 黑子
*/
public class SysMenu extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysRole.java
View File

@ -13,7 +13,7 @@ import com.bonus.common.core.domain.BaseEntity;
/**
* 角色表 sys_role
*
* @author ruoyi
* @author 黑子
*/
public class SysRole extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysUser.java
View File

@ -15,7 +15,7 @@ import com.bonus.common.xss.Xss;
/**
* 用户对象 sys_user
*
* @author ruoyi
* @author 黑子
*/
public class SysUser extends BaseEntity
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/model/LoginBody.java
View File

@ -5,7 +5,7 @@ import lombok.Data;
/**
* 用户登录对象
*
* @author ruoyi
* @author 黑子
*/
@Data
public class LoginBody {

2
bonus-common/src/main/java/com/bonus/common/core/domain/model/LoginUser.java
View File

@ -10,7 +10,7 @@ import java.util.Set;
/**
* 登录用户身份权限
*
* @author ruoyi
* @author 黑子
*/
public class LoginUser implements UserDetails
{

2
bonus-common/src/main/java/com/bonus/common/core/domain/model/RegisterBody.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.core.domain.model;
/**
* 用户注册对象
*
* @author ruoyi
* @author 黑子
*/
public class RegisterBody extends LoginBody
{

2
bonus-common/src/main/java/com/bonus/common/core/page/PageDomain.java
View File

@ -5,7 +5,7 @@ import com.bonus.common.utils.StringUtils;
/**
* 分页数据
*
* @author ruoyi
* @author 黑子
*/
public class PageDomain
{

2
bonus-common/src/main/java/com/bonus/common/core/page/TableDataInfo.java
View File

@ -6,7 +6,7 @@ import java.util.List;
/**
* 表格分页数据对象
*
* @author ruoyi
* @author 黑子
*/
public class TableDataInfo implements Serializable
{

2
bonus-common/src/main/java/com/bonus/common/core/page/TableSupport.java
View File

@ -6,7 +6,7 @@ import com.bonus.common.utils.ServletUtils;
/**
* 表格数据处理
*
* @author ruoyi
* @author 黑子
*/
public class TableSupport
{

2
bonus-common/src/main/java/com/bonus/common/core/redis/RedisCache.java
View File

@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
/**
* spring redis 工具类
*
* @author ruoyi
* @author 黑子
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component

2
bonus-common/src/main/java/com/bonus/common/core/text/CharsetKit.java
View File

@ -7,7 +7,7 @@ import com.bonus.common.utils.StringUtils;
/**
* 字符集工具类
*
* @author ruoyi
* @author 黑子
*/
public class CharsetKit
{

2
bonus-common/src/main/java/com/bonus/common/core/text/Convert.java
View File

@ -12,7 +12,7 @@ import com.bonus.common.utils.StringUtils;
/**
* 类型转换器
*
* @author ruoyi
* @author 黑子
*/
public class Convert
{

2
bonus-common/src/main/java/com/bonus/common/core/text/StrFormatter.java
View File

@ -5,7 +5,7 @@ import com.bonus.common.utils.StringUtils;
/**
* 字符串格式化
*
* @author ruoyi
* @author 黑子
*/
public class StrFormatter
{

2
bonus-common/src/main/java/com/bonus/common/enums/BusinessStatus.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.enums;
/**
* 操作状态
*
* @author ruoyi
* @author 黑子
*
*/
public enum BusinessStatus

2
bonus-common/src/main/java/com/bonus/common/enums/BusinessType.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.enums;
/**
* 业务操作类型
*
* @author ruoyi
* @author 黑子
*/
public enum BusinessType
{

2
bonus-common/src/main/java/com/bonus/common/enums/DataSourceType.java
View File

@ -3,7 +3,7 @@ package com.bonus.common.enums;
/**
* 数据源
*
* @author ruoyi
* @author 黑子
*/
public enum DataSourceType
{

2
bonus-common/src/main/java/com/bonus/common/enums/DesensitizedType.java
View File

@ -6,7 +6,7 @@ import com.bonus.common.utils.DesensitizedUtil;
/**
* 脱敏类型
*
* @author ruoyi
* @author 黑子
*/
public enum DesensitizedType
{

2
bonus-common/src/main/java/com/bonus/common/enums/HttpMethod.java
View File

@ -7,7 +7,7 @@ import org.springframework.lang.Nullable;
/**
* 请求方式
*
* @author ruoyi
* @author 黑子
*/
public enum HttpMethod
{

Some files were not shown because too many files have changed in this diff Show More