diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index b3cca09da..3457de13a 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -50,6 +50,11 @@ ruoyi-system + + com.ruoyi + ruoyi-common-doc + + com.ruoyi ruoyi-common-satoken diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5f505a29b..05135114b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -214,8 +214,10 @@ springdoc: - group: 1.演示模块 packages-to-scan: com.ruoyi.demo - group: 2.系统模块 + packages-to-scan: com.ruoyi.system + - group: 3.WEB模块 packages-to-scan: com.ruoyi.web - - group: 3.代码生成模块 + - group: 4.代码生成模块 packages-to-scan: com.ruoyi.generator # 防止XSS攻击 diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java b/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java deleted file mode 100644 index 46adf46b7..000000000 --- a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.common.job.config; - -import com.ruoyi.common.job.config.properties.XxlJobProperties; -import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * xxl-job config - * - * @author Lion Li - */ -@Slf4j -@Configuration -@EnableConfigurationProperties(XxlJobProperties.class) -@AllArgsConstructor -@ConditionalOnProperty(prefix = "xxl.job", name = "enabled", havingValue = "true") -public class XxlJobConfig { - - private final XxlJobProperties xxlJobProperties; - - @Bean - public XxlJobSpringExecutor xxlJobExecutor() { - log.info(">>>>>>>>>>> xxl-job config init."); - XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); - xxlJobSpringExecutor.setAdminAddresses(xxlJobProperties.getAdminAddresses()); - xxlJobSpringExecutor.setAccessToken(xxlJobProperties.getAccessToken()); - XxlJobProperties.Executor executor = xxlJobProperties.getExecutor(); - xxlJobSpringExecutor.setAppname(executor.getAppname()); - xxlJobSpringExecutor.setAddress(executor.getAddress()); - xxlJobSpringExecutor.setIp(executor.getIp()); - xxlJobSpringExecutor.setPort(executor.getPort()); - xxlJobSpringExecutor.setLogPath(executor.getLogPath()); - xxlJobSpringExecutor.setLogRetentionDays(executor.getLogRetentionDays()); - return xxlJobSpringExecutor; - } - -} diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/properties/XxlJobProperties.java b/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/properties/XxlJobProperties.java deleted file mode 100644 index fc89a2f38..000000000 --- a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/properties/XxlJobProperties.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.common.job.config.properties; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * xxljob配置类 - * - * @author Lion Li - */ -@Data -@ConfigurationProperties(prefix = "xxl.job") -public class XxlJobProperties { - - private Boolean enabled; - - private String adminAddresses; - - private String accessToken; - - private Executor executor; - - @Data - @NoArgsConstructor - public static class Executor { - - private String appname; - - private String address; - - private String ip; - - private int port; - - private String logPath; - - private int logRetentionDays; - } -} diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/service/SampleService.java b/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/service/SampleService.java deleted file mode 100644 index 7a1066be1..000000000 --- a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/service/SampleService.java +++ /dev/null @@ -1,252 +0,0 @@ -package com.ruoyi.common.job.service; - -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.Arrays; - -/** - * XxlJob开发示例(Bean模式) - *

- * 开发步骤: - * 1、任务开发:在Spring Bean实例中,开发Job方法; - * 2、注解配置:为Job方法添加注解 "@XxlJob(value="自定义jobhandler名称", init = "JobHandler初始化方法", destroy = "JobHandler销毁方法")",注解value值对应的是调度中心新建任务的JobHandler属性的值。 - * 3、执行日志:需要通过 "XxlJobHelper.log" 打印执行日志; - * 4、任务结果:默认任务结果为 "成功" 状态,不需要主动设置;如有诉求,比如设置任务结果为失败,可以通过 "XxlJobHelper.handleFail/handleSuccess" 自主设置任务结果; - * - * @author xuxueli 2019-12-11 21:52:51 - */ -@Slf4j -@Service -public class SampleService { - - - /** - * 1、简单任务示例(Bean模式) - */ - @XxlJob("demoJobHandler") - public void demoJobHandler() throws Exception { - XxlJobHelper.log("XXL-JOB, Hello World."); - - for (int i = 0; i < 5; i++) { - XxlJobHelper.log("beat at:" + i); - } - // default success - } - - - /** - * 2、分片广播任务 - */ - @XxlJob("shardingJobHandler") - public void shardingJobHandler() throws Exception { - - // 分片参数 - int shardIndex = XxlJobHelper.getShardIndex(); - int shardTotal = XxlJobHelper.getShardTotal(); - - XxlJobHelper.log("分片参数:当前分片序号 = {}, 总分片数 = {}", shardIndex, shardTotal); - - // 业务逻辑 - for (int i = 0; i < shardTotal; i++) { - if (i == shardIndex) { - XxlJobHelper.log("第 {} 片, 命中分片开始处理", i); - } else { - XxlJobHelper.log("第 {} 片, 忽略", i); - } - } - - } - - - /** - * 3、命令行任务 - */ - @XxlJob("commandJobHandler") - public void commandJobHandler() throws Exception { - String command = XxlJobHelper.getJobParam(); - int exitValue = -1; - - BufferedReader bufferedReader = null; - try { - // command process - ProcessBuilder processBuilder = new ProcessBuilder(); - processBuilder.command(command); - processBuilder.redirectErrorStream(true); - - Process process = processBuilder.start(); - //Process process = Runtime.getRuntime().exec(command); - - BufferedInputStream bufferedInputStream = new BufferedInputStream(process.getInputStream()); - bufferedReader = new BufferedReader(new InputStreamReader(bufferedInputStream)); - - // command log - String line; - while ((line = bufferedReader.readLine()) != null) { - XxlJobHelper.log(line); - } - - // command exit - process.waitFor(); - exitValue = process.exitValue(); - } catch (Exception e) { - XxlJobHelper.log(e); - } finally { - if (bufferedReader != null) { - bufferedReader.close(); - } - } - - if (exitValue == 0) { - // default success - } else { - XxlJobHelper.handleFail("command exit value(" + exitValue + ") is failed"); - } - - } - - - /** - * 4、跨平台Http任务 - * 参数示例: - * "url: http://www.baidu.com\n" + - * "method: get\n" + - * "data: content\n"; - */ - @XxlJob("httpJobHandler") - public void httpJobHandler() throws Exception { - - // param parse - String param = XxlJobHelper.getJobParam(); - if (param == null || param.trim().length() == 0) { - XxlJobHelper.log("param[" + param + "] invalid."); - - XxlJobHelper.handleFail(); - return; - } - - String[] httpParams = param.split("\n"); - String url = null; - String method = null; - String data = null; - for (String httpParam : httpParams) { - if (httpParam.startsWith("url:")) { - url = httpParam.substring(httpParam.indexOf("url:") + 4).trim(); - } - if (httpParam.startsWith("method:")) { - method = httpParam.substring(httpParam.indexOf("method:") + 7).trim().toUpperCase(); - } - if (httpParam.startsWith("data:")) { - data = httpParam.substring(httpParam.indexOf("data:") + 5).trim(); - } - } - - // param valid - if (url == null || url.trim().length() == 0) { - XxlJobHelper.log("url[" + url + "] invalid."); - - XxlJobHelper.handleFail(); - return; - } - if (method == null || !Arrays.asList("GET", "POST").contains(method)) { - XxlJobHelper.log("method[" + method + "] invalid."); - - XxlJobHelper.handleFail(); - return; - } - boolean isPostMethod = method.equals("POST"); - - // request - HttpURLConnection connection = null; - BufferedReader bufferedReader = null; - try { - // connection - URL realUrl = new URL(url); - connection = (HttpURLConnection) realUrl.openConnection(); - - // connection setting - connection.setRequestMethod(method); - connection.setDoOutput(isPostMethod); - connection.setDoInput(true); - connection.setUseCaches(false); - connection.setReadTimeout(5 * 1000); - connection.setConnectTimeout(3 * 1000); - connection.setRequestProperty("connection", "Keep-Alive"); - connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); - connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); - - // do connection - connection.connect(); - - // data - if (isPostMethod && data != null && data.trim().length() > 0) { - DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); - dataOutputStream.write(data.getBytes("UTF-8")); - dataOutputStream.flush(); - dataOutputStream.close(); - } - - // valid StatusCode - int statusCode = connection.getResponseCode(); - if (statusCode != 200) { - throw new RuntimeException("Http Request StatusCode(" + statusCode + ") Invalid."); - } - - // result - bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); - StringBuilder result = new StringBuilder(); - String line; - while ((line = bufferedReader.readLine()) != null) { - result.append(line); - } - String responseMsg = result.toString(); - - XxlJobHelper.log(responseMsg); - - return; - } catch (Exception e) { - XxlJobHelper.log(e); - - XxlJobHelper.handleFail(); - return; - } finally { - try { - if (bufferedReader != null) { - bufferedReader.close(); - } - if (connection != null) { - connection.disconnect(); - } - } catch (Exception e2) { - XxlJobHelper.log(e2); - } - } - - } - - /** - * 5、生命周期任务示例:任务初始化与销毁时,支持自定义相关逻辑; - */ - @XxlJob(value = "demoJobHandler2", init = "init", destroy = "destroy") - public void demoJobHandler2() throws Exception { - XxlJobHelper.log("XXL-JOB, Hello World."); - } - - public void init() { - log.info("init"); - } - - public void destroy() { - log.info("destory"); - } - - -} diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index be31c9057..9028b261f 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -58,6 +58,10 @@ com.ruoyi ruoyi-common-satoken + + com.ruoyi + ruoyi-common-web + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java index 82a5634d2..9db7597a5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.log.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java index 0ced3cb5e..39cfeca09 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ArrayUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java index 74208527d..c4aa95611 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java index d0e511676..264896651 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.log.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysIndexController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysIndexController.java index 954374dc3..1a18c0ae2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysIndexController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.common.core.config.RuoYiConfig; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java index ec2511d99..52d0bcffc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.common.core.constant.Constants; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java index 9a7de890e..c80129452 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.core.constant.CacheConstants; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java index a7c71e0fb..cfa80c9a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java index 306ecc692..92984ca06 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.log.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java index f5887f92f..8e3c10ae3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.log.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssConfigController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssConfigController.java index df1c84022..51314359e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.log.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssController.java index 23d116f6e..d18e1e569 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOssController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java index 53da30118..b147baaed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.log.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java index 54220b0f2..80745cf8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.io.FileUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRegisterController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRegisterController.java index f37d2f200..40a2174fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRegisterController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.common.core.web.controller.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java index b99795ccd..c682bd46c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index c476a9d8d..5b85e828a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java index 60aaa5211..9b4925949 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException;