diff --git a/backend/platform-common/pom.xml b/backend/platform-common/pom.xml index d3c7b9f..8746557 100644 --- a/backend/platform-common/pom.xml +++ b/backend/platform-common/pom.xml @@ -25,6 +25,18 @@ spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-quartz + + + + + org.springframework.boot + spring-boot-starter-security + + org.projectlombok @@ -37,6 +49,62 @@ cn.hutool hutool-all + + + + org.apache.commons + commons-lang3 + + + commons-codec + commons-codec + + + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml + + + + + org.lionsoul + ip2region + + + + + eu.bitwalker + UserAgentUtils + + + + + com.baomidou + mybatis-plus-generator + + + + + org.freemarker + freemarker + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/CallBack.java b/backend/platform-common/src/main/java/com/yfd/platform/common/utils/CallBack.java index 8051fc7..7a4962a 100644 --- a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/CallBack.java +++ b/backend/platform-common/src/main/java/com/yfd/platform/common/utils/CallBack.java @@ -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 diff --git a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/MpGenerator.java b/backend/platform-common/src/main/java/com/yfd/platform/common/utils/MpGenerator.java deleted file mode 100644 index 9a67175..0000000 --- a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/MpGenerator.java +++ /dev/null @@ -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 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(); - } -} - diff --git a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzManage.java b/backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzManage.java deleted file mode 100644 index aee53a6..0000000 --- a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzManage.java +++ /dev/null @@ -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("定时任务暂停失败"); - } - } -} diff --git a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzRunnable.java b/backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzRunnable.java deleted file mode 100644 index 354902a..0000000 --- a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/QuartzRunnable.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/SecurityUtils.java b/backend/platform-common/src/main/java/com/yfd/platform/common/utils/SecurityUtils.java deleted file mode 100644 index cf4ed72..0000000 --- a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/SecurityUtils.java +++ /dev/null @@ -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 getCurrentUserDataScope(){ - UserDetails userDetails = getCurrentUser(); - JSONArray array = JSONUtil.parseArray(new JSONObject(userDetails).get("dataScopes")); - return JSONUtil.toList(array,Long.class); - } - -} diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/constant/Constant.java b/backend/platform-common/src/main/java/com/yfd/platform/constant/Constant.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/constant/Constant.java rename to backend/platform-common/src/main/java/com/yfd/platform/constant/Constant.java index 23a1044..c460999 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/constant/Constant.java +++ b/backend/platform-common/src/main/java/com/yfd/platform/constant/Constant.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.constant; +package com.yfd.platform.constant; /** * @author TangWei diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/AccessDeniedHandExcetion.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/AccessDeniedHandExcetion.java similarity index 100% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/AccessDeniedHandExcetion.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/AccessDeniedHandExcetion.java diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/AuthenticationException.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/AuthenticationException.java similarity index 100% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/AuthenticationException.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/AuthenticationException.java diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadConfigurationException.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/BadConfigurationException.java similarity index 100% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadConfigurationException.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/BadConfigurationException.java diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadRequestException.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/BadRequestException.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadRequestException.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/BadRequestException.java index 8ab437b..f2202ec 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/BadRequestException.java +++ b/backend/platform-common/src/main/java/com/yfd/platform/exception/BadRequestException.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/ChildrenExistException.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/ChildrenExistException.java similarity index 100% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/ChildrenExistException.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/ChildrenExistException.java diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/EntityExistException.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/EntityExistException.java similarity index 100% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/EntityExistException.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/EntityExistException.java diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/exception/EntityNotFoundException.java b/backend/platform-common/src/main/java/com/yfd/platform/exception/EntityNotFoundException.java similarity index 100% rename from backend/platform-system/src/main/java/com/yfd/platform/system/exception/EntityNotFoundException.java rename to backend/platform-common/src/main/java/com/yfd/platform/exception/EntityNotFoundException.java diff --git a/backend/platform-system/pom.xml b/backend/platform-system/pom.xml index 7befed1..f091f62 100644 --- a/backend/platform-system/pom.xml +++ b/backend/platform-system/pom.xml @@ -32,6 +32,18 @@ spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-websocket + + com.baomidou @@ -44,6 +56,74 @@ spring-boot-starter-security + + + org.aspectj + aspectjweaver + + + + + com.alibaba + druid + + + + + com.github.whvcse + easy-captcha + + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + + + + org.projectlombok + lombok + true + + + + com.baomidou + mybatis-plus-jsqlparser + + + + com.alibaba.fastjson2 + fastjson2 + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + com.oracle.database.jdbc + ojdbc8 + runtime + + + com.oracle.database.nls + orai18n + runtime + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/annotation/AnonymousAccess.java b/backend/platform-system/src/main/java/com/yfd/platform/annotation/AnonymousAccess.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/annotation/AnonymousAccess.java rename to backend/platform-system/src/main/java/com/yfd/platform/annotation/AnonymousAccess.java index 697ed99..2fbd4c0 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/annotation/AnonymousAccess.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/annotation/AnonymousAccess.java @@ -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.*; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/annotation/Log.java b/backend/platform-system/src/main/java/com/yfd/platform/annotation/Log.java similarity index 89% rename from backend/platform-system/src/main/java/com/yfd/platform/system/annotation/Log.java rename to backend/platform-system/src/main/java/com/yfd/platform/annotation/Log.java index 0550f14..6739494 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/annotation/Log.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/annotation/Log.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/annotation/rest/AnonymousGetMapping.java b/backend/platform-system/src/main/java/com/yfd/platform/annotation/rest/AnonymousGetMapping.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/annotation/rest/AnonymousGetMapping.java rename to backend/platform-system/src/main/java/com/yfd/platform/annotation/rest/AnonymousGetMapping.java index b97909b..01fcc32 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/annotation/rest/AnonymousGetMapping.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/annotation/rest/AnonymousGetMapping.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/aspect/LogAspect.java b/backend/platform-system/src/main/java/com/yfd/platform/aspect/LogAspect.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/aspect/LogAspect.java rename to backend/platform-system/src/main/java/com/yfd/platform/aspect/LogAspect.java index 330f78b..5b3a556 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/aspect/LogAspect.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/aspect/LogAspect.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/component/ServerSendEventServer.java b/backend/platform-system/src/main/java/com/yfd/platform/component/ServerSendEventServer.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/component/ServerSendEventServer.java rename to backend/platform-system/src/main/java/com/yfd/platform/component/ServerSendEventServer.java index 3f77766..ca1b1fe 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/component/ServerSendEventServer.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/component/ServerSendEventServer.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/component/WebSocketServer.java b/backend/platform-system/src/main/java/com/yfd/platform/component/WebSocketServer.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/component/WebSocketServer.java rename to backend/platform-system/src/main/java/com/yfd/platform/component/WebSocketServer.java index 2f25f40..1d0b913 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/component/WebSocketServer.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/component/WebSocketServer.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.component; +package com.yfd.platform.component; import org.springframework.stereotype.Component; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/AppInitProperties.java b/backend/platform-system/src/main/java/com/yfd/platform/config/AppInitProperties.java similarity index 92% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/AppInitProperties.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/AppInitProperties.java index 6c2af26..4ee304f 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/AppInitProperties.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/AppInitProperties.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/DataInitializer.java b/backend/platform-system/src/main/java/com/yfd/platform/config/DataInitializer.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/DataInitializer.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/DataInitializer.java index 24f279d..b5dab5a 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/DataInitializer.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/DataInitializer.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.config; +package com.yfd.platform.config; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/FileProperties.java b/backend/platform-system/src/main/java/com/yfd/platform/config/FileProperties.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/FileProperties.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/FileProperties.java index 5e56412..c179499 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/FileProperties.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/FileProperties.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/FileSpaceProperties.java b/backend/platform-system/src/main/java/com/yfd/platform/config/FileSpaceProperties.java similarity index 91% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/FileSpaceProperties.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/FileSpaceProperties.java index 1b58d6f..74aab7d 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/FileSpaceProperties.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/FileSpaceProperties.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/GlobalExceptionHandler.java b/backend/platform-system/src/main/java/com/yfd/platform/config/GlobalExceptionHandler.java similarity index 93% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/GlobalExceptionHandler.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/GlobalExceptionHandler.java index b4bc8c5..d241883 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/GlobalExceptionHandler.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/GlobalExceptionHandler.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/JobRunner.java b/backend/platform-system/src/main/java/com/yfd/platform/config/JobRunner.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/JobRunner.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/JobRunner.java index b394da0..74bf8db 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/JobRunner.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/JobRunner.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/JwtAuthenticationTokenFilter.java b/backend/platform-system/src/main/java/com/yfd/platform/config/JwtAuthenticationTokenFilter.java similarity index 88% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/JwtAuthenticationTokenFilter.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/JwtAuthenticationTokenFilter.java index 396f9e7..02b3ad2 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/JwtAuthenticationTokenFilter.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/JwtAuthenticationTokenFilter.java @@ -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, "登录用户已失效！"); diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/MessageConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/MessageConfig.java similarity index 79% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/MessageConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/MessageConfig.java index 9535d15..a11aae2 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/MessageConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/MessageConfig.java @@ -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 diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/MybitsPlusConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/MybitsPlusConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java index 8ed050a..99d4330 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/MybitsPlusConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/ProdApiPrefixFilter.java b/backend/platform-system/src/main/java/com/yfd/platform/config/ProdApiPrefixFilter.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/ProdApiPrefixFilter.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/ProdApiPrefixFilter.java index 75aad0e..4c1680a 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/ProdApiPrefixFilter.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/ProdApiPrefixFilter.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.config; +package com.yfd.platform.config; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/QuartzConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/QuartzConfig.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/QuartzConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/QuartzConfig.java index 4ccad1c..41a36db 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/QuartzConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/QuartzConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/ResponseResult.java b/backend/platform-system/src/main/java/com/yfd/platform/config/ResponseResult.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/ResponseResult.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/ResponseResult.java index a4a5c36..9638fcf 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/ResponseResult.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/ResponseResult.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.config; +package com.yfd.platform.config; import java.util.HashMap; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/SecurityConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/SecurityConfig.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/SecurityConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/SecurityConfig.java index abd6062..f0661f6 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/SecurityConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/SwaggerConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/SwaggerConfig.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/SwaggerConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/SwaggerConfig.java index 683b4c2..bdfe72a 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/SwaggerConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/SwaggerConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/WebConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/WebConfig.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/WebConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/WebConfig.java index f9b5dd6..45b051a 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/WebConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/WebConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/WebSocketConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/config/WebSocketConfig.java similarity index 90% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/WebSocketConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/WebSocketConfig.java index 50b91b9..349ead0 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/WebSocketConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/WebSocketConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCode.java b/backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCode.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCode.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCode.java index 3ab9cbe..2a7586b 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCode.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCode.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCodeEnum.java b/backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCodeEnum.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCodeEnum.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCodeEnum.java index f02266c..d9ade21 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginCodeEnum.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginCodeEnum.java @@ -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; /** * 验证码配置枚举 diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginProperties.java b/backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginProperties.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginProperties.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginProperties.java index 43a75e2..17d6787 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/bean/LoginProperties.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/bean/LoginProperties.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskExecutePool.java b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskExecutePool.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskExecutePool.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskExecutePool.java index afad8a3..ff10654 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskExecutePool.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskExecutePool.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskProperties.java b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskProperties.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskProperties.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskProperties.java index 35adb9e..a5bc7d2 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/AsyncTaskProperties.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/AsyncTaskProperties.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/TheadFactoryName.java b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/TheadFactoryName.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/TheadFactoryName.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/thread/TheadFactoryName.java index 6ac93f2..118faba 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/TheadFactoryName.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/TheadFactoryName.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/ThreadPoolExecutorUtil.java b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/ThreadPoolExecutorUtil.java similarity index 93% rename from backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/ThreadPoolExecutorUtil.java rename to backend/platform-system/src/main/java/com/yfd/platform/config/thread/ThreadPoolExecutorUtil.java index d4224be..c854a2e 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/config/thread/ThreadPoolExecutorUtil.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/config/thread/ThreadPoolExecutorUtil.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSource.java b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSource.java similarity index 87% rename from backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSource.java rename to backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSource.java index a6cf3ff..7c6d795 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSource.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSource.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.datasource; +package com.yfd.platform.datasource; import java.lang.annotation.*; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSourceAspect.java b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSourceAspect.java rename to backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java index 56556e2..f20c0f8 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DataSourceAspect.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSource.java b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSource.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSource.java rename to backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSource.java index 7dfbf40..8b52521 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSource.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.datasource; +package com.yfd.platform.datasource; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSourceConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSourceConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java index e54c563..f559443 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/datasource/DynamicDataSourceConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/DataSourceController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/DataSourceController.java similarity index 88% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/DataSourceController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/DataSourceController.java index 12bb0d4..211c829 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/DataSourceController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/DataSourceController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/LoginController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/LoginController.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/LoginController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/LoginController.java index 32ed69a..60a8c84 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/LoginController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/LoginController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/MessageController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/MessageController.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/MessageController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/MessageController.java index 20d0ec5..e263a8f 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/MessageController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/MessageController.java @@ -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.*; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/QuartzJobController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/QuartzJobController.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/QuartzJobController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/QuartzJobController.java index 07e20fd..05fb2df 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/QuartzJobController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/QuartzJobController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SSEController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SSEController.java similarity index 90% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SSEController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SSEController.java index 9398d9f..e5a7b5c 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SSEController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SSEController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysConfigController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysConfigController.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysConfigController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysConfigController.java index 1edb974..a0707d6 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysConfigController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysConfigController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java index 48dc722..9e03159 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryController.java @@ -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; /** *

diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryItemsController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryItemsController.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryItemsController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryItemsController.java index ee4e9e5..1d0ff6c 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysDictionaryItemsController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysDictionaryItemsController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysLogController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysLogController.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysLogController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysLogController.java index d876fac..4dc0076 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysLogController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysLogController.java @@ -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; /** diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysMenuController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysMenuController.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysMenuController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysMenuController.java index a20899f..c8516f6 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysMenuController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysMenuController.java @@ -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; /** *

diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysOrganizationController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysOrganizationController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java index 27dd726..b9e15b7 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysOrganizationController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java @@ -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; /** *

diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysRoleController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysRoleController.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysRoleController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysRoleController.java index 8267556..d647649 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/SysRoleController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/SysRoleController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/UserController.java b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/UserController.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/UserController.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/controller/UserController.java index 2b0d268..0a2a02a 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/controller/UserController.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/controller/UserController.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Dictionary.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/Dictionary.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Dictionary.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/Dictionary.java index 79d97fb..9abb146 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Dictionary.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/Dictionary.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/LoginUser.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/LoginUser.java similarity index 93% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/LoginUser.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/LoginUser.java index 02ee6c9..a920cb2 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/LoginUser.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/LoginUser.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Message.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/Message.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Message.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/Message.java index c6094b5..759819e 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/Message.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/Message.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/QuartzJob.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/QuartzJob.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/QuartzJob.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/QuartzJob.java index efa8c67..d513514 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/QuartzJob.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/QuartzJob.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysConfig.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysConfig.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysConfig.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysConfig.java index b45ba45..3830d97 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysConfig.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysConfig.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionary.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionary.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionary.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionary.java index 901912d..e57a13e 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionary.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionary.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionaryItems.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionaryItems.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionaryItems.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionaryItems.java index 86b2dcf..59a7c56 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysDictionaryItems.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysDictionaryItems.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysLog.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysLog.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysLog.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysLog.java index 7df5bb3..a359769 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysLog.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysLog.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysMenu.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysMenu.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysMenu.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysMenu.java index d13bbdf..8392ce6 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysMenu.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysMenu.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysOrganization.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysOrganization.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysOrganization.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysOrganization.java index 081720f..0f9a719 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysOrganization.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysOrganization.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysRole.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysRole.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysRole.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysRole.java index 6ef0d8b..68ab3ce 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysRole.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysRole.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysUser.java b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysUser.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysUser.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysUser.java index 9470f6e..57c5b85 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/domain/SysUser.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/domain/SysUser.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/MessageMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/MessageMapper.java similarity index 84% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/MessageMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/MessageMapper.java index 98042e9..d08fa95 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/MessageMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/MessageMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/QuartzJobMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/QuartzJobMapper.java similarity index 85% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/QuartzJobMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/QuartzJobMapper.java index 3acb9ad..ad46f1b 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/QuartzJobMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/QuartzJobMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysConfigMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysConfigMapper.java similarity index 85% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysConfigMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysConfigMapper.java index 78bfbf3..5bae048 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysConfigMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysConfigMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryItemsMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryItemsMapper.java similarity index 88% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryItemsMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryItemsMapper.java index a2dd3fd..de7deaa 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryItemsMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryItemsMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryMapper.java similarity index 92% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryMapper.java index 1a6659b..7d03ca9 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysDictionaryMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysDictionaryMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysLogMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysLogMapper.java similarity index 85% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysLogMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysLogMapper.java index bea2ce1..7b18518 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysLogMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysLogMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysMenuMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysMenuMapper.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysMenuMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysMenuMapper.java index 390edb9..061feeb 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysMenuMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysMenuMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysOrganizationMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysOrganizationMapper.java similarity index 94% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysOrganizationMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysOrganizationMapper.java index eb37288..e856aae 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysOrganizationMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysOrganizationMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysRoleMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysRoleMapper.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysRoleMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysRoleMapper.java index 73926d2..09201a1 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysRoleMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysRoleMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysUserMapper.java b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysUserMapper.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysUserMapper.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysUserMapper.java index 243d178..bc2f49f 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/mapper/SysUserMapper.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/mapper/SysUserMapper.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IMessageService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/IMessageService.java similarity index 84% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IMessageService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/IMessageService.java index 2b17e23..2b4c645 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IMessageService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/IMessageService.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IQuartzJobService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/IQuartzJobService.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IQuartzJobService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/IQuartzJobService.java index ab493bc..8b71868 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IQuartzJobService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/IQuartzJobService.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysConfigService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysConfigService.java similarity index 63% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysConfigService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysConfigService.java index b1b6ffc..94eabf6 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysConfigService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysConfigService.java @@ -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; - /** *

* 系统全局配置 服务类 diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryItemsService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryItemsService.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryItemsService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryItemsService.java index 6385a0e..32f9b8f 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryItemsService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryItemsService.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java index f3153c1..f3a4990 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysDictionaryService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysDictionaryService.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysLogService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysLogService.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysLogService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysLogService.java index 2128a62..a9871ed 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysLogService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysLogService.java @@ -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; /** *

diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysMenuService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysMenuService.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysMenuService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysMenuService.java index 4d4b017..b24b283 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysMenuService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysMenuService.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.system.service; +package com.yfd.platform.system.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysOrganizationService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysOrganizationService.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysOrganizationService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysOrganizationService.java index 545c2ba..5b03119 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysOrganizationService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysOrganizationService.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.system.service; +package com.yfd.platform.system.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysRoleService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysRoleService.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysRoleService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysRoleService.java index bf3da11..2065a17 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/ISysRoleService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/ISysRoleService.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IUserService.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/IUserService.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IUserService.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/IUserService.java index 577bb54..d514844 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/IUserService.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/IUserService.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/MessageServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/MessageServiceImpl.java similarity index 90% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/MessageServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/MessageServiceImpl.java index 6f66644..0d3875f 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/MessageServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/MessageServiceImpl.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/QuartzJobServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/QuartzJobServiceImpl.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/QuartzJobServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/QuartzJobServiceImpl.java index 5198726..d2a9030 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/QuartzJobServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/QuartzJobServiceImpl.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysConfigServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysConfigServiceImpl.java similarity index 69% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysConfigServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysConfigServiceImpl.java index f26db95..ca8e53b 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysConfigServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysConfigServiceImpl.java @@ -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; /** *

diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryItemsServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryItemsServiceImpl.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryItemsServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryItemsServiceImpl.java index 7947a40..60b0359 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryItemsServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryItemsServiceImpl.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java index f6b3903..3522d2b 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysDictionaryServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysDictionaryServiceImpl.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysLogServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysLogServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java index e3546c0..3cb1208 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysLogServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java @@ -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.*; /** diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysMenuServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysMenuServiceImpl.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysMenuServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysMenuServiceImpl.java index aa8f1fe..51c5429 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysMenuServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysMenuServiceImpl.java @@ -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; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysOrganizationServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysOrganizationServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java index 684d0ba..3eb8e18 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysOrganizationServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java @@ -1,11 +1,11 @@ -package com.yfd.platform.system.system.service.impl; +package com.yfd.platform.system.service.impl; import cn.hutool.core.util.ObjectUtil; 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.extension.service.impl.ServiceImpl; -import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.common.utils.ObjectConverterUtil; import com.yfd.platform.system.domain.SysOrganization; import com.yfd.platform.system.domain.SysRole; import com.yfd.platform.system.domain.SysUser; @@ -13,7 +13,6 @@ import com.yfd.platform.system.mapper.SysOrganizationMapper; import com.yfd.platform.system.mapper.SysRoleMapper; import com.yfd.platform.system.service.ISysOrganizationService; import com.yfd.platform.system.service.IUserService; -import com.yfd.platform.utils.ObjectConverterUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -21,7 +20,6 @@ import java.sql.Timestamp; import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** *

diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysRoleServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysRoleServiceImpl.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysRoleServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysRoleServiceImpl.java index 522845d..8714946 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/SysRoleServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/SysRoleServiceImpl.java @@ -1,9 +1,8 @@ -package com.yfd.platform.system.system.service.impl; +package com.yfd.platform.system.service.impl; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.config.ResponseResult; import com.yfd.platform.system.domain.SysRole; import com.yfd.platform.system.mapper.SysRoleMapper; import com.yfd.platform.system.service.ISysRoleService; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/UserDetailsServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/UserDetailsServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java index e02fd0c..dc28501 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/UserDetailsServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.system.service.impl; +package com.yfd.platform.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/UserServiceImpl.java b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/UserServiceImpl.java rename to backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java index 3248743..9836f75 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/system/service/impl/UserServiceImpl.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java @@ -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.StrUtil; @@ -7,19 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.config.FileProperties; -import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.common.response.ResponseResult; import com.yfd.platform.system.domain.LoginUser; -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.SysOrganizationMapper; import com.yfd.platform.system.mapper.SysRoleMapper; import com.yfd.platform.system.mapper.SysUserMapper; import com.yfd.platform.system.service.IUserService; -import com.yfd.platform.utils.FileUtil; +import com.yfd.platform.common.utils.FileUtil; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import com.yfd.platform.config.FileSpaceProperties; import jakarta.annotation.Resource; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -30,8 +26,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import jakarta.annotation.Resource; -import jakarta.validation.constraints.NotBlank; import java.io.File; import java.sql.Timestamp; import java.util.*; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/EncryptConfigUtil.java b/backend/platform-system/src/main/java/com/yfd/platform/system/utils/EncryptConfigUtil.java deleted file mode 100644 index d678d70..0000000 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/EncryptConfigUtil.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yfd.platform.system.utils; - -import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; -import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; -import org.jasypt.util.text.BasicTextEncryptor; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; - -public class EncryptConfigUtil { - - public static void main(String[] args) { - -// String salt = "rca20230101"; -// String password = "123456"; -// -// BasicTextEncryptor textEncryptor = new BasicTextEncryptor(); -// //加密所需的salt -// textEncryptor.setPassword(salt); -// //要加密的数据（数据库的用户名或密码） -// String encrypt = textEncryptor.encrypt(password); -// System.out.println("password:"+encrypt); - - - BCryptPasswordEncoder passwordEncoder=new BCryptPasswordEncoder(); - String cryptPassword=passwordEncoder.encode("dl_2023");//设置缺省密码 - - } - -} \ No newline at end of file diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/ExecutionJob.java b/backend/platform-system/src/main/java/com/yfd/platform/system/utils/ExecutionJob.java deleted file mode 100644 index 5124b7a..0000000 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/ExecutionJob.java +++ /dev/null @@ -1,103 +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.system.utils; - -import com.yfd.platform.config.MessageConfig; -import com.yfd.platform.config.thread.ThreadPoolExecutorUtil; -import com.yfd.platform.system.domain.Message; -import com.yfd.platform.system.domain.QuartzJob; -import com.yfd.platform.system.service.IMessageService; -import com.yfd.platform.system.service.IQuartzJobService; -import org.quartz.JobExecutionContext; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.quartz.QuartzJobBean; -import org.springframework.stereotype.Component; - -import jakarta.annotation.Resource; -import java.sql.Timestamp; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadPoolExecutor; - -/** - * 参考人人开源，https://gitee.com/renrenio/renren-security - * - * @author / - * @date 2019-01-07 - */ -@Async -@SuppressWarnings({"unchecked", "all"}) -public class ExecutionJob extends QuartzJobBean { - - /** - * 该处仅供参考 - */ - private final static ThreadPoolExecutor EXECUTOR = - ThreadPoolExecutorUtil.getPoll(); - - @Resource - private IMessageService messageService; - - @Resource - private MessageConfig messageConfig; - - @Override - public void executeInternal(JobExecutionContext context) { - QuartzJob quartzJob = - (QuartzJob) context.getMergedJobDataMap().get(QuartzJob.JOB_KEY); - // 获取spring bean - IQuartzJobService quartzJobService = - SpringContextHolder.getBean(IQuartzJobService.class); - String uuid = quartzJob.getId(); - long startTime = System.currentTimeMillis(); - String jobName = quartzJob.getJobName(); - try { - // 执行任务 - System.out.println( - "--------------------------------------------------------------"); - System.out.println("任务开始执行，任务名称：" + jobName); - QuartzRunnable task = new QuartzRunnable(quartzJob.getJobClass(), - quartzJob.getJobMethod(), - quartzJob.getJobParams()); - Future future = EXECUTOR.submit(task); - future.get(); - long times = System.currentTimeMillis() - startTime; - Message message = new Message(); - message.setCreatetime(new Timestamp(System.currentTimeMillis())); - message.setType("1"); - message.setTitle(quartzJob.getJobName()); - message.setContent(quartzJob.getDescription()); - message.setSenderName("定时器"); - message.setReceiverCodes(quartzJob.getOrderno().toString()); - message.setReceiverNames(""); - message.setStatus("1"); - message.setValidperiod(24); - messageConfig.addMessage(message); - // 任务状态 - System.out.println("任务执行完毕，任务名称：" + jobName + ", " + - "执行时间：" + times + "毫秒"); - System.out.println( - "--------------------------------------------------------------"); - } catch (Exception e) { - System.out.println("任务执行失败，任务名称：" + jobName); - System.out.println( - "--------------------------------------------------------------"); - quartzJob.setStatus("0"); - //更新状态 - quartzJobService.updateById(quartzJob); - } - } - -} diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/task/TaskMessage.java b/backend/platform-system/src/main/java/com/yfd/platform/task/TaskMessage.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/task/TaskMessage.java rename to backend/platform-system/src/main/java/com/yfd/platform/task/TaskMessage.java index 45f5e46..4a43d15 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/task/TaskMessage.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/task/TaskMessage.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.task; +package com.yfd.platform.task; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.yfd.platform.component.ServerSendEventServer; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/CallBack.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/CallBack.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/CallBack.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/CallBack.java index e1f9bc2..5f13d70 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/CallBack.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/CallBack.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; /** * @author: liaojinlong diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/CodeGenerator.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/CodeGenerator.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/CodeGenerator.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/CodeGenerator.java index 6674482..1c65429 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/CodeGenerator.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.OutputFile; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/EncryptUtils.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/EncryptUtils.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/EncryptUtils.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/EncryptUtils.java index a31c333..2ae2b26 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/EncryptUtils.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/EncryptUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import javax.crypto.Cipher; import javax.crypto.SecretKey; diff --git a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/ExecutionJob.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/ExecutionJob.java similarity index 99% rename from backend/platform-common/src/main/java/com/yfd/platform/common/utils/ExecutionJob.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/ExecutionJob.java index b73b013..8e9c876 100644 --- a/backend/platform-common/src/main/java/com/yfd/platform/common/utils/ExecutionJob.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/ExecutionJob.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.common.utils; +package com.yfd.platform.utils; import com.yfd.platform.config.MessageConfig; import com.yfd.platform.config.thread.ThreadPoolExecutorUtil; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/FileUtil.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/FileUtil.java similarity index 97% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/FileUtil.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/FileUtil.java index 9873fe4..9155b12 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/FileUtil.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/FileUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; @@ -22,15 +22,10 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; import com.yfd.platform.exception.BadRequestException; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFSheet; -import org.apache.tomcat.util.http.fileupload.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.ServletOutputStream; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/MpGenerator.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/MpGenerator.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/MpGenerator.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/MpGenerator.java index 943e07e..e3aec6e 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/MpGenerator.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/MpGenerator.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.OutputFile; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/ObjectConverterUtil.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/ObjectConverterUtil.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/ObjectConverterUtil.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/ObjectConverterUtil.java index d29488e..8d777be 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/ObjectConverterUtil.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/ObjectConverterUtil.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import java.lang.reflect.Field; import java.sql.Timestamp; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/PropertiesUtils.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/PropertiesUtils.java similarity index 95% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/PropertiesUtils.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/PropertiesUtils.java index 9ba8618..93c7cfd 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/PropertiesUtils.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/PropertiesUtils.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import org.springframework.core.io.ClassPathResource; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/QuartzManage.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/QuartzManage.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/QuartzManage.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/QuartzManage.java index c4fc18f..3e48311 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/QuartzManage.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/QuartzManage.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import com.yfd.platform.system.domain.QuartzJob; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.quartz.impl.triggers.CronTriggerImpl; import org.springframework.stereotype.Component; -import jakarta.annotation.Resource; import java.util.Date; import static org.quartz.TriggerBuilder.newTrigger; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/QuartzRunnable.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/QuartzRunnable.java similarity index 93% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/QuartzRunnable.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/QuartzRunnable.java index 9d089c5..ae393b2 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/QuartzRunnable.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/QuartzRunnable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -33,7 +33,7 @@ public class QuartzRunnable implements Callable { private final Method method; private final String params; - QuartzRunnable(String beanName, String methodName, String params) + public QuartzRunnable(String beanName, String methodName, String params) throws NoSuchMethodException, SecurityException { this.target = SpringContextHolder.getBean(beanName); this.params = params; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/RequestHolder.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/RequestHolder.java similarity index 96% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/RequestHolder.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/RequestHolder.java index 214189a..3dbfa55 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/RequestHolder.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/RequestHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/RsaUtils.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/RsaUtils.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/RsaUtils.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/RsaUtils.java index 4c9505b..5c3e6c7 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/RsaUtils.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/RsaUtils.java @@ -1,4 +1,4 @@ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import org.apache.commons.codec.binary.Base64; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/SecurityUtils.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/SecurityUtils.java similarity index 98% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/SecurityUtils.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/SecurityUtils.java index 6708af1..9df23cd 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/SecurityUtils.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/SecurityUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/SpringContextHolder.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/SpringContextHolder.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/SpringContextHolder.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/SpringContextHolder.java index 83ae8c1..b85c770 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/SpringContextHolder.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/SpringContextHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/StringUtils.java b/backend/platform-system/src/main/java/com/yfd/platform/utils/StringUtils.java similarity index 99% rename from backend/platform-system/src/main/java/com/yfd/platform/system/utils/StringUtils.java rename to backend/platform-system/src/main/java/com/yfd/platform/utils/StringUtils.java index d791727..b2a9be7 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/utils/StringUtils.java +++ b/backend/platform-system/src/main/java/com/yfd/platform/utils/StringUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yfd.platform.system.utils; +package com.yfd.platform.utils; import cn.hutool.http.HttpUtil; diff --git a/backend/platform-system/src/main/resources/application-devtw.yml b/backend/platform-system/src/main/resources/application-devtw.yml index f59a149..25f9511 100644 --- a/backend/platform-system/src/main/resources/application-devtw.yml +++ b/backend/platform-system/src/main/resources/application-devtw.yml @@ -26,6 +26,12 @@ spring: multipart: max-file-size: 30MB max-request-size: 100MB + data: + redis: + host: 172.16.21.142 + port: 6379 + password: zny5678 # 如果有密码 + database: 0 logging: file: diff --git a/backend/qgc-env-server/pom.xml b/backend/qgc-env-server/pom.xml index 1ee4d6b..5dff9a8 100644 --- a/backend/qgc-env-server/pom.xml +++ b/backend/qgc-env-server/pom.xml @@ -38,6 +38,11 @@ com.baomidou mybatis-plus-spring-boot4-starter + + + org.springframework.boot + spring-boot-starter-data-redis + \ No newline at end of file diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/PlatformApplication.java b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/EnvPlatformApplication.java similarity index 64% rename from backend/platform-system/src/main/java/com/yfd/platform/system/PlatformApplication.java rename to backend/qgc-env-server/src/main/java/com/yfd/platform/env/EnvPlatformApplication.java index d35a8da..c93bc25 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/PlatformApplication.java +++ b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/EnvPlatformApplication.java @@ -1,32 +1,29 @@ -package com.yfd.platform.system; +package com.yfd.platform.env; import com.yfd.platform.common.utils.SpringContextHolder; -import com.yfd.platform.system.annotation.rest.AnonymousGetMapping; -import com.yfd.platform.system.datasource.DynamicDataSourceConfig; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration; import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; import org.springframework.boot.web.server.servlet.context.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -//@SpringBootApplication @RestController @EnableTransactionManagement -@ServletComponentScan("com.yfd.platform.config") -@MapperScan(basePackages = "com.yfd.platform.*.*.mapper") +@ServletComponentScan("com.yfd.platform.system.config") +@MapperScan(basePackages = "com.yfd.platform.*.mapper") +@ComponentScan(basePackages = "com.yfd.platform") @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class, DataRedisAutoConfiguration.class}) -@Import({DynamicDataSourceConfig.class}) -@EnableCaching -public class PlatformApplication { +public class EnvPlatformApplication { public static void main(String[] args) { - SpringApplication.run(PlatformApplication.class, args); + SpringApplication.run(EnvPlatformApplication.class, args); } @Bean @@ -39,7 +36,7 @@ public class PlatformApplication { * * @return / */ - @AnonymousGetMapping("/") + @GetMapping("/") public String index() { return "Backend service started successfully"; } diff --git a/backend/platform-system/src/main/java/com/yfd/platform/system/ServletInitializer.java b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/ServletInitializer.java similarity index 70% rename from backend/platform-system/src/main/java/com/yfd/platform/system/ServletInitializer.java rename to backend/qgc-env-server/src/main/java/com/yfd/platform/env/ServletInitializer.java index b8e23ec..7f90373 100644 --- a/backend/platform-system/src/main/java/com/yfd/platform/system/ServletInitializer.java +++ b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/ServletInitializer.java @@ -1,6 +1,5 @@ -package com.yfd.platform.system; +package com.yfd.platform.env; -import com.yfd.platform.env.PlatformApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -8,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(PlatformApplication.class); + return application.sources(EnvPlatformApplication.class); } } diff --git a/backend/qgc-env-server/src/main/java/com/yfd/platform/env/entity/Env.java b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/entity/Env.java new file mode 100644 index 0000000..920cea0 --- /dev/null +++ b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/entity/Env.java @@ -0,0 +1,4 @@ +package com.yfd.platform.env.entity; + +public class Env { +} diff --git a/backend/qgc-env-server/src/main/java/com/yfd/platform/env/mapper/IEnvMapper.java b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/mapper/IEnvMapper.java new file mode 100644 index 0000000..7d57186 --- /dev/null +++ b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/mapper/IEnvMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.env.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.env.entity.Env; + +public interface IEnvMapper extends BaseMapper { +} diff --git a/backend/qgc-env-server/src/main/java/com/yfd/platform/env/service/impl/EnvServiceImpl.java b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/service/impl/EnvServiceImpl.java index c22c5d3..092083c 100644 --- a/backend/qgc-env-server/src/main/java/com/yfd/platform/env/service/impl/EnvServiceImpl.java +++ b/backend/qgc-env-server/src/main/java/com/yfd/platform/env/service/impl/EnvServiceImpl.java @@ -1,12 +1,15 @@ package com.yfd.platform.env.service.impl; import com.yfd.platform.env.service.IEnvService; +import org.springframework.stereotype.Service; + import java.util.HashMap; import java.util.Map; /** * 环境服务实现类 */ +@Service public class EnvServiceImpl implements IEnvService { @Override diff --git a/backend/qgc-env-server/src/main/resources/application-dev.yml b/backend/qgc-env-server/src/main/resources/application-dev.yml new file mode 100644 index 0000000..37c1cdd --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/application-dev.yml @@ -0,0 +1,94 @@ +server: + port: 8093 + +spring: + #应用名称 + application: + name: Project-plateform + datasource: + type: com.alibaba.druid.pool.DruidDataSource + druid: + master: + driverClassName: dm.jdbc.driver.DmDriver + url: "${DB_MASTER_URL:jdbc:dm://localhost:5236/WPPDB}" + username: "${DB_MASTER_USERNAME:WPPDB}" + password: "${DB_MASTER_PASSWORD:}" + slave: + driverClassName: dm.jdbc.driver.DmDriver + url: "${DB_SLAVE_URL:jdbc:dm://localhost:5236/WPPDB}" + username: "${DB_SLAVE_USERNAME:WPPDB}" + password: "${DB_SLAVE_PASSWORD:}" + + mvc: + pathmatch: + matching-strategy: ant_path_matcher + servlet: + multipart: + max-file-size: 30MB + max-request-size: 100MB + +logging: + file: + name: logs/projectname.log + level: + com.genersoft.iot: debug + com.genersoft.iot.vmp.storager.dao: info + com.genersoft.iot.vmp.gb28181: info + +# 在线文档： swagger-ui（生产环境建议关闭） +swagger-ui: + enabled: true + + +# 登录相关配置 +login: + # 登录缓存 + cache-enable: true + # 是否限制单用户登录 + single-login: false + # 验证码 + login-code: + # 验证码类型配置 查看 LoginProperties 类 + code-type: arithmetic + +# 启动自动数据库初始化（仅 dev/server）： +app: + init: + enabled: false + schema: classpath:db-init/sql/min-schema.sql + # data 文件可选；为避免复杂 dump 解析问题，先不导入 + # data: + marker-table: sys_user + marker-version: v1.0.0 + # 登录图形验证码有效时间/分钟 + expiration: 2 + # 验证码高度 + width: 111 + # 验证码宽度 + heigth: 36 + # 内容长度 + length: 2 + # 字体名称，为空则使用默认字体 + font-name: + # 字体大小 + font-size: 25 + +# IP 本地解析 +ip: + local-parsing: true + + +file-space: #项目文档空间 + files: D:\demoproject\files\ #单独上传的文件附件 + system: D:\demoproject\system\ #单独上传的文件 + +task: + pool: + # 核心线程池大小 + core-pool-size: 10 + # 最大线程数 + max-pool-size: 30 + # 活跃时间 + keep-alive-seconds: 60 + # 队列容量 + queue-capacity: 50 diff --git a/backend/qgc-env-server/src/main/resources/application-devtw.yml b/backend/qgc-env-server/src/main/resources/application-devtw.yml new file mode 100644 index 0000000..a3975a5 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/application-devtw.yml @@ -0,0 +1,102 @@ +server: + port: 8093 + +spring: + #应用名称 + application: + name: Project-plateform + datasource: + type: com.alibaba.druid.pool.DruidDataSource + druid: + master: + driverClassName: oracle.jdbc.OracleDriver + url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.21.134:1521/SDLYZ}" + username: "${DB_MASTER_USERNAME:QGC}" + password: "${DB_MASTER_PASSWORD:ar6Yr7Vxo5}" + slave: + driverClassName: oracle.jdbc.OracleDriver + url: "${DB_SLAVE_URL:jdbc:oracle:thin:@172.16.21.134:1521/SDLYZ}" + username: "${DB_SLAVE_USERNAME:QGC}" + password: "${DB_SLAVE_PASSWORD:ar6Yr7Vxo5}" + + mvc: + pathmatch: + matching-strategy: ant_path_matcher + servlet: + multipart: + max-file-size: 30MB + max-request-size: 100MB + data: + redis: + host: 172.16.21.142 + port: 6379 + password: zny5678 # 如果有密码 + database: 0 + cache: + type: redis + +logging: + file: + name: logs/projectname.log + level: + com.genersoft.iot: debug + com.genersoft.iot.vmp.storager.dao: info + com.genersoft.iot.vmp.gb28181: info + +# 在线文档： swagger-ui（生产环境建议关闭） +swagger-ui: + enabled: true + + +# 登录相关配置 +login: + # 登录缓存 + cache-enable: true + # 是否限制单用户登录 + single-login: false + # 验证码 + login-code: + # 验证码类型配置 查看 LoginProperties 类 + code-type: arithmetic + +# 启动自动数据库初始化（仅 dev/server）： +app: + init: + enabled: false + schema: classpath:db-init/sql/min-schema.sql + # data 文件可选；为避免复杂 dump 解析问题，先不导入 + # data: + marker-table: sys_user + marker-version: v1.0.0 + # 登录图形验证码有效时间/分钟 + expiration: 2 + # 验证码高度 + width: 111 + # 验证码宽度 + heigth: 36 + # 内容长度 + length: 2 + # 字体名称，为空则使用默认字体 + font-name: + # 字体大小 + font-size: 25 + +# IP 本地解析 +ip: + local-parsing: true + + +file-space: #项目文档空间 + files: D:\demoproject\files\ #单独上传的文件附件 + system: D:\demoproject\system\ #单独上传的文件 + +task: + pool: + # 核心线程池大小 + core-pool-size: 10 + # 最大线程数 + max-pool-size: 30 + # 活跃时间 + keep-alive-seconds: 60 + # 队列容量 + queue-capacity: 50 diff --git a/backend/qgc-env-server/src/main/resources/application-framework.yml b/backend/qgc-env-server/src/main/resources/application-framework.yml new file mode 100644 index 0000000..9baea68 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/application-framework.yml @@ -0,0 +1,30 @@ +jasypt: + encryptor: + password: ${JASYPT_PASSWORD:} + +# 密码加密传输，前端公钥加密，后端私钥解密（共性配置） +rsa: + private_key: ${RSA_PRIVATE_KEY:} + +# Actuator & Micrometer 默认配置（共性） +management: + endpoints: + web: + exposure: + include: health,info,metrics,prometheus,env,beans,threaddump,loggers,configprops + endpoint: + health: + show-details: always + metrics: + tags: + application: ${spring.application.name:platform} + + +# Springdoc 默认配置（共性） +springdoc: + api-docs: + enabled: true + swagger-ui: + enabled: true + path: /swagger-ui.html + packages-to-scan: com.yfd.platform diff --git a/backend/qgc-env-server/src/main/resources/application-server.yml b/backend/qgc-env-server/src/main/resources/application-server.yml new file mode 100644 index 0000000..b4e0057 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/application-server.yml @@ -0,0 +1,52 @@ +server: + port: 8090 + +spring: + #应用名称 + application: + name: Project-plateform + datasource: + type: com.alibaba.druid.pool.DruidDataSource + druid: + master: + driverClassName: com.mysql.cj.jdbc.Driver + url: "${DB_MASTER_URL:jdbc:mysql://43.138.168.68:3306/frameworkdb2025?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true}" + username: "${DB_MASTER_USERNAME:root}" + password: "${DB_MASTER_PASSWORD:}" + + mvc: + pathmatch: + matching-strategy: ant_path_matcher + servlet: + multipart: + max-file-size: 30MB + max-request-size: 100MB + +logging: + file: + name: logs/projectname.log + + level: + com.genersoft.iot: debug + com.genersoft.iot.vmp.storager.dao: info + com.genersoft.iot.vmp.gb28181: info + +# 在线文档： swagger-ui（生产环境建议关闭） +swagger-ui: + enabled: false + +file-space: #项目文档空间 + files: D:\demoproject\files\ #单独上传的文件附件 + useravatar: D:\demoproject\useravatar\ #用户头像 + system: D:\demoproject\system\ #系统文档根目录，用于头像等静态资源 + +# 启动自动数据库初始化（仅 dev/server）： +app: + init: + enabled: true + schema: classpath:db-init/sql/min-schema.sql + # data 文件可选；为避免复杂 dump 解析问题，先不导入 + # data: + marker-table: sys_user + marker-version: v1.0.0 + diff --git a/backend/qgc-env-server/src/main/resources/application.yml b/backend/qgc-env-server/src/main/resources/application.yml new file mode 100644 index 0000000..8f42778 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/application.yml @@ -0,0 +1,34 @@ +spring: + profiles: + active: devtw + +jasypt: + encryptor: + password: ${JASYPT_PASSWORD:} + +#密码加密传输，前端公钥加密，后端私钥解密 +rsa: + private_key: ${RSA_PRIVATE_KEY:MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==} + +# Actuator & Micrometer 默认配置 +management: + endpoints: + web: + exposure: + include: health,info,metrics,prometheus,env,beans,threaddump,loggers,configprops + endpoint: + health: + show-details: always + metrics: + tags: + application: ${spring.application.name:platform} + + +# Springdoc 默认配置 +springdoc: + api-docs: + enabled: true + swagger-ui: + enabled: true + path: /swagger-ui.html + packages-to-scan: com.yfd.platform diff --git a/backend/qgc-env-server/src/main/resources/banner.txt b/backend/qgc-env-server/src/main/resources/banner.txt new file mode 100644 index 0000000..47e51d1 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/banner.txt @@ -0,0 +1,8 @@ + __ ____ ____ .___________. _______ ______ __ __ + | | \ \ / / | || ____| / || | | | + | | \ \/ / `---| |----`| |__ | ,----'| |__| | + .--. | | \_ _/ | | | __| | | | __ | + | `--' | | | | | | |____ | `----.| | | | + \______/ |__| |__| |_______| \______||__| |__| + + diff --git a/backend/qgc-env-server/src/main/resources/log4jdbc.log4j2.properties b/backend/qgc-env-server/src/main/resources/log4jdbc.log4j2.properties new file mode 100644 index 0000000..302525f --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/log4jdbc.log4j2.properties @@ -0,0 +1,4 @@ +# If you use SLF4J. First, you need to tell log4jdbc-log4j2 that you want to use the SLF4J logger +log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator +log4jdbc.auto.load.popular.drivers=false +log4jdbc.drivers=com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/backend/qgc-env-server/src/main/resources/logback-spring.xml b/backend/qgc-env-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..31a0ed8 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/logback-spring.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + UTF-8 + ${LOG_PATTERN} + + + + + + ${LOG_PATH}/${LOG_FILE}.log + + UTF-8 + ${LOG_PATTERN} + + + ${LOG_PATH}/${LOG_FILE}.%d{yyyy-MM-dd}.log + 30 + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/qgc-env-server/src/main/resources/logback.xml b/backend/qgc-env-server/src/main/resources/logback.xml new file mode 100644 index 0000000..c949c89 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/logback.xml @@ -0,0 +1,45 @@ + + + yfAdmin + + + + + + + ${log.pattern} + ${log.charset} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/qgc-env-server/src/main/resources/mapper/EnvMapper.xml b/backend/qgc-env-server/src/main/resources/mapper/EnvMapper.xml new file mode 100644 index 0000000..316d238 --- /dev/null +++ b/backend/qgc-env-server/src/main/resources/mapper/EnvMapper.xml @@ -0,0 +1,5 @@ + + + + +