zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 重构系统架构

Browse Source
This commit is contained in:
tangwei 2026-04-01 08:51:29 +08:00
parent ebc0964988
commit c5555cff1f
139 changed files with 743 additions and 773 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
backend/platform-common/pom.xml
View File

@ -25,6 +25,18 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- Spring Boot Quartz -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<!-- Spring Boot Security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
@ -37,6 +49,62 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<!-- Apache Commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<!-- POI -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
<!-- IP2Region -->
<dependency>
<groupId>org.lionsoul</groupId>
<artifactId>ip2region</artifactId>
</dependency>
<!-- UserAgentUtils -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
</dependency>
<!-- MyBatis-Plus Generator -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
<!-- Freemarker (for MyBatis-Plus Generator) -->
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
backend/platform-common/src/main/java/com/yfd/platform/common/utils/CallBack.java
View File

@ -16,7 +16,7 @@
package com.yfd.platform.common.utils;
import com.yfd.platform.system.utils.SpringContextHolder;
import com.yfd.platform.common.utils.SpringContextHolder;
/**
* @author: liaojinlong

80
backend/platform-common/src/main/java/com/yfd/platform/common/utils/MpGenerator.java
View File

@ -1,80 +0,0 @@
package com.yfd.platform.common.utils;
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
import com.yfd.platform.system.utils.PropertiesUtils;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
public class MpGenerator {
/**
* 读取控制台内容
*/
public static String scanner(String tip) {
Scanner scanner = new Scanner(System.in);
StringBuilder help = new StringBuilder();
help.append("请输入" + tip + "：");
System.out.println(help.toString());
if (scanner.hasNext()) {
String ipt = scanner.next();
if (StringUtils.hasText(ipt)) {
return ipt;
}
}
throw new RuntimeException("请输入正确的" + tip + "！");
}
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
String url = PropertiesUtils.getPropertyField("spring.datasource.url");
String username = PropertiesUtils.getPropertyField("spring.datasource.username");
String password = PropertiesUtils.getPropertyField("spring.datasource.password");
String moduleName = scanner("模块名");
String modulePath = moduleName.replace(".", "/");
Map<OutputFile, String> pathInfo = new HashMap<>();
pathInfo.put(OutputFile.entity, projectPath + "/src/main/java/com/yfd/platform/modules/domain" + modulePath + "/entity");
pathInfo.put(OutputFile.mapper, projectPath + "/src/main/java/com/yfd/platform/modules/domain/" + modulePath + "/dao");
pathInfo.put(OutputFile.controller, projectPath + "/src/main/java/com/yfd/platform/modules/domain" + modulePath + "/controller");
pathInfo.put(OutputFile.service, projectPath + "/src/main/java/com/yfd/platform/modules/domain" + modulePath + "/service");
pathInfo.put(OutputFile.serviceImpl, projectPath + "/src/main/java/com/yfd/platform/modules/domain" + modulePath + "/service/impl");
pathInfo.put(OutputFile.xml, projectPath + "/src/main/resources/mapper/" + modulePath);
FastAutoGenerator.create(url, username, password)
.globalConfig(builder -> {
builder.author("fwh")
.disableOpenDir()
.outputDir(projectPath + "/src/main/java");
})
.packageConfig(builder -> {
builder.parent(PropertiesUtils.getPropertyField("project.package.name"))
.moduleName(moduleName)
.pathInfo(pathInfo);
})
.strategyConfig(builder -> {
builder.addInclude(scanner("表名,多个英文逗号分割").split(","))
.entityBuilder()
.enableLombok()
.naming(NamingStrategy.underline_to_camel)
.columnNaming(NamingStrategy.underline_to_camel)
.controllerBuilder()
.enableRestStyle()
.mapperBuilder()
.formatMapperFileName("%sDao")
.serviceBuilder()
.formatServiceFileName("%sService")
.formatServiceImplFileName("%sServiceImpl")
.controllerBuilder()
.formatFileName("%sController");
})
.templateEngine(new FreemarkerTemplateEngine())
.execute();
}
}

187
backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzManage.java
View File

@ -1,187 +0,0 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.common.utils;
import com.yfd.platform.system.domain.QuartzJob;
import com.yfd.platform.system.utils.ExecutionJob;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.quartz.impl.triggers.CronTriggerImpl;
import org.springframework.stereotype.Component;
import java.util.Date;
import static org.quartz.TriggerBuilder.newTrigger;
/**
* @author
* @date 2019-01-07
*/
@Slf4j
@Component
public class QuartzManage {
private static final String JOB_NAME = "TASK_";
@Resource(name = "scheduler")
private Scheduler scheduler;
public void addJob(QuartzJob quartzJob) {
try {
// 构建job信息
JobDetail jobDetail = JobBuilder.newJob(ExecutionJob.class).
withIdentity(JOB_NAME + quartzJob.getId()).build();
//通过触发器名和cron 表达式创建 Trigger
Trigger cronTrigger = newTrigger()
.withIdentity(JOB_NAME + quartzJob.getId())
.startNow()
.withSchedule(CronScheduleBuilder.cronSchedule(quartzJob.getJobCron()))
.build();
cronTrigger.getJobDataMap().put(QuartzJob.JOB_KEY, quartzJob);
//重置启动时间
((CronTriggerImpl) cronTrigger).setStartTime(new Date());
//执行定时任务
scheduler.scheduleJob(jobDetail, cronTrigger);
// 暂停任务
if ("0".equals(quartzJob.getStatus())) {
pauseJob(quartzJob);
}
} catch (Exception e) {
log.error("创建定时任务失败", e);
throw new RuntimeException("创建定时任务失败");
}
}
/**
* 更新job cron表达式
*
* @param quartzJob /
*/
public void updateJobCron(QuartzJob quartzJob) {
try {
TriggerKey triggerKey =
TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
CronTrigger trigger =
(CronTrigger) scheduler.getTrigger(triggerKey);
// 如果不存在则创建一个定时任务
if (trigger == null) {
addJob(quartzJob);
trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
}
CronScheduleBuilder scheduleBuilder =
CronScheduleBuilder.cronSchedule(quartzJob.getJobCron());
trigger =
trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(scheduleBuilder).build();
//重置启动时间
((CronTriggerImpl) trigger).setStartTime(new Date());
trigger.getJobDataMap().put(QuartzJob.JOB_KEY, quartzJob);
scheduler.rescheduleJob(triggerKey, trigger);
// 暂停任务
if ("0".equals(quartzJob.getStatus())) {
pauseJob(quartzJob);
}
} catch (Exception e) {
log.error("更新定时任务失败", e);
throw new RuntimeException("更新定时任务失败");
}
}
/**
* 删除一个job
*
* @param quartzJob /
*/
public void deleteJob(QuartzJob quartzJob) {
try {
JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId());
scheduler.pauseJob(jobKey);
scheduler.deleteJob(jobKey);
} catch (Exception e) {
log.error("删除定时任务失败", e);
throw new RuntimeException("删除定时任务失败");
}
}
/**
* 恢复一个job
*
* @param quartzJob /
*/
public void resumeJob(QuartzJob quartzJob) {
try {
TriggerKey triggerKey =
TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
CronTrigger trigger =
(CronTrigger) scheduler.getTrigger(triggerKey);
// 如果不存在则创建一个定时任务
if (trigger == null) {
addJob(quartzJob);
}
JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId());
scheduler.resumeJob(jobKey);
} catch (Exception e) {
log.error("恢复定时任务失败", e);
throw new RuntimeException("恢复定时任务失败");
}
}
/**
* 立即执行job
*
* @param quartzJob /
*/
public void runJobNow(QuartzJob quartzJob) {
try {
TriggerKey triggerKey =
TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
CronTrigger trigger =
(CronTrigger) scheduler.getTrigger(triggerKey);
// 如果不存在则创建一个定时任务
if (trigger == null) {
addJob(quartzJob);
}
JobDataMap dataMap = new JobDataMap();
dataMap.put(QuartzJob.JOB_KEY, quartzJob);
JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId());
scheduler.triggerJob(jobKey, dataMap);
} catch (Exception e) {
log.error("定时任务执行失败", e);
throw new RuntimeException("定时任务执行失败");
}
}
/**
* 暂停一个job
*
* @param quartzJob /
*/
public void pauseJob(QuartzJob quartzJob) {
try {
JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId());
scheduler.pauseJob(jobKey);
} catch (Exception e) {
log.error("定时任务暂停失败", e);
throw new RuntimeException("定时任务暂停失败");
}
}
}

59
backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzRunnable.java
View File

@ -1,59 +0,0 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.common.utils;
import com.yfd.platform.system.utils.SpringContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.ReflectionUtils;
import java.lang.reflect.Method;
import java.util.concurrent.Callable;
/**
* 执行定时任务
* @author /
*/
@Slf4j
public class QuartzRunnable implements Callable<Object> {
private final Object target;
private final Method method;
private final String params;
QuartzRunnable(String beanName, String methodName, String params)
throws NoSuchMethodException, SecurityException {
this.target = SpringContextHolder.getBean(beanName);
this.params = params;
if (StringUtils.isNotBlank(params)) {
this.method = target.getClass().getDeclaredMethod(methodName, String.class);
} else {
this.method = target.getClass().getDeclaredMethod(methodName);
}
}
@Override
public Object call() throws Exception {
ReflectionUtils.makeAccessible(method);
if (StringUtils.isNotBlank(params)) {
method.invoke(target, params);
} else {
method.invoke(target);
}
return null;
}
}

85
backend/platform-common/src/main/java/com/yfd/platform/common/utils/SecurityUtils.java
View File

@ -1,85 +0,0 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.common.utils;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.yfd.platform.exception.BadRequestException;
import com.yfd.platform.system.utils.SpringContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import java.util.List;
/**
* 获取当前登录的用户
* @author
* @date 2019-01-17
*/
@Slf4j
public class SecurityUtils {
/**
* 获取当前登录的用户
* @return UserDetails
*/
public static UserDetails getCurrentUser() {
UserDetailsService userDetailsService = SpringContextHolder.getBean(UserDetailsService.class);
return userDetailsService.loadUserByUsername(getCurrentUsername());
}
/**
* 获取系统用户名称
*
* @return 系统用户名称
*/
public static String getCurrentUsername() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
throw new BadRequestException(HttpStatus.UNAUTHORIZED, "当前登录状态过期");
}
if (authentication.getPrincipal() instanceof UserDetails) {
UserDetails userDetails = (UserDetails) authentication.getPrincipal();
return userDetails.getUsername();
}
throw new BadRequestException(HttpStatus.UNAUTHORIZED, "找不到当前登录的信息");
}
/**
* 获取系统用户ID
* @return 系统用户ID
*/
public static Long getCurrentUserId() {
UserDetails userDetails = getCurrentUser();
return new JSONObject(new JSONObject(userDetails).get("user")).get("id", Long.class);
}
/**
* 获取当前用户的数据权限
* @return /
*/
public static List<Long> getCurrentUserDataScope(){
UserDetails userDetails = getCurrentUser();
JSONArray array = JSONUtil.parseArray(new JSONObject(userDetails).get("dataScopes"));
return JSONUtil.toList(array,Long.class);
}
}

2
backend/platform-system/src/main/java/com/yfd/platform/system/constant/Constant.java → backend/platform-common/src/main/java/com/yfd/platform/constant/Constant.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.constant;
package com.yfd.platform.constant;
/**
* @author TangWei

0
backend/platform-system/src/main/java/com/yfd/platform/system/exception/AccessDeniedHandExcetion.java → backend/platform-common/src/main/java/com/yfd/platform/exception/AccessDeniedHandExcetion.java
View File

0
backend/platform-system/src/main/java/com/yfd/platform/system/exception/AuthenticationException.java → backend/platform-common/src/main/java/com/yfd/platform/exception/AuthenticationException.java
View File

0
backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadConfigurationException.java → backend/platform-common/src/main/java/com/yfd/platform/exception/BadConfigurationException.java
View File

2
backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadRequestException.java → backend/platform-common/src/main/java/com/yfd/platform/exception/BadRequestException.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.exception;
package com.yfd.platform.exception;
import lombok.Getter;
import org.springframework.http.HttpStatus;

0
backend/platform-system/src/main/java/com/yfd/platform/system/exception/ChildrenExistException.java → backend/platform-common/src/main/java/com/yfd/platform/exception/ChildrenExistException.java
View File

0
backend/platform-system/src/main/java/com/yfd/platform/system/exception/EntityExistException.java → backend/platform-common/src/main/java/com/yfd/platform/exception/EntityExistException.java
View File

0
backend/platform-system/src/main/java/com/yfd/platform/system/exception/EntityNotFoundException.java → backend/platform-common/src/main/java/com/yfd/platform/exception/EntityNotFoundException.java
View File

80
backend/platform-system/pom.xml
View File

@ -32,6 +32,18 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
<!-- Spring Boot Web -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- Spring Boot WebSocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- MyBatis Plus -->
<dependency>
<groupId>com.baomidou</groupId>
@ -44,6 +56,74 @@
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- AspectJ -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
<!-- Druid -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>
<!-- Easy Captcha -->
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
</dependency>
<!-- SpringDoc OpenAPI -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-jsqlparser</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- Oracle JDBC Driver -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <mainClass>com.yfd.platform.system.PlatformApplication</mainClass>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
</project>

2
backend/platform-system/src/main/java/com/yfd/platform/system/annotation/AnonymousAccess.java → backend/platform-system/src/main/java/com/yfd/platform/annotation/AnonymousAccess.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.annotation;
package com.yfd.platform.annotation;
import java.lang.annotation.*;

2
backend/platform-system/src/main/java/com/yfd/platform/system/annotation/Log.java → backend/platform-system/src/main/java/com/yfd/platform/annotation/Log.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.annotation;
package com.yfd.platform.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
backend/platform-system/src/main/java/com/yfd/platform/system/annotation/rest/AnonymousGetMapping.java → backend/platform-system/src/main/java/com/yfd/platform/annotation/rest/AnonymousGetMapping.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.yfd.platform.system.annotation.rest;
package com.yfd.platform.annotation.rest;
import com.yfd.platform.annotation.AnonymousAccess;
import org.springframework.core.annotation.AliasFor;

3
backend/platform-system/src/main/java/com/yfd/platform/system/aspect/LogAspect.java → backend/platform-system/src/main/java/com/yfd/platform/aspect/LogAspect.java
View File

@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.aspect;
package com.yfd.platform.aspect;
import com.yfd.platform.system.domain.SysLog;
import com.yfd.platform.system.mapper.SysUserMapper;
import com.yfd.platform.system.service.ISysLogService;
import com.yfd.platform.system.service.IUserService;
import com.yfd.platform.utils.RequestHolder;

2
backend/platform-system/src/main/java/com/yfd/platform/system/component/ServerSendEventServer.java → backend/platform-system/src/main/java/com/yfd/platform/component/ServerSendEventServer.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.component;
package com.yfd.platform.component;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;

2
backend/platform-system/src/main/java/com/yfd/platform/system/component/WebSocketServer.java → backend/platform-system/src/main/java/com/yfd/platform/component/WebSocketServer.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.component;
package com.yfd.platform.component;
import org.springframework.stereotype.Component;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/AppInitProperties.java → backend/platform-system/src/main/java/com/yfd/platform/config/AppInitProperties.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/DataInitializer.java → backend/platform-system/src/main/java/com/yfd/platform/config/DataInitializer.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/FileProperties.java → backend/platform-system/src/main/java/com/yfd/platform/config/FileProperties.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/FileSpaceProperties.java → backend/platform-system/src/main/java/com/yfd/platform/config/FileSpaceProperties.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/GlobalExceptionHandler.java → backend/platform-system/src/main/java/com/yfd/platform/config/GlobalExceptionHandler.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.ControllerAdvice;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/JobRunner.java → backend/platform-system/src/main/java/com/yfd/platform/config/JobRunner.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yfd.platform.system.domain.QuartzJob;

12
backend/platform-system/src/main/java/com/yfd/platform/system/config/JwtAuthenticationTokenFilter.java → backend/platform-system/src/main/java/com/yfd/platform/config/JwtAuthenticationTokenFilter.java
View File

@ -1,23 +1,19 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import cn.hutool.jwt.JWT;
import cn.hutool.jwt.JWTUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yfd.platform.component.ServerSendEventServer;
//import com.alibaba.fastjson.JSON;
import com.yfd.platform.constant.Constant;
import com.yfd.platform.system.domain.LoginUser;
import com.yfd.platform.system.domain.Message;
import com.yfd.platform.system.service.IMessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
import jakarta.annotation.Resource;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
@ -61,7 +57,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
//从cachekey中获取用户信息
String cachekey = "login:" + userid;
String jsonstr = webConfig.loginuserCache().get(cachekey);
LoginUser loginUser = JSON.parseObject(jsonstr, LoginUser.class);
LoginUser loginUser = JSONUtil.toBean(jsonstr, LoginUser.class);
if (ObjectUtil.isEmpty(loginUser)) {
httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN,
"登录用户已失效！");

8
backend/platform-system/src/main/java/com/yfd/platform/system/config/MessageConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/MessageConfig.java
View File

@ -1,20 +1,14 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import cn.hutool.cache.Cache;
import cn.hutool.cache.impl.CacheObj;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yfd.platform.component.ServerSendEventServer;
import com.yfd.platform.constant.Constant;
import com.yfd.platform.system.domain.Message;
import com.yfd.platform.system.domain.SysUser;
import com.yfd.platform.system.service.IMessageService;
import com.yfd.platform.system.service.IUserService;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import jakarta.annotation.Resource;
import java.util.Iterator;
/**
* @author TangWei

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/MybitsPlusConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/ProdApiPrefixFilter.java → backend/platform-system/src/main/java/com/yfd/platform/config/ProdApiPrefixFilter.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/QuartzConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/QuartzConfig.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import org.quartz.Scheduler;
import org.quartz.spi.TriggerFiredBundle;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/ResponseResult.java → backend/platform-system/src/main/java/com/yfd/platform/config/ResponseResult.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import java.util.HashMap;

6
backend/platform-system/src/main/java/com/yfd/platform/system/config/SecurityConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/SecurityConfig.java
View File

@ -1,8 +1,8 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import com.yfd.platform.config.bean.LoginProperties;
import com.yfd.platform.exception.AccessDeniedHandExcetion;
import com.yfd.platform.exception.AuthenticationException;
import com.yfd.platform.system.exception.AccessDeniedHandExcetion;
import com.yfd.platform.system.exception.AuthenticationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/SwaggerConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/SwaggerConfig.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springdoc.core.models.GroupedOpenApi;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/WebConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/WebConfig.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import cn.hutool.cache.Cache;
import cn.hutool.cache.CacheUtil;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/WebSocketConfig.java → backend/platform-system/src/main/java/com/yfd/platform/config/WebSocketConfig.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.config;
package com.yfd.platform.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCode.java → backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCode.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.bean;
package com.yfd.platform.config.bean;
import lombok.Data;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCodeEnum.java → backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCodeEnum.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.bean;
package com.yfd.platform.config.bean;
/**
* 验证码配置枚举

4
backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginProperties.java → backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginProperties.java
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.bean;
package com.yfd.platform.config.bean;
import cn.hutool.core.util.StrUtil;
import com.wf.captcha.*;
import com.wf.captcha.base.Captcha;
import com.yfd.platform.exception.BadConfigurationException;
import com.yfd.platform.system.exception.BadConfigurationException;
import lombok.Data;
import java.awt.*;
import java.util.Objects;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskExecutePool.java → backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskExecutePool.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.thread;
package com.yfd.platform.config.thread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskProperties.java → backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskProperties.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.thread;
package com.yfd.platform.config.thread;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/TheadFactoryName.java → backend/platform-system/src/main/java/com/yfd/platform/config/thread/TheadFactoryName.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.thread;
package com.yfd.platform.config.thread;
import org.springframework.stereotype.Component;

4
backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/ThreadPoolExecutorUtil.java → backend/platform-system/src/main/java/com/yfd/platform/config/thread/ThreadPoolExecutorUtil.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.yfd.platform.system.config.thread;
package com.yfd.platform.config.thread;
import com.yfd.platform.utils.SpringContextHolder;
import com.yfd.platform.common.utils.SpringContextHolder;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;

2
backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSource.java → backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSource.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.datasource;
package com.yfd.platform.datasource;
import java.lang.annotation.*;

2
backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSourceAspect.java → backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.datasource;
package com.yfd.platform.datasource;
import cn.hutool.core.util.StrUtil;
import org.aspectj.lang.ProceedingJoinPoint;

2
backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSource.java → backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSource.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.datasource;
package com.yfd.platform.datasource;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;

2
backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSourceConfig.java → backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.datasource;
package com.yfd.platform.datasource;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;

5
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/DataSourceController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/DataSourceController.java
View File

@ -1,7 +1,6 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.datasource.DataSource;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.datasource.DataSourceAspect;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

12
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/LoginController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/LoginController.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@ -7,20 +7,20 @@ import cn.hutool.json.JSONUtil;
import cn.hutool.jwt.JWTUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.wf.captcha.base.Captcha;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.constant.Constant;
import com.yfd.platform.common.utils.RequestHolder;
import com.yfd.platform.common.utils.RsaUtils;
import com.yfd.platform.common.utils.StringUtils;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.config.WebConfig;
import com.yfd.platform.config.bean.LoginCodeEnum;
import com.yfd.platform.config.bean.LoginProperties;
import com.yfd.platform.constant.Constant;
import com.yfd.platform.system.domain.LoginUser;
import com.yfd.platform.system.domain.SysLog;
import com.yfd.platform.system.domain.SysUser;
import com.yfd.platform.system.service.ISysLogService;
import com.yfd.platform.system.service.IUserService;
import com.yfd.platform.utils.RequestHolder;
import com.yfd.platform.utils.RsaUtils;
import com.yfd.platform.utils.StringUtils;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;

6
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/MessageController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/MessageController.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@ -7,11 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.MessageConfig;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.config.WebConfig;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.Message;
import com.yfd.platform.system.service.IMessageService;
import com.yfd.platform.system.service.IUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;

4
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/QuartzJobController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/QuartzJobController.java
View File

@ -1,11 +1,11 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
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.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.QuartzJob;
import com.yfd.platform.system.service.IQuartzJobService;
import com.yfd.platform.system.service.impl.UserServiceImpl;

5
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SSEController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SSEController.java
View File

@ -1,12 +1,9 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yfd.platform.component.ServerSendEventServer;
import com.yfd.platform.config.WebConfig;
import com.yfd.platform.constant.Constant;
import com.yfd.platform.system.domain.Message;
import com.yfd.platform.system.service.IMessageService;
import com.yfd.platform.system.service.IUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;

4
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysConfigController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysConfigController.java
View File

@ -1,9 +1,9 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysConfig;
import com.yfd.platform.system.service.ISysConfigService;
import com.yfd.platform.system.service.IUserService;

7
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java
View File

@ -1,19 +1,16 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.StrUtil;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysDictionary;
import com.yfd.platform.system.mapper.SysDictionaryItemsMapper;
import com.yfd.platform.system.service.ISysDictionaryService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import java.util.List;
import java.util.Objects;
/**
* <p>

5
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryItemsController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryItemsController.java
View File

@ -1,12 +1,11 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysDictionaryItems;
import com.yfd.platform.system.mapper.SysDictionaryItemsMapper;
import com.yfd.platform.system.service.ISysDictionaryItemsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

5
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysLogController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysLogController.java
View File

@ -1,8 +1,8 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysLog;
import com.yfd.platform.system.service.ISysLogService;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -13,7 +13,6 @@ import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**

8
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysMenuController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysMenuController.java
View File

@ -1,18 +1,15 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysMenu;
import com.yfd.platform.system.domain.SysUser;
import com.yfd.platform.system.service.ISysMenuService;
import com.yfd.platform.system.service.IUserService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.apache.catalina.User;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -22,7 +19,6 @@ import java.io.FileNotFoundException;
import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* <p>

9
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysOrganizationController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java
View File

@ -1,15 +1,11 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysOrganization;
import com.yfd.platform.system.domain.SysRole;
import com.yfd.platform.system.domain.SysUser;
import com.yfd.platform.system.mapper.SysRoleMapper;
import com.yfd.platform.system.service.ISysOrganizationService;
import com.yfd.platform.system.service.IUserService;
import io.swagger.v3.oas.annotations.Operation;
@ -20,7 +16,6 @@ import jakarta.annotation.Resource;
import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* <p>

6
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysRoleController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysRoleController.java
View File

@ -1,11 +1,9 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysRole;
import com.yfd.platform.system.service.ISysRoleService;
import com.yfd.platform.system.service.IUserService;

4
backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/UserController.java → backend/platform-system/src/main/java/com/yfd/platform/system/controller/UserController.java
View File

@ -1,9 +1,9 @@
package com.yfd.platform.system.system.controller;
package com.yfd.platform.system.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.datasource.DataSource;
import com.yfd.platform.system.domain.SysUser;
import com.yfd.platform.system.service.IUserService;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Dictionary.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/Dictionary.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

5
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/LoginUser.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/LoginUser.java
View File

@ -1,6 +1,6 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -8,7 +8,6 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Message.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/Message.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/QuartzJob.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/QuartzJob.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysConfig.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysConfig.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionary.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionary.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionaryItems.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionaryItems.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysLog.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysLog.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysMenu.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysMenu.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysOrganization.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysOrganization.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysRole.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysRole.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysUser.java → backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysUser.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.domain;
package com.yfd.platform.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/MessageMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/MessageMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.yfd.platform.system.domain.Message;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/QuartzJobMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/QuartzJobMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.yfd.platform.system.domain.QuartzJob;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysConfigMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysConfigMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.system.domain.SysConfig;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryItemsMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryItemsMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.system.domain.SysDictionary;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysLogMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysLogMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.system.domain.SysLog;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysMenuMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysMenuMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.system.domain.SysMenu;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysOrganizationMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysOrganizationMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.system.domain.SysOrganization;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysRoleMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysRoleMapper.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.system.domain.SysRole;

3
backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysUserMapper.java → backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysUserMapper.java
View File

@ -1,7 +1,6 @@
package com.yfd.platform.system.system.mapper;
package com.yfd.platform.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.system.domain.SysUser;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IMessageService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/IMessageService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.yfd.platform.system.domain.Message;
import com.baomidou.mybatisplus.extension.service.IService;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IQuartzJobService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/IQuartzJobService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.yfd.platform.system.domain.QuartzJob;
import com.baomidou.mybatisplus.extension.service.IService;

6
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysConfigService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysConfigService.java
View File

@ -1,12 +1,8 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yfd.platform.system.domain.SysConfig;
import javax.sound.sampled.UnsupportedAudioFileException;
import java.io.IOException;
import java.util.Map;
/**
* <p>
* 系统全局配置 服务类

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryItemsService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryItemsService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yfd.platform.system.domain.SysDictionary;

3
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysLogService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysLogService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
@ -8,7 +8,6 @@ import org.aspectj.lang.ProceedingJoinPoint;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* <p>

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysMenuService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysMenuService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.service.IService;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysOrganizationService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysOrganizationService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.service.IService;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysRoleService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysRoleService.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yfd.platform.system.domain.SysRole;

6
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IUserService.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/IUserService.java
View File

@ -1,13 +1,11 @@
package com.yfd.platform.system.system.service;
package com.yfd.platform.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.system.domain.LoginUser;
import com.yfd.platform.common.response.ResponseResult;
import com.yfd.platform.system.domain.SysUser;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.List;
import java.util.Map;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/MessageServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/MessageServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import com.yfd.platform.system.domain.Message;
import com.yfd.platform.system.mapper.MessageMapper;

2
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/QuartzJobServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/QuartzJobServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yfd.platform.system.domain.QuartzJob;

8
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysConfigServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysConfigServiceImpl.java
View File

@ -1,19 +1,13 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.system.domain.SysConfig;
import com.yfd.platform.system.mapper.SysConfigMapper;
import com.yfd.platform.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import javax.sound.sampled.UnsupportedAudioFileException;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/**
* <p>

4
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryItemsServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryItemsServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.system.domain.SysDictionaryItems;
import com.yfd.platform.system.mapper.SysDictionaryItemsMapper;
import com.yfd.platform.system.service.ISysDictionaryItemsService;
import com.yfd.platform.utils.FileUtil;
import com.yfd.platform.common.utils.FileUtil;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;

5
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java
View File

@ -1,13 +1,12 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.system.domain.SysDictionary;
import com.yfd.platform.system.domain.SysDictionaryItems;
import com.yfd.platform.system.mapper.SysDictionaryItemsMapper;
import com.yfd.platform.system.mapper.SysDictionaryMapper;
import com.yfd.platform.system.mapper.SysDictionaryItemsMapper;
import com.yfd.platform.system.service.ISysDictionaryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

11
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysLogServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@ -10,10 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.system.domain.SysLog;
import com.yfd.platform.system.mapper.SysLogMapper;
import com.yfd.platform.system.mapper.SysUserMapper;
import com.yfd.platform.system.service.ISysLogService;
import com.yfd.platform.utils.FileUtil;
import com.yfd.platform.utils.StringUtils;
import com.yfd.platform.common.utils.FileUtil;
import com.yfd.platform.common.utils.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Service;
@ -22,14 +21,12 @@ import org.springframework.web.bind.annotation.RequestParam;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.AnnotatedType;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
/**

11
backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysMenuServiceImpl.java → backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysMenuServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.yfd.platform.system.system.service.impl;
package com.yfd.platform.system.service.impl;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@ -7,21 +7,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.common.utils.FileUtil;
import com.yfd.platform.common.utils.ObjectConverterUtil;
import com.yfd.platform.config.FileSpaceProperties;
import com.yfd.platform.system.domain.SysMenu;
import com.yfd.platform.system.domain.SysRole;
import com.yfd.platform.system.mapper.SysMenuMapper;
import com.yfd.platform.system.mapper.SysRoleMapper;
import com.yfd.platform.system.service.ISysMenuService;
import com.yfd.platform.utils.FileUtil;
import com.yfd.platform.config.FileSpaceProperties;
import com.yfd.platform.utils.ObjectConverterUtil;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
import org.springframework.web.multipart.MultipartFile;
import jakarta.annotation.Resource;
import java.io.File;
import java.io.FileNotFoundException;
import java.sql.Timestamp;

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