diff --git a/LICENSE b/LICENSE index bd95df1..c07e606 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 若依 +Copyright (c) 2020 彤然 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2bf2429..9503606 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,52 @@

logo

-

RuoYi v3.6.6

+

tongran v3.6.6

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

- - - + + +

## 平台简介 -若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 +彤然是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 -* 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。 +* 采用前后端分离的模式，微服务版本前端(基于 [tongran-Vue](https://gitee.com/y_project/tongran-Vue))。 * 后端采用Spring Boot、Spring Cloud & Alibaba。 * 注册中心、配置中心选型Nacos，权限认证使用Redis。 * 流量控制框架选型Sentinel，分布式事务选型Seata。 -* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。 -* 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) -* 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)   +* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[tongran-Cloud-Vue3](https://gitcode.com/yangzongzhuan/tongran-Cloud-Vue3)，保持同步更新。 +* 如需不分离应用，请移步 [tongran](https://gitee.com/y_project/tongran)，如需分离应用，请移步 [tongran-Vue](https://gitee.com/y_project/tongran-Vue) +* 阿里云优惠券：[点我进入](http://aly.tongran.vip)，腾讯云优惠券：[点我进入](http://txy.tongran.vip)   ## 系统模块 ~~~ -com.ruoyi -├── ruoyi-ui // 前端框架 [80] -├── ruoyi-gateway // 网关模块 [8080] -├── ruoyi-auth // 认证中心 [9200] -├── ruoyi-api // 接口模块 -│ └── ruoyi-api-system // 系统接口 -├── ruoyi-common // 通用模块 -│ └── ruoyi-common-core // 核心模块 -│ └── ruoyi-common-datascope // 权限范围 -│ └── ruoyi-common-datasource // 多数据源 -│ └── ruoyi-common-log // 日志记录 -│ └── ruoyi-common-redis // 缓存服务 -│ └── ruoyi-common-seata // 分布式事务 -│ └── ruoyi-common-security // 安全模块 -│ └── ruoyi-common-sensitive // 数据脱敏 -│ └── ruoyi-common-swagger // 系统接口 -├── ruoyi-modules // 业务模块 -│ └── ruoyi-system // 系统模块 [9201] -│ └── ruoyi-gen // 代码生成 [9202] -│ └── ruoyi-job // 定时任务 [9203] -│ └── ruoyi-file // 文件服务 [9300] -├── ruoyi-visual // 图形化管理模块 -│ └── ruoyi-visual-monitor // 监控中心 [9100] +com.tongran +├── tongran-ui // 前端框架 [80] +├── tongran-gateway // 网关模块 [8080] +├── tongran-auth // 认证中心 [9200] +├── tongran-api // 接口模块 +│ └── tongran-api-system // 系统接口 +├── tongran-common // 通用模块 +│ └── tongran-common-core // 核心模块 +│ └── tongran-common-datascope // 权限范围 +│ └── tongran-common-datasource // 多数据源 +│ └── tongran-common-log // 日志记录 +│ └── tongran-common-redis // 缓存服务 +│ └── tongran-common-seata // 分布式事务 +│ └── tongran-common-security // 安全模块 +│ └── tongran-common-sensitive // 数据脱敏 +│ └── tongran-common-swagger // 系统接口 +├── tongran-modules // 业务模块 +│ └── tongran-system // 系统模块 [9201] +│ └── tongran-gen // 代码生成 [9202] +│ └── tongran-job // 定时任务 [9203] +│ └── tongran-file // 文件服务 [9300] +├── tongran-visual // 图形化管理模块 +│ └── tongran-visual-monitor // 监控中心 [9100] ├──pom.xml // 公共依赖 ~~~ @@ -79,8 +79,8 @@ com.ruoyi - admin/admin123 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 -演示地址：http://ruoyi.vip -文档地址：http://doc.ruoyi.vip +演示地址：http://tongran.vip +文档地址：http://doc.tongran.vip ## 演示图 @@ -124,6 +124,6 @@ com.ruoyi -## 若依微服务交流群 +## 彤然微服务交流群 QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/已满-158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) [![加入QQ群](https://img.shields.io/badge/112869560-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Kuaw0Xdlw2Nlgn6s8h9elzuquHGxGObD&authKey=cSrQcWQ%2BzQZAFFrwxaR%2BbzcumX4WRduZnd1O6JO1dlclQMiu%2BKwxAy8t2JfNp67V&noverify=0&group_code=112869560) 点击按钮入群。 \ No newline at end of file diff --git a/bin/run-auth.bat b/bin/run-auth.bat index 0d0952a..d50418a 100644 --- a/bin/run-auth.bat +++ b/bin/run-auth.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarAuth̡ +echo [��Ϣ] ʹ��Jar��������Auth���̡� echo. cd %~dp0 -cd ../ruoyi-auth/target +cd ../tongran-auth/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-auth.jar cd bin pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat index e43d60b..2c790c6 100644 --- a/bin/run-gateway.bat +++ b/bin/run-gateway.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarGateway̡ +echo [��Ϣ] ʹ��Jar��������Gateway���̡� echo. cd %~dp0 -cd ../ruoyi-gateway/target +cd ../tongran-gateway/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-gateway.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat index 6d89c90..46c8515 100644 --- a/bin/run-modules-file.bat +++ b/bin/run-modules-file.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarModules-File̡ +echo [��Ϣ] ʹ��Jar��������Modules-File���̡� echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-file/target +cd ../tongran-modules/tongran-file/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-modules-file.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat index 0a4c390..b79176c 100644 --- a/bin/run-modules-gen.bat +++ b/bin/run-modules-gen.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarModules-Gen̡ +echo [��Ϣ] ʹ��Jar��������Modules-Gen���̡� echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-gen/target +cd ../tongran-modules/tongran-gen/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-modules-gen.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat index 443e59d..c7508f4 100644 --- a/bin/run-modules-job.bat +++ b/bin/run-modules-job.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarModules-Job̡ +echo [��Ϣ] ʹ��Jar��������Modules-Job���̡� echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-job/target +cd ../tongran-modules/tongran-job/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-modules-job.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat index 26db55e..c1384f4 100644 --- a/bin/run-modules-system.bat +++ b/bin/run-modules-system.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarModules-System̡ +echo [��Ϣ] ʹ��Jar��������Modules-System���̡� echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-system/target +cd ../tongran-modules/tongran-system/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-modules-system.jar cd bin pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat index 3e8e322..f4d9f8d 100644 --- a/bin/run-monitor.bat +++ b/bin/run-monitor.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] ʹJarMonitor̡ +echo [��Ϣ] ʹ��Jar��������Monitor���̡� echo. cd %~dp0 -cd ../ruoyi-visual/ruoyi-monitor/target +cd ../tongran-visual/tongran-monitor/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar tongran-visual-monitor.jar cd bin pause \ No newline at end of file diff --git a/docker/copy.sh b/docker/copy.sh index 956a071..09fd884 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -14,28 +14,28 @@ cp ../sql/ry_config_20250224.sql ./mysql/db # copy html echo "begin copy html " -cp -r ../ruoyi-ui/dist/** ./nginx/html/dist +cp -r ../tongran-ui/dist/** ./nginx/html/dist # copy jar -echo "begin copy ruoyi-gateway " -cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar +echo "begin copy tongran-gateway " +cp ../tongran-gateway/target/tongran-gateway.jar ./tongran/gateway/jar -echo "begin copy ruoyi-auth " -cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar +echo "begin copy tongran-auth " +cp ../tongran-auth/target/tongran-auth.jar ./tongran/auth/jar -echo "begin copy ruoyi-visual " -cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar ./ruoyi/visual/monitor/jar +echo "begin copy tongran-visual " +cp ../tongran-visual/tongran-monitor/target/tongran-visual-monitor.jar ./tongran/visual/monitor/jar -echo "begin copy ruoyi-modules-system " -cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar +echo "begin copy tongran-modules-system " +cp ../tongran-modules/tongran-system/target/tongran-modules-system.jar ./tongran/modules/system/jar -echo "begin copy ruoyi-modules-file " -cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar +echo "begin copy tongran-modules-file " +cp ../tongran-modules/tongran-file/target/tongran-modules-file.jar ./tongran/modules/file/jar -echo "begin copy ruoyi-modules-job " -cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar +echo "begin copy tongran-modules-job " +cp ../tongran-modules/tongran-job/target/tongran-modules-job.jar ./tongran/modules/job/jar -echo "begin copy ruoyi-modules-gen " -cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar +echo "begin copy tongran-modules-gen " +cp ../tongran-modules/tongran-gen/target/tongran-modules-gen.jar ./tongran/modules/gen/jar diff --git a/docker/deploy.sh b/docker/deploy.sh index 0248909..9803af2 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -26,12 +26,12 @@ port(){ # 启动基础环境（必须） base(){ - docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos + docker-compose up -d tongran-mysql tongran-redis tongran-nacos } # 启动程序模块（必须） modules(){ - docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system + docker-compose up -d tongran-nginx tongran-gateway tongran-auth tongran-modules-system } # 关闭所有环境/模块 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 931249d..8d9fbfd 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version : '3.8' services: - ruoyi-nacos: - container_name: ruoyi-nacos + tongran-nacos: + container_name: tongran-nacos image: nacos/nacos-server build: context: ./nacos @@ -15,9 +15,9 @@ services: - "9848:9848" - "9849:9849" depends_on: - - ruoyi-mysql - ruoyi-mysql: - container_name: ruoyi-mysql + - tongran-mysql + tongran-mysql: + container_name: tongran-mysql image: mysql:5.7 build: context: ./mysql @@ -38,103 +38,103 @@ services: environment: MYSQL_DATABASE: 'ry-cloud' MYSQL_ROOT_PASSWORD: password - ruoyi-redis: - container_name: ruoyi-redis + tongran-redis: + container_name: tongran-redis image: redis build: context: ./redis ports: - "6379:6379" volumes: - - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf + - ./redis/conf/redis.conf:/home/tongran/redis/redis.conf - ./redis/data:/data - command: redis-server /home/ruoyi/redis/redis.conf - ruoyi-nginx: - container_name: ruoyi-nginx + command: redis-server /home/tongran/redis/redis.conf + tongran-nginx: + container_name: tongran-nginx image: nginx build: context: ./nginx ports: - "80:80" volumes: - - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui + - ./nginx/html/dist:/home/tongran/projects/tongran-ui - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - ./nginx/logs:/var/log/nginx - ./nginx/conf.d:/etc/nginx/conf.d depends_on: - - ruoyi-gateway + - tongran-gateway links: - - ruoyi-gateway - ruoyi-gateway: - container_name: ruoyi-gateway + - tongran-gateway + tongran-gateway: + container_name: tongran-gateway build: - context: ./ruoyi/gateway + context: ./tongran/gateway dockerfile: dockerfile ports: - "8080:8080" depends_on: - - ruoyi-redis + - tongran-redis links: - - ruoyi-redis - ruoyi-auth: - container_name: ruoyi-auth + - tongran-redis + tongran-auth: + container_name: tongran-auth build: - context: ./ruoyi/auth + context: ./tongran/auth dockerfile: dockerfile ports: - "9200:9200" depends_on: - - ruoyi-redis + - tongran-redis links: - - ruoyi-redis - ruoyi-modules-system: - container_name: ruoyi-modules-system + - tongran-redis + tongran-modules-system: + container_name: tongran-modules-system build: - context: ./ruoyi/modules/system + context: ./tongran/modules/system dockerfile: dockerfile ports: - "9201:9201" depends_on: - - ruoyi-redis - - ruoyi-mysql + - tongran-redis + - tongran-mysql links: - - ruoyi-redis - - ruoyi-mysql - ruoyi-modules-gen: - container_name: ruoyi-modules-gen + - tongran-redis + - tongran-mysql + tongran-modules-gen: + container_name: tongran-modules-gen build: - context: ./ruoyi/modules/gen + context: ./tongran/modules/gen dockerfile: dockerfile ports: - "9202:9202" depends_on: - - ruoyi-mysql + - tongran-mysql links: - - ruoyi-mysql - ruoyi-modules-job: - container_name: ruoyi-modules-job + - tongran-mysql + tongran-modules-job: + container_name: tongran-modules-job build: - context: ./ruoyi/modules/job + context: ./tongran/modules/job dockerfile: dockerfile ports: - "9203:9203" depends_on: - - ruoyi-mysql + - tongran-mysql links: - - ruoyi-mysql - ruoyi-modules-file: - container_name: ruoyi-modules-file + - tongran-mysql + tongran-modules-file: + container_name: tongran-modules-file build: - context: ./ruoyi/modules/file + context: ./tongran/modules/file dockerfile: dockerfile ports: - "9300:9300" volumes: - - ./ruoyi/uploadPath:/home/ruoyi/uploadPath - ruoyi-visual-monitor: - container_name: ruoyi-visual-monitor + - ./tongran/uploadPath:/home/tongran/uploadPath + tongran-visual-monitor: + container_name: tongran-visual-monitor build: - context: ./ruoyi/visual/monitor + context: ./tongran/visual/monitor dockerfile: dockerfile ports: - "9100:9100" diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile index cc006f4..9b5345c 100644 --- a/docker/mysql/dockerfile +++ b/docker/mysql/dockerfile @@ -1,7 +1,7 @@ # 基础镜像 FROM mysql:5.7 # author -MAINTAINER ruoyi +MAINTAINER tongran # 执行sql脚本 ADD ./db/*.sql /docker-entrypoint-initdb.d/ diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index 0c4eb9b..a33357b 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -1,6 +1,6 @@ spring.datasource.platform=mysql db.num=1 -db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.url.0=jdbc:mysql://tongran-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.user=root db.password=123456 @@ -16,7 +16,7 @@ management.metrics.export.influx.enabled=false server.tomcat.accesslog.enabled=true server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i -server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs +server.tomcat.basedir=/home/tongran/nacos/tomcat/logs nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile index b74762c..4551e37 100644 --- a/docker/nacos/dockerfile +++ b/docker/nacos/dockerfile @@ -1,7 +1,7 @@ # 基础镜像 FROM nacos/nacos-server # author -MAINTAINER ruoyi +MAINTAINER tongran # 复制conf文件到路径 COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 8102642..0e253cf 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -15,7 +15,7 @@ http { server_name localhost; location / { - root /home/ruoyi/projects/ruoyi-ui; + root /home/tongran/projects/tongran-ui; try_files $uri $uri/ /index.html; index index.html index.htm; } @@ -25,7 +25,7 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://ruoyi-gateway:8080/; + proxy_pass http://tongran-gateway:8080/; } # 避免actuator暴露 diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile index 53b136d..876a6f9 100644 --- a/docker/nginx/dockerfile +++ b/docker/nginx/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM nginx # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-ui +VOLUME /home/tongran/projects/tongran-ui # 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-ui +RUN mkdir -p /home/tongran/projects/tongran-ui # 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-ui +WORKDIR /home/tongran/projects/tongran-ui # 复制conf文件到路径 COPY ./conf/nginx.conf /etc/nginx/nginx.conf # 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-ui +COPY ./html/dist /home/tongran/projects/tongran-ui diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile index 05c2bc4..0725b6e 100644 --- a/docker/redis/dockerfile +++ b/docker/redis/dockerfile @@ -1,13 +1,13 @@ # 基础镜像 FROM redis # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi/redis +VOLUME /home/tongran/redis # 创建目录 -RUN mkdir -p /home/ruoyi/redis +RUN mkdir -p /home/tongran/redis # 指定路径 -WORKDIR /home/ruoyi/redis +WORKDIR /home/tongran/redis # 复制conf文件到路径 -COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf +COPY ./conf/redis.conf /home/tongran/redis/redis.conf diff --git a/docker/ruoyi/auth/dockerfile b/docker/ruoyi/auth/dockerfile index f3c87c5..52341fe 100644 --- a/docker/ruoyi/auth/dockerfile +++ b/docker/ruoyi/auth/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar +COPY ./jar/tongran-auth.jar /home/tongran/tongran-auth.jar # 启动认证服务 -ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-auth.jar"] \ No newline at end of file diff --git a/docker/ruoyi/gateway/dockerfile b/docker/ruoyi/gateway/dockerfile index 0e8f612..19d48e8 100644 --- a/docker/ruoyi/gateway/dockerfile +++ b/docker/ruoyi/gateway/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar +COPY ./jar/tongran-gateway.jar /home/tongran/tongran-gateway.jar # 启动网关服务 -ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-gateway.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/ruoyi/modules/file/dockerfile index 3e23c93..2e95a89 100644 --- a/docker/ruoyi/modules/file/dockerfile +++ b/docker/ruoyi/modules/file/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar +COPY ./jar/tongran-modules-file.jar /home/tongran/tongran-modules-file.jar # 启动文件服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-modules-file.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/ruoyi/modules/gen/dockerfile index 4da8f30..ca77b5b 100644 --- a/docker/ruoyi/modules/gen/dockerfile +++ b/docker/ruoyi/modules/gen/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar +COPY ./jar/tongran-modules-gen.jar /home/tongran/tongran-modules-gen.jar # 启动代码生成服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-modules-gen.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/ruoyi/modules/job/dockerfile index 3c4f7c7..6a4b7ff 100644 --- a/docker/ruoyi/modules/job/dockerfile +++ b/docker/ruoyi/modules/job/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar +COPY ./jar/tongran-modules-job.jar /home/tongran/tongran-modules-job.jar # 启动定时任务服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/ruoyi/modules/system/dockerfile index fd825ec..5bea8b5 100644 --- a/docker/ruoyi/modules/system/dockerfile +++ b/docker/ruoyi/modules/system/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar +COPY ./jar/tongran-modules-system.jar /home/tongran/tongran-modules-system.jar # 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-modules-system.jar"] \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/ruoyi/visual/monitor/dockerfile index 1f17182..5f67cf4 100644 --- a/docker/ruoyi/visual/monitor/dockerfile +++ b/docker/ruoyi/visual/monitor/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER tongran # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/tongran # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/tongran # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/tongran # 复制jar文件到路径 -COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar +COPY ./jar/tongran-visual-monitor.jar /home/tongran/tongran-visual-monitor.jar # 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","tongran-visual-monitor.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index d947f0c..43e7f20 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.tongran + tongran 3.6.6 - ruoyi - http://www.ruoyi.vip - 若依微服务系统 + tongran + 彤然微服务系统 - 3.6.6 + 3.6.6 UTF-8 UTF-8 1.8 @@ -184,85 +183,85 @@ - com.ruoyi - ruoyi-common-core - ${ruoyi.version} + com.tongran + tongran-common-core + ${tongran.version} - com.ruoyi - ruoyi-common-swagger - ${ruoyi.version} + com.tongran + tongran-common-swagger + ${tongran.version} - com.ruoyi - ruoyi-common-security - ${ruoyi.version} + com.tongran + tongran-common-security + ${tongran.version} - com.ruoyi - ruoyi-common-sensitive - ${ruoyi.version} + com.tongran + tongran-common-sensitive + ${tongran.version} - com.ruoyi - ruoyi-common-datascope - ${ruoyi.version} + com.tongran + tongran-common-datascope + ${tongran.version} - com.ruoyi - ruoyi-common-datasource - ${ruoyi.version} + com.tongran + tongran-common-datasource + ${tongran.version} - com.ruoyi - ruoyi-common-seata - ${ruoyi.version} + com.tongran + tongran-common-seata + ${tongran.version} - com.ruoyi - ruoyi-common-log - ${ruoyi.version} + com.tongran + tongran-common-log + ${tongran.version} - com.ruoyi - ruoyi-common-redis - ${ruoyi.version} + com.tongran + tongran-common-redis + ${tongran.version} - com.ruoyi - ruoyi-api-system - ${ruoyi.version} + com.tongran + tongran-api-system + ${tongran.version} - ruoyi-auth - ruoyi-gateway - ruoyi-visual - ruoyi-modules - ruoyi-rocketmq - ruoyi-api - ruoyi-common + tongran-auth + tongran-gateway + tongran-visual + tongran-modules + tongran-rocketmq + tongran-api + tongran-common pom diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e986cad..0000000 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -com.ruoyi.system.api.factory.RemoteUserFallbackFactory -com.ruoyi.system.api.factory.RemoteLogFallbackFactory -com.ruoyi.system.api.factory.RemoteFileFallbackFactory -com.ruoyi.system.api.factory.RemoteRevenueConfigFallbackFactory -com.ruoyi.system.api.factory.RemoteRocketMqFallbackFactory \ No newline at end of file diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index d7fc7d8..0000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - com.ruoyi - ruoyi - 3.6.6 - - 4.0.0 - - - ruoyi-common-log - ruoyi-common-core - ruoyi-common-redis - ruoyi-common-seata - ruoyi-common-swagger - ruoyi-common-security - ruoyi-common-sensitive - ruoyi-common-datascope - ruoyi-common-datasource - - - ruoyi-common - pom - - - ruoyi-common通用模块 - - - diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java deleted file mode 100644 index 1fd1532..0000000 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.common.core.constant; - -/** - * 服务名称 - * - * @author ruoyi - */ -public class ServiceNameConstants -{ - /** - * 认证服务的serviceid - */ - public static final String AUTH_SERVICE = "ruoyi-auth"; - - /** - * 系统模块的serviceid - */ - public static final String SYSTEM_SERVICE = "ruoyi-system"; - - /** - * 文件服务的serviceid - */ - public static final String FILE_SERVICE = "ruoyi-file"; - - /** - * rocketMq的serviceid - */ - public static final String ROCKETMQ_SERVICE = "ruoyi-rocketmq"; -} diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 30c45a0..0000000 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.ruoyi.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8c4b0e4..0000000 --- a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.ruoyi.common.datascope.aspect.DataScopeAspect diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ee96a67..0000000 --- a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.ruoyi.common.log.service.AsyncLogService -com.ruoyi.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 9ff60df..0000000 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.ruoyi.common.redis.configure.RedisConfig -com.ruoyi.common.redis.service.RedisService diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 7418bbc..0000000 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -com.ruoyi.common.security.config.WebMvcConfig -com.ruoyi.common.security.service.TokenService -com.ruoyi.common.security.aspect.PreAuthorizeAspect -com.ruoyi.common.security.aspect.InnerAuthAspect -com.ruoyi.common.security.handler.GlobalExceptionHandler diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 88a7ca4..0000000 --- a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.ruoyi.common.swagger.config.SpringDocAutoConfiguration \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml deleted file mode 100644 index 44e4ff2..0000000 --- a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml deleted file mode 100644 index 0154e28..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml deleted file mode 100644 index ab95c68..0000000 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sql/ry_20250523.sql b/sql/ry_20250523.sql index ae47ac1..8c8b03a 100644 --- a/sql/ry_20250523.sql +++ b/sql/ry_20250523.sql @@ -25,16 +25,16 @@ create table sys_dept ( -- ---------------------------- -- 初始化-部门表数据 -- ---------------------------- -insert into sys_dept values(100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(100, 0, '0', '彤然科技', 0, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '彤然', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -- ---------------------------- @@ -68,8 +68,8 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '测试员'); +insert into sys_user values(1, 103, 'admin', '彤然', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '管理员'); +insert into sys_user values(2, 105, 'ry', '彤然', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '测试员'); -- ---------------------------- @@ -164,7 +164,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +insert into sys_menu values('4', '彤然官网', '0', '4', 'http://tongran.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '彤然官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); @@ -635,8 +635,8 @@ create table sys_notice ( -- ---------------------------- -- 初始化-公告信息表数据 -- ---------------------------- -insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); -insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('1', '温馨提醒：2018-07-01 彤然新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('2', '维护通知：2018-07-01 彤然系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); -- ---------------------------- diff --git a/sql/ry_config_20250224.sql b/sql/ry_config_20250224.sql index a01ed9f..30811bd 100644 --- a/sql/ry_config_20250224.sql +++ b/sql/ry_config_20250224.sql @@ -34,14 +34,14 @@ CREATE TABLE `config_info` ( insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema, encrypted_data_key) values (1,'application-dev.yml','DEFAULT_GROUP','spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n min-request-size: 8192\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','9928f41dfb10386ad38b3254af5692e0','2020-05-20 12:00:00','2024-08-29 12:14:45','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','',''), -(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: ruoyi-auth\n uri: lb://ruoyi-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestBody\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: ruoyi-gen\n uri: lb://ruoyi-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: ruoyi-job\n uri: lb://ruoyi-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: ruoyi-system\n uri: lb://ruoyi-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: ruoyi-file\n uri: lb://ruoyi-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /*/v3/api-docs\n - /csrf\n\n# springdoc配置\nspringdoc:\n webjars:\n # 访问前缀\n prefix:\n','4d329eb08a941a8dd9d26f542c6ac6c5','2020-05-14 14:17:55','2024-09-02 12:13:50','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), -(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n','a03e7632a0a74520eeb4fbedd6d82d97','2020-11-20 00:00:00','2024-09-02 12:13:58','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), -(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2024-08-29 12:15:11','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: ruoyi\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'系统模块接口文档\'\n # 描述\n description: \'系统模块接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n','786c7daf4543411fc65c3e48dfb15243','2020-11-20 00:00:00','2024-09-02 12:14:33','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), -(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'代码生成接口文档\'\n # 描述\n description: \'代码生成接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n # 是否允许生成文件覆盖到本地（自定义路径），默认不允许\n allowOverwrite: false','43d807aa0a4accbb193b6dc7e38ac8a3','2020-11-20 00:00:00','2024-12-25 08:29:33','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), -(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'定时任务接口文档\'\n # 描述\n description: \'定时任务接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n','f78483f845777335b9ed4a9f84758848','2020-11-20 00:00:00','2024-09-02 12:14:56','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), -(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/ruoyi/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), -(9,'sentinel-ruoyi-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"ruoyi-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,''); +(2,'tongran-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: tongran-auth\n uri: lb://tongran-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestBody\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: tongran-gen\n uri: lb://tongran-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: tongran-job\n uri: lb://tongran-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: tongran-system\n uri: lb://tongran-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: tongran-file\n uri: lb://tongran-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /*/v3/api-docs\n - /csrf\n\n# springdoc配置\nspringdoc:\n webjars:\n # 访问前缀\n prefix:\n','4d329eb08a941a8dd9d26f542c6ac6c5','2020-05-14 14:17:55','2024-09-02 12:13:50','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), +(3,'tongran-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n','a03e7632a0a74520eeb4fbedd6d82d97','2020-11-20 00:00:00','2024-09-02 12:13:58','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), +(4,'tongran-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: tongran\n password: 123456\n boot:\n admin:\n ui:\n title: 彤然服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2024-08-29 12:15:11','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), +(5,'tongran-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: tongran\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.tongran.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'系统模块接口文档\'\n # 描述\n description: \'系统模块接口描述\'\n # 作者信息\n contact:\n name: tongran\n url: https://tongran.vip\n','786c7daf4543411fc65c3e48dfb15243','2020-11-20 00:00:00','2024-09-02 12:14:33','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), +(6,'tongran-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.tongran.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'代码生成接口文档\'\n # 描述\n description: \'代码生成接口描述\'\n # 作者信息\n contact:\n name: tongran\n url: https://tongran.vip\n\n# 代码生成\ngen:\n # 作者\n author: tongran\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.tongran.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n # 是否允许生成文件覆盖到本地（自定义路径），默认不允许\n allowOverwrite: false','43d807aa0a4accbb193b6dc7e38ac8a3','2020-11-20 00:00:00','2024-12-25 08:29:33','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), +(7,'tongran-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.tongran.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'定时任务接口文档\'\n # 描述\n description: \'定时任务接口描述\'\n # 作者信息\n contact:\n name: tongran\n url: https://tongran.vip\n','f78483f845777335b9ed4a9f84758848','2020-11-20 00:00:00','2024-09-02 12:14:56','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), +(8,'tongran-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/tongran/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), +(9,'sentinel-tongran-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"tongran-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"tongran-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"tongran-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"tongran-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,''); /******************************************/ diff --git a/ruoyi-api/pom.xml b/tongran-api/pom.xml similarity index 70% rename from ruoyi-api/pom.xml rename to tongran-api/pom.xml index 3b32641..23592fe 100644 --- a/ruoyi-api/pom.xml +++ b/tongran-api/pom.xml @@ -2,21 +2,21 @@ - com.ruoyi - ruoyi + com.tongran + tongran 3.6.6 4.0.0 - ruoyi-api-system + tongran-api-system - ruoyi-api + tongran-api pom - ruoyi-api系统接口 + tongran-api系统接口 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/tongran-api/tongran-api-system/pom.xml similarity index 67% rename from ruoyi-api/ruoyi-api-system/pom.xml rename to tongran-api/tongran-api-system/pom.xml index fb1f549..b8af40e 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/tongran-api/tongran-api-system/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-api + com.tongran + tongran-api 3.6.6 4.0.0 - ruoyi-api-system + tongran-api-system - ruoyi-api-system系统接口模块 + tongran-api-system系统接口模块 - + - com.ruoyi - ruoyi-common-core + com.tongran + tongran-common-core org.projectlombok diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteFileService.java similarity index 81% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteFileService.java index 56d0e08..eb9ed6a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteFileService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api; +package com.tongran.system.api; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; +import com.tongran.common.core.constant.ServiceNameConstants; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.domain.SysFile; +import com.tongran.system.api.factory.RemoteFileFallbackFactory; /** * 文件服务 * - * @author ruoyi + * @author tongran */ @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) public interface RemoteFileService diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteLogService.java similarity index 74% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteLogService.java index 525eda3..0bc39bd 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteLogService.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.api; +package com.tongran.system.api; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.SysLogininfor; -import com.ruoyi.system.api.domain.SysOperLog; -import com.ruoyi.system.api.factory.RemoteLogFallbackFactory; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.ServiceNameConstants; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.domain.SysLogininfor; +import com.tongran.system.api.domain.SysOperLog; +import com.tongran.system.api.factory.RemoteLogFallbackFactory; /** * 日志服务 * - * @author ruoyi + * @author tongran */ @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) public interface RemoteLogService diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRevenueConfigService.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRevenueConfigService.java similarity index 93% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRevenueConfigService.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRevenueConfigService.java index bd0add0..a09708e 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRevenueConfigService.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRevenueConfigService.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.api; +package com.tongran.system.api; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.system.api.domain.*; -import com.ruoyi.system.api.factory.RemoteRevenueConfigFallbackFactory; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.ServiceNameConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.system.api.domain.*; +import com.tongran.system.api.factory.RemoteRevenueConfigFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -14,7 +14,7 @@ import java.util.List; /** * 用户服务 * - * @author ruoyi + * @author tongran */ @FeignClient(contextId = "remoteRevenueConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteRevenueConfigFallbackFactory.class) public interface RemoteRevenueConfigService diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRocketMqService.java similarity index 87% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRocketMqService.java index 0a731f9..9839a3b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRocketMqService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.api; +package com.tongran.system.api; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.RmAlarmRecordRemote; -import com.ruoyi.system.api.domain.RmDeployScriptRemote; -import com.ruoyi.system.api.domain.RmMonitorPolicyRemote; -import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; -import com.ruoyi.system.api.factory.RemoteRocketMqFallbackFactory; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.ServiceNameConstants; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.domain.RmAlarmRecordRemote; +import com.tongran.system.api.domain.RmDeployScriptRemote; +import com.tongran.system.api.domain.RmMonitorPolicyRemote; +import com.tongran.system.api.domain.RmNetworkInterfaceRemote; +import com.tongran.system.api.factory.RemoteRocketMqFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteUserService.java similarity index 85% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteUserService.java index e6c3391..28cf241 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteUserService.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.api; +package com.tongran.system.api; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.EpsInitialTrafficDataRemote; -import com.ruoyi.system.api.domain.NodeBandwidth; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.ServiceNameConstants; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.domain.EpsInitialTrafficDataRemote; +import com.tongran.system.api.domain.NodeBandwidth; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.api.factory.RemoteUserFallbackFactory; +import com.tongran.system.api.model.LoginUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; /** * 用户服务 * - * @author ruoyi + * @author tongran */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AllInterfaceNameRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/AllInterfaceNameRemote.java similarity index 91% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AllInterfaceNameRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/AllInterfaceNameRemote.java index b3c3561..7f1fd77 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AllInterfaceNameRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/AllInterfaceNameRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Set; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsBusinessScriptRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsBusinessScriptRemote.java similarity index 83% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsBusinessScriptRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsBusinessScriptRemote.java index d894916..6011a3b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsBusinessScriptRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsBusinessScriptRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsInitialTrafficDataRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsInitialTrafficDataRemote.java similarity index 90% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsInitialTrafficDataRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsInitialTrafficDataRemote.java index da21361..dbca307 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsInitialTrafficDataRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsInitialTrafficDataRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsNodeBandwidthRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsNodeBandwidthRemote.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsNodeBandwidthRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsNodeBandwidthRemote.java index 9a41a02..4464a5a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsNodeBandwidthRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsNodeBandwidthRemote.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/InitialSwitchInfoDetailsRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/InitialSwitchInfoDetailsRemote.java similarity index 93% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/InitialSwitchInfoDetailsRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/InitialSwitchInfoDetailsRemote.java index 4c01ad6..e7595b4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/InitialSwitchInfoDetailsRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/InitialSwitchInfoDetailsRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NetworkInfo.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NetworkInfo.java similarity index 94% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NetworkInfo.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NetworkInfo.java index e29765b..6e73651 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NetworkInfo.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NetworkInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NodeBandwidth.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NodeBandwidth.java similarity index 97% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NodeBandwidth.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NodeBandwidth.java index 081a1ef..0915987 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NodeBandwidth.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NodeBandwidth.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmAlarmRecordRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmAlarmRecordRemote.java similarity index 95% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmAlarmRecordRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmAlarmRecordRemote.java index 46afc18..cdec27d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmAlarmRecordRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmAlarmRecordRemote.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmDeployScriptRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmDeployScriptRemote.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmDeployScriptRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmDeployScriptRemote.java index b8bb30f..bfd0204 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmDeployScriptRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmDeployScriptRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel; import lombok.Data; import java.util.Date; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmMonitorPolicyRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmMonitorPolicyRemote.java similarity index 91% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmMonitorPolicyRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmMonitorPolicyRemote.java index a46426a..311deef 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmMonitorPolicyRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmMonitorPolicyRemote.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmNetworkInterfaceRemote.java similarity index 88% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmNetworkInterfaceRemote.java index 22c6f16..717e379 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmNetworkInterfaceRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; @Data diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmRegisterMsgRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmRegisterMsgRemote.java similarity index 92% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmRegisterMsgRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmRegisterMsgRemote.java index 1ee2678..65ed0ba 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmRegisterMsgRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmRegisterMsgRemote.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceGroupRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceGroupRemote.java similarity index 89% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceGroupRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceGroupRemote.java index 1c675f8..276d7bf 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceGroupRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceGroupRemote.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceRegistrationRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceRegistrationRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java index 401e5b6..3139040 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceRegistrationRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmSwitchManagementRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmSwitchManagementRemote.java similarity index 95% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmSwitchManagementRemote.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmSwitchManagementRemote.java index e17880c..4083c44 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmSwitchManagementRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmSwitchManagementRemote.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; -import com.ruoyi.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel; import lombok.Data; import java.util.Date; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RouteMsg.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RouteMsg.java similarity index 80% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RouteMsg.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RouteMsg.java index f5a8845..96c13ac 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RouteMsg.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RouteMsg.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import lombok.Data; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDept.java similarity index 97% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDept.java index 91173f0..89fea7f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.web.domain.BaseEntity; /** * 部门表 sys_dept * - * @author ruoyi + * @author tongran */ public class SysDept extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictData.java similarity index 93% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictData.java index e0c4a17..f88e457 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictData.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.web.domain.BaseEntity; /** * 字典数据表 sys_dict_data * - * @author ruoyi + * @author tongran */ public class SysDictData extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictType.java similarity index 91% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictType.java index c51a48d..04576c2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictType.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.web.domain.BaseEntity; /** * 字典类型表 sys_dict_type * - * @author ruoyi + * @author tongran */ public class SysDictType extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysFile.java similarity index 93% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysFile.java index c953b19..ece933b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysFile.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 文件信息 * - * @author ruoyi + * @author tongran */ public class SysFile { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysLogininfor.java similarity index 88% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysLogininfor.java index cd3be58..0eef7bb 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysLogininfor.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.web.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor * - * @author ruoyi + * @author tongran */ public class SysLogininfor extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysOperLog.java similarity index 95% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysOperLog.java index a3c350f..4e8f577 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysOperLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.web.domain.BaseEntity; /** * 操作日志记录表 oper_log * - * @author ruoyi + * @author tongran */ public class SysOperLog extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysRole.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysRole.java index 62df8b5..131a2f2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import java.util.Set; import javax.validation.constraints.NotBlank; @@ -6,14 +6,14 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.web.domain.BaseEntity; /** * 角色表 sys_role * - * @author ruoyi + * @author tongran */ public class SysRole extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysUser.java similarity index 94% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysUser.java index 4390520..2730a20 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysUser.java @@ -1,22 +1,22 @@ -package com.ruoyi.system.api.domain; +package com.tongran.system.api.domain; import java.util.Date; import java.util.List; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.annotation.Excel.Type; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.annotation.Excels; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.common.core.xss.Xss; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.annotation.Excel.Type; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.annotation.Excels; +import com.tongran.common.core.web.domain.BaseEntity; +import com.tongran.common.core.xss.Xss; /** * 用户对象 sys_user * - * @author ruoyi + * @author tongran */ public class SysUser extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteFileFallbackFactory.java similarity index 84% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteFileFallbackFactory.java index b6c56b8..c211990 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteFileFallbackFactory.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.api.factory; +package com.tongran.system.api.factory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.RemoteFileService; -import com.ruoyi.system.api.domain.SysFile; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.RemoteFileService; +import com.tongran.system.api.domain.SysFile; /** * 文件服务降级处理 * - * @author ruoyi + * @author tongran */ @Component public class RemoteFileFallbackFactory implements FallbackFactory diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteLogFallbackFactory.java similarity index 80% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteLogFallbackFactory.java index f2c0422..aa83333 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteLogFallbackFactory.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.api.factory; +package com.tongran.system.api.factory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.RemoteLogService; -import com.ruoyi.system.api.domain.SysLogininfor; -import com.ruoyi.system.api.domain.SysOperLog; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.RemoteLogService; +import com.tongran.system.api.domain.SysLogininfor; +import com.tongran.system.api.domain.SysOperLog; /** * 日志服务降级处理 * - * @author ruoyi + * @author tongran */ @Component public class RemoteLogFallbackFactory implements FallbackFactory diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRevenueConfigFallbackFactory.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRevenueConfigFallbackFactory.java similarity index 94% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRevenueConfigFallbackFactory.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRevenueConfigFallbackFactory.java index e8fbbd1..9739a07 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRevenueConfigFallbackFactory.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRevenueConfigFallbackFactory.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.api.factory; +package com.tongran.system.api.factory; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.*; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -14,7 +14,7 @@ import java.util.List; /** * 用户服务降级处理 * - * @author ruoyi + * @author tongran */ @Component public class RemoteRevenueConfigFallbackFactory implements FallbackFactory diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRocketMqFallbackFactory.java similarity index 87% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRocketMqFallbackFactory.java index 741c51e..c3fecd7 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRocketMqFallbackFactory.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.api.factory; +package com.tongran.system.api.factory; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.api.domain.RmAlarmRecordRemote; -import com.ruoyi.system.api.domain.RmDeployScriptRemote; -import com.ruoyi.system.api.domain.RmMonitorPolicyRemote; -import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.api.domain.RmAlarmRecordRemote; +import com.tongran.system.api.domain.RmDeployScriptRemote; +import com.tongran.system.api.domain.RmMonitorPolicyRemote; +import com.tongran.system.api.domain.RmNetworkInterfaceRemote; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -18,7 +18,7 @@ import java.util.Map; /** * 用户服务降级处理 * - * @author ruoyi + * @author tongran */ @Component public class RemoteRocketMqFallbackFactory implements FallbackFactory diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteUserFallbackFactory.java similarity index 86% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteUserFallbackFactory.java index 1673455..14899f6 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteUserFallbackFactory.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.api.factory; +package com.tongran.system.api.factory; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.RemoteUserService; -import com.ruoyi.system.api.domain.EpsInitialTrafficDataRemote; -import com.ruoyi.system.api.domain.NodeBandwidth; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.domain.R; +import com.tongran.system.api.RemoteUserService; +import com.tongran.system.api.domain.EpsInitialTrafficDataRemote; +import com.tongran.system.api.domain.NodeBandwidth; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.api.model.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; /** * 用户服务降级处理 * - * @author ruoyi + * @author tongran */ @Component public class RemoteUserFallbackFactory implements FallbackFactory diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/model/LoginUser.java similarity index 95% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java rename to tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/model/LoginUser.java index ef266a0..7aaa69c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/model/LoginUser.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.api.model; +package com.tongran.system.api.model; import java.io.Serializable; import java.util.Set; -import com.ruoyi.system.api.domain.SysUser; +import com.tongran.system.api.domain.SysUser; /** * 用户信息 * - * @author ruoyi + * @author tongran */ public class LoginUser implements Serializable { diff --git a/tongran-api/tongran-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-api/tongran-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d64c534 --- /dev/null +++ b/tongran-api/tongran-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.tongran.system.api.factory.RemoteUserFallbackFactory +com.tongran.system.api.factory.RemoteLogFallbackFactory +com.tongran.system.api.factory.RemoteFileFallbackFactory +com.tongran.system.api.factory.RemoteRevenueConfigFallbackFactory +com.tongran.system.api.factory.RemoteRocketMqFallbackFactory \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/tongran-auth/pom.xml similarity index 87% rename from ruoyi-auth/pom.xml rename to tongran-auth/pom.xml index 7ad4440..07ea680 100644 --- a/ruoyi-auth/pom.xml +++ b/tongran-auth/pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi + com.tongran + tongran 3.6.6 4.0.0 - ruoyi-auth + tongran-auth - ruoyi-auth认证授权中心 + tongran-auth认证授权中心 @@ -46,10 +46,10 @@ spring-boot-starter-actuator - + - com.ruoyi - ruoyi-common-security + com.tongran + tongran-common-security diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/tongran-auth/src/main/java/com/tongran/auth/TongRanAuthApplication.java similarity index 82% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java rename to tongran-auth/src/main/java/com/tongran/auth/TongRanAuthApplication.java index 1e3a087..a06adf2 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/tongran-auth/src/main/java/com/tongran/auth/TongRanAuthApplication.java @@ -1,22 +1,22 @@ -package com.ruoyi.auth; +package com.tongran.auth; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.tongran.common.security.annotation.EnableRyFeignClients; /** * 认证授权中心 * - * @author ruoyi + * @author tongran */ @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiAuthApplication +public class TongRanAuthApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiAuthApplication.class, args); + SpringApplication.run(TongRanAuthApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/tongran-auth/src/main/java/com/tongran/auth/controller/TokenController.java similarity index 78% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java rename to tongran-auth/src/main/java/com/tongran/auth/controller/TokenController.java index 9738e47..97d3a89 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/tongran-auth/src/main/java/com/tongran/auth/controller/TokenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.auth.controller; +package com.tongran.auth.controller; import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; @@ -6,21 +6,21 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.auth.form.LoginBody; -import com.ruoyi.auth.form.RegisterBody; -import com.ruoyi.auth.service.SysLoginService; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.JwtUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.auth.AuthUtil; -import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.auth.form.LoginBody; +import com.tongran.auth.form.RegisterBody; +import com.tongran.auth.service.SysLoginService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.JwtUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.auth.AuthUtil; +import com.tongran.common.security.service.TokenService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.model.LoginUser; /** * token 控制 * - * @author ruoyi + * @author tongran */ @RestController public class TokenController diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/tongran-auth/src/main/java/com/tongran/auth/form/LoginBody.java similarity index 91% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java rename to tongran-auth/src/main/java/com/tongran/auth/form/LoginBody.java index b12fb31..a85b066 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java +++ b/tongran-auth/src/main/java/com/tongran/auth/form/LoginBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.auth.form; +package com.tongran.auth.form; /** * 用户登录对象 * - * @author ruoyi + * @author tongran */ public class LoginBody { diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java b/tongran-auth/src/main/java/com/tongran/auth/form/RegisterBody.java similarity index 62% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java rename to tongran-auth/src/main/java/com/tongran/auth/form/RegisterBody.java index 9741507..3f322c3 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java +++ b/tongran-auth/src/main/java/com/tongran/auth/form/RegisterBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.auth.form; +package com.tongran.auth.form; /** * 用户注册对象 * - * @author ruoyi + * @author tongran */ public class RegisterBody extends LoginBody { diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/tongran-auth/src/main/java/com/tongran/auth/service/SysLoginService.java similarity index 85% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java rename to tongran-auth/src/main/java/com/tongran/auth/service/SysLoginService.java index 9ba6046..dcc5154 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/tongran-auth/src/main/java/com/tongran/auth/service/SysLoginService.java @@ -1,28 +1,28 @@ -package com.ruoyi.auth.service; +package com.tongran.auth.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.UserStatus; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.RemoteUserService; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.UserStatus; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.ip.IpUtils; +import com.tongran.common.redis.service.RedisService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.RemoteUserService; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.api.model.LoginUser; /** * 登录校验方法 * - * @author ruoyi + * @author tongran */ @Component public class SysLoginService diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/tongran-auth/src/main/java/com/tongran/auth/service/SysPasswordService.java similarity index 85% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java rename to tongran-auth/src/main/java/com/tongran/auth/service/SysPasswordService.java index eb18ea8..49d8dc1 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java +++ b/tongran-auth/src/main/java/com/tongran/auth/service/SysPasswordService.java @@ -1,19 +1,19 @@ -package com.ruoyi.auth.service; +package com.tongran.auth.service; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysUser; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.redis.service.RedisService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysUser; /** * 登录密码方法 * - * @author ruoyi + * @author tongran */ @Component public class SysPasswordService diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java b/tongran-auth/src/main/java/com/tongran/auth/service/SysRecordLogService.java similarity index 75% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java rename to tongran-auth/src/main/java/com/tongran/auth/service/SysRecordLogService.java index 7ca0f00..5274966 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java +++ b/tongran-auth/src/main/java/com/tongran/auth/service/SysRecordLogService.java @@ -1,18 +1,18 @@ -package com.ruoyi.auth.service; +package com.tongran.auth.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.system.api.RemoteLogService; -import com.ruoyi.system.api.domain.SysLogininfor; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.ip.IpUtils; +import com.tongran.system.api.RemoteLogService; +import com.tongran.system.api.domain.SysLogininfor; /** * 记录日志方法 * - * @author ruoyi + * @author tongran */ @Component public class SysRecordLogService diff --git a/ruoyi-auth/src/main/resources/banner.txt b/tongran-auth/src/main/resources/banner.txt similarity index 100% rename from ruoyi-auth/src/main/resources/banner.txt rename to tongran-auth/src/main/resources/banner.txt diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/tongran-auth/src/main/resources/bootstrap.yml similarity index 91% rename from ruoyi-auth/src/main/resources/bootstrap.yml rename to tongran-auth/src/main/resources/bootstrap.yml index a5e4156..efada91 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/tongran-auth/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-auth + name: tongran-auth profiles: # 环境配置 active: dev @@ -23,7 +23,8 @@ spring: # 配置中心地址 server-addr: 172.16.15.52:8848 # server-addr: 172.16.15.103:8848 - namespace: saas-local + namespace: public +# namespace: saas-local username: nacos password: nacos # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml b/tongran-auth/src/main/resources/logback.xml similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml rename to tongran-auth/src/main/resources/logback.xml index c301bb4..551af85 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml +++ b/tongran-auth/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/tongran-common/pom.xml b/tongran-common/pom.xml new file mode 100644 index 0000000..705606e --- /dev/null +++ b/tongran-common/pom.xml @@ -0,0 +1,30 @@ + + + + com.tongran + tongran + 3.6.6 + + 4.0.0 + + + tongran-common-log + tongran-common-core + tongran-common-redis + tongran-common-seata + tongran-common-swagger + tongran-common-security + tongran-common-sensitive + tongran-common-datascope + tongran-common-datasource + + + tongran-common + pom + + + tongran-common通用模块 + + + diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/tongran-common/tongran-common-core/pom.xml similarity index 94% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to tongran-common/tongran-common-core/pom.xml index efe4573..5a972c5 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/tongran-common/tongran-common-core/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-core + tongran-common-core - ruoyi-common-core核心模块 + tongran-common-core核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excel.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excel.java index 9c44f6a..073f233 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.annotation; +package com.tongran.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,12 +7,12 @@ import java.lang.annotation.Target; import java.math.BigDecimal; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; -import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter; +import com.tongran.common.core.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 * - * @author ruoyi + * @author tongran */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excels.java similarity index 82% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excels.java index 38135e7..c98d69b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.annotation; +package com.tongran.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel注解集 * - * @author ruoyi + * @author tongran */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/CacheConstants.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/CacheConstants.java index 1d2510e..9a1a9e2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/CacheConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 缓存常量信息 * - * @author ruoyi + * @author tongran */ public class CacheConstants { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/Constants.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/Constants.java index 989f6bc..962d35b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/Constants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 通用常量信息 * - * @author ruoyi + * @author tongran */ public class Constants { @@ -120,16 +120,16 @@ public class Constants /** * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） */ - public static final String[] JSON_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "com.tongran" }; /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.job.task" }; + public static final String[] JOB_WHITELIST_STR = { "com.tongran.job.task" }; /** * 定时任务违规的字符 */ public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" }; + "org.springframework", "org.apache", "com.tongran.common.core.utils.file" }; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/GenConstants.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/GenConstants.java index 4519734..a254757 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author tongran */ public class GenConstants { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/HttpStatus.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/HttpStatus.java index 220a21f..72c0f9d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/HttpStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 返回状态码 * - * @author ruoyi + * @author tongran */ public class HttpStatus { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ScheduleConstants.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ScheduleConstants.java index b264a07..69112c2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ScheduleConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 任务调度通用常量 * - * @author ruoyi + * @author tongran */ public class ScheduleConstants { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/SecurityConstants.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/SecurityConstants.java index c122e52..8f02ba8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/SecurityConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 权限相关通用常量 * - * @author ruoyi + * @author tongran */ public class SecurityConstants { diff --git a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ServiceNameConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ServiceNameConstants.java new file mode 100644 index 0000000..91211a6 --- /dev/null +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ServiceNameConstants.java @@ -0,0 +1,29 @@ +package com.tongran.common.core.constant; + +/** + * 服务名称 + * + * @author tongran + */ +public class ServiceNameConstants +{ + /** + * 认证服务的serviceid + */ + public static final String AUTH_SERVICE = "tongran-auth"; + + /** + * 系统模块的serviceid + */ + public static final String SYSTEM_SERVICE = "tongran-system"; + + /** + * 文件服务的serviceid + */ + public static final String FILE_SERVICE = "tongran-file"; + + /** + * rocketMq的serviceid + */ + public static final String ROCKETMQ_SERVICE = "tongran-rocketmq"; +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/TokenConstants.java similarity index 81% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/TokenConstants.java index b298552..6a29b3e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/TokenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * Token的Key常量 * - * @author ruoyi + * @author tongran */ public class TokenConstants { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java index 16b2304..ca66e0e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.constant; +package com.tongran.common.core.constant; /** * 用户常量信息 * - * @author ruoyi + * @author tongran */ public class UserConstants { @@ -83,6 +83,8 @@ public class UserConstants public static boolean isAdmin(Long userId) { - return userId != null && 1L == userId; +// return userId != null && 1L == userId; + //TODO 权限控制 + return true; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/context/SecurityContextHolder.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/context/SecurityContextHolder.java index d7e94ec..c569288 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/context/SecurityContextHolder.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.core.context; +package com.tongran.common.core.context; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.StringUtils; /** * 获取当前线程变量中的 用户id、用户名称、Token等信息 * 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取 * - * @author ruoyi + * @author tongran */ public class SecurityContextHolder { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/domain/R.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/domain/R.java index 0003b19..c4a115a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/domain/R.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain; +package com.tongran.common.core.domain; import java.io.Serializable; -import com.ruoyi.common.core.constant.Constants; +import com.tongran.common.core.constant.Constants; /** * 响应信息主体 * - * @author ruoyi + * @author tongran */ public class R implements Serializable { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/MsgEnum.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/enums/MsgEnum.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/MsgEnum.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/enums/MsgEnum.java index cad9512..d8892a0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/MsgEnum.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/enums/MsgEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.enums; +package com.tongran.common.core.enums; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/enums/UserStatus.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/enums/UserStatus.java index 65a8cd8..10b069a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.enums; +package com.tongran.common.core.enums; /** * 用户状态 * - * @author ruoyi + * @author tongran */ public enum UserStatus { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/CaptchaException.java similarity index 78% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/CaptchaException.java index 8fa2ec0..1f84411 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 验证码错误异常类 * - * @author ruoyi + * @author tongran */ public class CaptchaException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/CheckedException.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/CheckedException.java index c7f74cb..215d535 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/CheckedException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 检查异常 * - * @author ruoyi + * @author tongran */ public class CheckedException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/DemoModeException.java similarity index 75% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/DemoModeException.java index 6197e98..448664e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 演示模式异常 * - * @author ruoyi + * @author tongran */ public class DemoModeException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/GlobalException.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/GlobalException.java index b55c7cd..26c976e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/GlobalException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 全局异常 * - * @author ruoyi + * @author tongran */ public class GlobalException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/InnerAuthException.java similarity index 78% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/InnerAuthException.java index 96f825d..ce7401a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/InnerAuthException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 内部认证异常 * - * @author ruoyi + * @author tongran */ public class InnerAuthException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/PreAuthorizeException.java similarity index 75% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/PreAuthorizeException.java index 3d420c4..3897063 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/PreAuthorizeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 权限异常 * - * @author ruoyi + * @author tongran */ public class PreAuthorizeException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/ServiceException.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/ServiceException.java index 4983866..36dc642 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/ServiceException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 业务异常 * - * @author ruoyi + * @author tongran */ public final class ServiceException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/UtilException.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/UtilException.java index 18c7be8..5c6b7c9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception; +package com.tongran.common.core.exception; /** * 工具类异常 * - * @author ruoyi + * @author tongran */ public class UtilException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotLoginException.java similarity index 78% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotLoginException.java index 01e5771..7d8f8e1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotLoginException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.auth; +package com.tongran.common.core.exception.auth; /** * 未能通过的登录认证异常 * - * @author ruoyi + * @author tongran */ public class NotLoginException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotPermissionException.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotPermissionException.java index 6e9d3db..bc6a867 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotPermissionException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.exception.auth; +package com.tongran.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; /** * 未能通过的权限认证异常 * - * @author ruoyi + * @author tongran */ public class NotPermissionException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotRoleException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotRoleException.java index 686374a..4291579 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/auth/NotRoleException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.exception.auth; +package com.tongran.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; /** * 未能通过的角色认证异常 * - * @author ruoyi + * @author tongran */ public class NotRoleException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/base/BaseException.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/base/BaseException.java index 3d2fa10..642e643 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/base/BaseException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.base; +package com.tongran.common.core.exception.base; /** * 基础异常 * - * @author ruoyi + * @author tongran */ public class BaseException extends RuntimeException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileException.java similarity index 67% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileException.java index a156b7b..afa2639 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.exception.file; +package com.tongran.common.core.exception.file; -import com.ruoyi.common.core.exception.base.BaseException; +import com.tongran.common.core.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author tongran */ public class FileException extends BaseException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileNameLengthLimitExceededException.java index e8a4199..956f7c2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.file; +package com.tongran.common.core.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author tongran */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileSizeLimitExceededException.java similarity index 83% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileSizeLimitExceededException.java index b592b6f..c492579 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.file; +package com.tongran.common.core.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author tongran */ public class FileSizeLimitExceededException extends FileException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileUploadException.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileUploadException.java index c0f57cb..591ac10 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/FileUploadException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.file; +package com.tongran.common.core.exception.file; import java.io.PrintStream; import java.io.PrintWriter; @@ -6,7 +6,7 @@ import java.io.PrintWriter; /** * 文件上传异常类 * - * @author ruoyi + * @author tongran */ public class FileUploadException extends Exception { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/InvalidExtensionException.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/InvalidExtensionException.java index 2a0b906..23e7f60 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/file/InvalidExtensionException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.exception.file; +package com.tongran.common.core.exception.file; import java.util.Arrays; /** * 文件上传 误异常类 * - * @author ruoyi + * @author tongran */ public class InvalidExtensionException extends FileUploadException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/job/TaskException.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/job/TaskException.java index 6cc3e58..ca07e09 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/job/TaskException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.job; +package com.tongran.common.core.exception.job; /** * 计划策略异常 * - * @author ruoyi + * @author tongran */ public class TaskException extends Exception { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/CaptchaExpireException.java similarity index 78% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/CaptchaExpireException.java index ec68864..f989d91 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.user; +package com.tongran.common.core.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author tongran */ public class CaptchaExpireException extends UserException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/UserException.java similarity index 66% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/UserException.java index 8ae8ea3..95ca8ad 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.exception.user; +package com.tongran.common.core.exception.user; -import com.ruoyi.common.core.exception.base.BaseException; +import com.tongran.common.core.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author tongran */ public class UserException extends BaseException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/UserPasswordNotMatchException.java similarity index 81% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/UserPasswordNotMatchException.java index 2e1a6b1..0d7334a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.exception.user; +package com.tongran.common.core.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author tongran */ public class UserPasswordNotMatchException extends UserException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/CharsetKit.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/CharsetKit.java index 06fbcd5..39b631a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/CharsetKit.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.text; +package com.tongran.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 字符集工具类 * - * @author ruoyi + * @author tongran */ public class CharsetKit { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/Convert.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/Convert.java index fe5a2da..c1dd8d3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.tongran.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -7,12 +7,12 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 类型转换器 * - * @author ruoyi + * @author tongran */ public class Convert { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/StrFormatter.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/StrFormatter.java index cf366ea..a89da90 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/text/StrFormatter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.text; +package com.tongran.common.core.text; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 字符串格式化 * - * @author ruoyi + * @author tongran */ public class StrFormatter { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ConvertOtherTypeUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ConvertOtherTypeUtil.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ConvertOtherTypeUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ConvertOtherTypeUtil.java index 9b4be75..ed2b18f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ConvertOtherTypeUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ConvertOtherTypeUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; public class ConvertOtherTypeUtil { /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/DateUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/DateUtils.java index 57428cb..6c75e6a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -14,7 +14,7 @@ import java.util.TimeZone; /** * 时间工具类 * - * @author ruoyi + * @author tongran */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/EchartsDataUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/EchartsDataUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/EchartsDataUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/EchartsDataUtils.java index 874fcac..9eaef29 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/EchartsDataUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/EchartsDataUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.math.BigDecimal; import java.text.ParseException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ExceptionUtil.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ExceptionUtil.java index 12f6c72..d709751 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 * - * @author ruoyi + * @author tongran */ public class ExceptionUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/JwtUtils.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/JwtUtils.java index d984892..5b49248 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/JwtUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.util.Map; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.TokenConstants; -import com.ruoyi.common.core.text.Convert; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.TokenConstants; +import com.tongran.common.core.text.Convert; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -11,7 +11,7 @@ import io.jsonwebtoken.SignatureAlgorithm; /** * Jwt工具类 * - * @author ruoyi + * @author tongran */ public class JwtUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/PageUtils.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/PageUtils.java index d58a216..e1d1434 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/PageUtils.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.core.utils.sql.SqlUtil; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableSupport; +import com.tongran.common.core.utils.sql.SqlUtil; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableSupport; /** * 分页工具类 * - * @author ruoyi + * @author tongran */ public class PageUtils extends PageHelper { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ServletUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ServletUtils.java index 350c9a3..154ae63 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -22,15 +22,15 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.text.Convert; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.text.Convert; import reactor.core.publisher.Mono; /** * 客户端工具类 * - * @author ruoyi + * @author tongran */ public class ServletUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpeedUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpeedUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java index 80f1631..e6ca2c3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpeedUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.math.BigDecimal; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpringUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpringUtils.java index e4ec3bc..b1c121f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author ruoyi + * @author tongran */ @Component public final class SpringUtils implements BeanFactoryPostProcessor diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/StringUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/StringUtils.java index 7be363b..ca5cf7c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/StringUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.util.Collection; import java.util.List; import java.util.Map; import org.springframework.util.AntPathMatcher; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.text.StrFormatter; /** * 字符串工具类 * - * @author ruoyi + * @author tongran */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TableSubUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/TableSubUtil.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TableSubUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/TableSubUtil.java index b53712f..df428f5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TableSubUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/TableSubUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/UnitChangeUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/UnitChangeUtil.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/UnitChangeUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/UnitChangeUtil.java index 1ce7140..8317472 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/UnitChangeUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/UnitChangeUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.tongran.common.core.utils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/bean/BeanUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/bean/BeanUtils.java index fba6032..998e738 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.bean; +package com.tongran.common.core.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 工具类 * - * @author ruoyi + * @author tongran */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/bean/BeanValidators.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/bean/BeanValidators.java index 18dccfa..961bef1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.bean; +package com.tongran.common.core.utils.bean; import java.util.Set; import javax.validation.ConstraintViolation; @@ -8,7 +8,7 @@ import javax.validation.Validator; /** * bean对象属性验证 * - * @author ruoyi + * @author tongran */ public class BeanValidators { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/FileTypeUtils.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/FileTypeUtils.java index c36c306..8aa69a7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.file; +package com.tongran.common.core.utils.file; import java.io.File; import java.util.Objects; @@ -9,14 +9,14 @@ import org.springframework.web.multipart.MultipartFile; /** * 文件类型工具类 * - * @author ruoyi + * @author tongran */ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: tongran.txt, 返回: txt * * @param file 文件名 * @return 后缀（不含".") @@ -33,7 +33,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: tongran.txt, 返回: txt * * @param fileName 文件名 * @return 后缀（不含".") diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/FileUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/FileUtils.java index d08577f..d90dead 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.file; +package com.tongran.common.core.utils.file; import java.io.File; import java.io.FileInputStream; @@ -11,12 +11,12 @@ import java.nio.charset.StandardCharsets; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 文件处理工具类 * - * @author ruoyi + * @author tongran */ public class FileUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/ImageUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/ImageUtils.java index 940bff7..35bb353 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.file; +package com.tongran.common.core.utils.file; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory; /** * 图片处理工具类 * - * @author ruoyi + * @author tongran */ public class ImageUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/MimeTypeUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/MimeTypeUtils.java index 63385e0..431e54e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.utils.file; +package com.tongran.common.core.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author tongran */ public class MimeTypeUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/html/EscapeUtil.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/html/EscapeUtil.java index 75716fb..b957204 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/html/EscapeUtil.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.utils.html; +package com.tongran.common.core.utils.html; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 转义和反转义工具类 * - * @author ruoyi + * @author tongran */ public class EscapeUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/html/HTMLFilter.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/html/HTMLFilter.java index 4d72b27..4e2a542 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.html; +package com.tongran.common.core.utils.html; import java.util.ArrayList; import java.util.Collections; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML过滤器，用于去除XSS漏洞隐患。 * - * @author ruoyi + * @author tongran */ public final class HTMLFilter { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ip/IpUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ip/IpUtils.java index cf5108b..b68a8e2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/ip/IpUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.core.utils.ip; +package com.tongran.common.core.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; /** * 获取IP方法 * - * @author ruoyi + * @author tongran */ public class IpUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/poi/ExcelHandlerAdapter.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/poi/ExcelHandlerAdapter.java index 4d99289..030c9b3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/poi/ExcelHandlerAdapter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.poi; +package com.tongran.common.core.utils.poi; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Workbook; @@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook; /** * Excel数据格式处理适配器 * - * @author ruoyi + * @author tongran */ public interface ExcelHandlerAdapter { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/poi/ExcelUtil.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/poi/ExcelUtil.java index a054813..1a1f9d0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.poi; +package com.tongran.common.core.utils.poi; import java.io.IOException; import java.io.InputStream; @@ -52,22 +52,22 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.annotation.Excel.Type; -import com.ruoyi.common.core.annotation.Excels; -import com.ruoyi.common.core.exception.UtilException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.ImageUtils; -import com.ruoyi.common.core.utils.reflect.ReflectUtils; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.annotation.Excel.Type; +import com.tongran.common.core.annotation.Excels; +import com.tongran.common.core.exception.UtilException; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.file.FileTypeUtils; +import com.tongran.common.core.utils.file.ImageUtils; +import com.tongran.common.core.utils.reflect.ReflectUtils; /** * Excel相关处理 * - * @author ruoyi + * @author tongran */ public class ExcelUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/reflect/ReflectUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/reflect/ReflectUtils.java index 5f1979b..70d8759 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.reflect; +package com.tongran.common.core.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,13 +12,13 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author ruoyi + * @author tongran */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/sign/Base64.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/sign/Base64.java index 7599bc0..f1e8245 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/sign/Base64.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.utils.sign; +package com.tongran.common.core.utils.sign; /** * Base64工具类 * - * @author ruoyi + * @author tongran */ public final class Base64 { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/sql/SqlUtil.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/sql/SqlUtil.java index d86e227..d47ef58 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.utils.sql; +package com.tongran.common.core.utils.sql; -import com.ruoyi.common.core.exception.UtilException; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.exception.UtilException; +import com.tongran.common.core.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author tongran */ public class SqlUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/IdUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/IdUtils.java index 32bb12d..907cd43 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/IdUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.utils.uuid; +package com.tongran.common.core.utils.uuid; /** * ID生成器工具类 * - * @author ruoyi + * @author tongran */ public class IdUtils { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/Seq.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/Seq.java index e226834..7e83e07 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/Seq.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.utils.uuid; +package com.tongran.common.core.utils.uuid; import java.util.concurrent.atomic.AtomicInteger; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; /** - * @author ruoyi 序列生成类 + * @author tongran 序列生成类 */ public class Seq { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/UUID.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/UUID.java index 87d5b74..1acafbc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/uuid/UUID.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.utils.uuid; +package com.tongran.common.core.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.core.exception.UtilException; +import com.tongran.common.core.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * - * @author ruoyi + * @author tongran */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/controller/BaseController.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/controller/BaseController.java index fce3b39..8ff753b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/controller/BaseController.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.web.controller; +package com.tongran.common.core.web.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.PageUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.sql.SqlUtil; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.core.web.page.TableSupport; +import com.tongran.common.core.constant.HttpStatus; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.PageUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.sql.SqlUtil; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.core.web.page.TableSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -23,7 +23,7 @@ import java.util.List; /** * web层通用数据处理 * - * @author ruoyi + * @author tongran */ public class BaseController { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/AjaxResult.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/AjaxResult.java index a7ff17c..4016a53 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/AjaxResult.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.core.web.domain; +package com.tongran.common.core.web.domain; import java.util.HashMap; import java.util.Objects; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.constant.HttpStatus; +import com.tongran.common.core.utils.StringUtils; /** * 操作消息提醒 * - * @author ruoyi + * @author tongran */ public class AjaxResult extends HashMap { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/BaseEntity.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/BaseEntity.java index 4b386eb..c2a193d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.domain; +package com.tongran.common.core.web.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -12,7 +12,7 @@ import java.util.Map; /** * Entity基类 * - * @author ruoyi + * @author tongran */ public class BaseEntity implements Serializable { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/TreeEntity.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/TreeEntity.java index 0481ced..9e1f313 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.domain; +package com.tongran.common.core.web.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * Tree基类 * - * @author ruoyi + * @author tongran */ public class TreeEntity extends BaseEntity { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/PageDomain.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/PageDomain.java index 31365c3..1132b3f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/PageDomain.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.web.page; +package com.tongran.common.core.web.page; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 分页数据 * - * @author ruoyi + * @author tongran */ public class PageDomain { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/TableDataInfo.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/TableDataInfo.java index c31cd4e..946e90a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.page; +package com.tongran.common.core.web.page; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author ruoyi + * @author tongran */ public class TableDataInfo implements Serializable { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/TableSupport.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/TableSupport.java index 404be08..5554cc1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/web/page/TableSupport.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.web.page; +package com.tongran.common.core.web.page; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.ServletUtils; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.ServletUtils; /** * 表格数据处理 * - * @author ruoyi + * @author tongran */ public class TableSupport { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/xss/Xss.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/xss/Xss.java index 28fc30b..29950ae 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.xss; +package com.tongran.common.core.xss; import javax.validation.Constraint; import javax.validation.Payload; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义xss校验注解 * - * @author ruoyi + * @author tongran */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/xss/XssValidator.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java rename to tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/xss/XssValidator.java index 57603fb..4055c3c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/xss/XssValidator.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.core.xss; +package com.tongran.common.core.xss; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 自定义xss校验注解实现 * - * @author ruoyi + * @author tongran */ public class XssValidator implements ConstraintValidator { diff --git a/tongran-common/tongran-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-common/tongran-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..86a9e83 --- /dev/null +++ b/tongran-common/tongran-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.tongran.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/tongran-common/tongran-common-datascope/pom.xml similarity index 60% rename from ruoyi-common/ruoyi-common-datascope/pom.xml rename to tongran-common/tongran-common-datascope/pom.xml index da2508b..b9e73a1 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/tongran-common/tongran-common-datascope/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-datascope + tongran-common-datascope - ruoyi-common-datascope权限范围 + tongran-common-datascope权限范围 - + - com.ruoyi - ruoyi-common-security + com.tongran + tongran-common-security diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/tongran-common/tongran-common-datascope/src/main/java/com/tongran/common/datascope/annotation/DataScope.java similarity index 91% rename from ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java rename to tongran-common/tongran-common-datascope/src/main/java/com/tongran/common/datascope/annotation/DataScope.java index 3834657..8efc780 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java +++ b/tongran-common/tongran-common-datascope/src/main/java/com/tongran/common/datascope/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datascope.annotation; +package com.tongran.common.datascope.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 * - * @author ruoyi + * @author tongran */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/tongran-common/tongran-common-datascope/src/main/java/com/tongran/common/datascope/aspect/DataScopeAspect.java similarity index 91% rename from ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java rename to tongran-common/tongran-common-datascope/src/main/java/com/tongran/common/datascope/aspect/DataScopeAspect.java index d64736e..074c615 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java +++ b/tongran-common/tongran-common-datascope/src/main/java/com/tongran/common/datascope/aspect/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datascope.aspect; +package com.tongran.common.datascope.aspect; import java.util.ArrayList; import java.util.List; @@ -6,21 +6,21 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.context.SecurityContextHolder; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.domain.BaseEntity; +import com.tongran.common.datascope.annotation.DataScope; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.api.model.LoginUser; /** * 数据过滤处理 * - * @author ruoyi + * @author tongran */ @Aspect @Component diff --git a/tongran-common/tongran-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-common/tongran-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..5328622 --- /dev/null +++ b/tongran-common/tongran-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.tongran.common.datascope.aspect.DataScopeAspect diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/tongran-common/tongran-common-datasource/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-datasource/pom.xml rename to tongran-common/tongran-common-datasource/pom.xml index 5d0ddee..9bb682e 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/tongran-common/tongran-common-datasource/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-datasource + tongran-common-datasource - ruoyi-common-datasource多数据源 + tongran-common-datasource多数据源 diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java b/tongran-common/tongran-common-datasource/src/main/java/com/tongran/common/datasource/annotation/Master.java similarity index 86% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java rename to tongran-common/tongran-common-datasource/src/main/java/com/tongran/common/datasource/annotation/Master.java index c71c105..9da51d1 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java +++ b/tongran-common/tongran-common-datasource/src/main/java/com/tongran/common/datasource/annotation/Master.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.annotation; +package com.tongran.common.datasource.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; /** * 主库数据源 * - * @author ruoyi + * @author tongran */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/tongran-common/tongran-common-datasource/src/main/java/com/tongran/common/datasource/annotation/Slave.java similarity index 86% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java rename to tongran-common/tongran-common-datasource/src/main/java/com/tongran/common/datasource/annotation/Slave.java index bc45f6f..71db37c 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java +++ b/tongran-common/tongran-common-datasource/src/main/java/com/tongran/common/datasource/annotation/Slave.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.annotation; +package com.tongran.common.datasource.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; /** * 从库数据源 * - * @author ruoyi + * @author tongran */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/tongran-common/tongran-common-log/pom.xml similarity index 61% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to tongran-common/tongran-common-log/pom.xml index 2b4f2f5..1026a27 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/tongran-common/tongran-common-log/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-log + tongran-common-log - ruoyi-common-log日志记录 + tongran-common-log日志记录 - + - com.ruoyi - ruoyi-common-security + com.tongran + tongran-common-security diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/annotation/Log.java similarity index 85% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/annotation/Log.java index 4497ce6..72b77de 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/annotation/Log.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.log.annotation; +package com.tongran.common.log.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.log.enums.OperatorType; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.log.enums.OperatorType; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author tongran * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/aspect/LogAspect.java similarity index 93% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/aspect/LogAspect.java index de03934..7338fb0 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/aspect/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.log.aspect; +package com.tongran.common.log.aspect; import java.util.Collection; import java.util.Map; @@ -19,22 +19,22 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.ExceptionUtil; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessStatus; -import com.ruoyi.common.log.filter.PropertyPreExcludeFilter; -import com.ruoyi.common.log.service.AsyncLogService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysOperLog; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.ExceptionUtil; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.ip.IpUtils; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessStatus; +import com.tongran.common.log.filter.PropertyPreExcludeFilter; +import com.tongran.common.log.service.AsyncLogService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysOperLog; /** * 操作日志记录处理 * - * @author ruoyi + * @author tongran */ @Aspect @Component diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/BusinessStatus.java similarity index 72% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/BusinessStatus.java index a2a3926..a1fa55d 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.log.enums; +package com.tongran.common.log.enums; /** * 操作状态 * - * @author ruoyi + * @author tongran * */ public enum BusinessStatus diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/BusinessType.java similarity index 89% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/BusinessType.java index 0b18de8..3284569 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.log.enums; +package com.tongran.common.log.enums; /** * 业务操作类型 * - * @author ruoyi + * @author tongran */ public enum BusinessType { diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/OperatorType.java similarity index 77% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/OperatorType.java index 2a041a0..fdf9769 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.log.enums; +package com.tongran.common.log.enums; /** * 操作人类别 * - * @author ruoyi + * @author tongran */ public enum OperatorType { diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/filter/PropertyPreExcludeFilter.java similarity index 88% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/filter/PropertyPreExcludeFilter.java index 0327a24..6e1543c 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/filter/PropertyPreExcludeFilter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.log.filter; +package com.tongran.common.log.filter; import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; /** * 排除JSON敏感属性 * - * @author ruoyi + * @author tongran */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/service/AsyncLogService.java similarity index 70% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java rename to tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/service/AsyncLogService.java index 83f2ef6..07df089 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java +++ b/tongran-common/tongran-common-log/src/main/java/com/tongran/common/log/service/AsyncLogService.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.log.service; +package com.tongran.common.log.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.system.api.RemoteLogService; -import com.ruoyi.system.api.domain.SysOperLog; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.system.api.RemoteLogService; +import com.tongran.system.api.domain.SysOperLog; /** * 异步调用日志服务 * - * @author ruoyi + * @author tongran */ @Service public class AsyncLogService diff --git a/tongran-common/tongran-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-common/tongran-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..0a3d3be --- /dev/null +++ b/tongran-common/tongran-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.tongran.common.log.service.AsyncLogService +com.tongran.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/tongran-common/tongran-common-redis/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to tongran-common/tongran-common-redis/pom.xml index 2d3aed9..2f3b6fe 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/tongran-common/tongran-common-redis/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-redis + tongran-common-redis - ruoyi-common-redis缓存服务 + tongran-common-redis缓存服务 @@ -23,10 +23,10 @@ spring-boot-starter-data-redis - + - com.ruoyi - ruoyi-common-core + com.tongran + tongran-common-core diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/configure/FastJson2JsonRedisSerializer.java similarity index 92% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java rename to tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/configure/FastJson2JsonRedisSerializer.java index d897763..80c5062 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java +++ b/tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.configure; +package com.tongran.common.redis.configure; import java.nio.charset.Charset; import org.springframework.data.redis.serializer.RedisSerializer; @@ -7,12 +7,12 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.filter.Filter; -import com.ruoyi.common.core.constant.Constants; +import com.tongran.common.core.constant.Constants; /** * Redis使用FastJson序列化 * - * @author ruoyi + * @author tongran */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/configure/RedisConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java rename to tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/configure/RedisConfig.java index 6e1ec8a..84e52e7 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java +++ b/tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/configure/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.configure; +package com.tongran.common.redis.configure; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; @@ -13,7 +13,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis配置 * - * @author ruoyi + * @author tongran */ @Configuration @EnableCaching diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/service/RedisService.java similarity index 99% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java rename to tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/service/RedisService.java index 435cb6e..dcd1337 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java +++ b/tongran-common/tongran-common-redis/src/main/java/com/tongran/common/redis/service/RedisService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.service; +package com.tongran.common.redis.service; import java.util.Collection; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; /** * spring redis 工具类 * - * @author ruoyi + * @author tongran **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/tongran-common/tongran-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-common/tongran-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1592e15 --- /dev/null +++ b/tongran-common/tongran-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.tongran.common.redis.configure.RedisConfig +com.tongran.common.redis.service.RedisService diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/tongran-common/tongran-common-seata/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-seata/pom.xml rename to tongran-common/tongran-common-seata/pom.xml index a350e81..0be4bd2 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/tongran-common/tongran-common-seata/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-seata + tongran-common-seata - ruoyi-common-seata分布式事务 + tongran-common-seata分布式事务 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/tongran-common/tongran-common-security/pom.xml similarity index 60% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to tongran-common/tongran-common-security/pom.xml index 1212441..820da4a 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/tongran-common/tongran-common-security/pom.xml @@ -2,16 +2,16 @@ - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-security + tongran-common-security - ruoyi-common-security安全模块 + tongran-common-security安全模块 @@ -22,16 +22,16 @@ spring-webmvc - + - com.ruoyi - ruoyi-api-system + com.tongran + tongran-api-system - + - com.ruoyi - ruoyi-common-redis + com.tongran + tongran-common-redis diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/EnableCustomConfig.java similarity index 80% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/EnableCustomConfig.java index c07c3a8..34f51f0 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/EnableCustomConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,8 +10,8 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; -import com.ruoyi.common.security.config.ApplicationConfig; -import com.ruoyi.common.security.feign.FeignAutoConfiguration; +import com.tongran.common.security.config.ApplicationConfig; +import com.tongran.common.security.feign.FeignAutoConfiguration; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -20,7 +20,7 @@ import com.ruoyi.common.security.feign.FeignAutoConfiguration; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.**.mapper") +@MapperScan("com.tongran.**.mapper") // 开启线程异步执行 @EnableAsync // 自动加载类 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/EnableRyFeignClients.java similarity index 79% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/EnableRyFeignClients.java index 4eb416e..8930ac8 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/EnableRyFeignClients.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; import org.springframework.cloud.openfeign.EnableFeignClients; import java.lang.annotation.*; @@ -7,7 +7,7 @@ import java.lang.annotation.*; * 自定义feign注解 * 添加basePackages路径 * - * @author ruoyi + * @author tongran */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -17,7 +17,7 @@ public @interface EnableRyFeignClients { String[] value() default {}; - String[] basePackages() default { "com.ruoyi" }; + String[] basePackages() default { "com.tongran" }; Class[] basePackageClasses() default {}; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/InnerAuth.java similarity index 79% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/InnerAuth.java index 6eada07..f39514f 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/InnerAuth.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; import java.lang.annotation.*; /** * 内部认证注解 * - * @author ruoyi + * @author tongran */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/Logical.java similarity index 74% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/Logical.java index 4b787a0..1fb600a 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/Logical.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; /** * 权限注解的验证模式 * - * @author ruoyi + * @author tongran * */ public enum Logical diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresLogin.java similarity index 84% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresLogin.java index f196ff5..99b37ff 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresLogin.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 登录认证：只有登录之后才能进入该方法 * - * @author ruoyi + * @author tongran * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresPermissions.java similarity index 89% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresPermissions.java index aef624d..8458938 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresPermissions.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 权限认证：必须具有指定权限才能进入该方法 * - * @author ruoyi + * @author tongran * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresRoles.java similarity index 89% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresRoles.java index 042e4c2..235d261 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/annotation/RequiresRoles.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.tongran.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 角色认证：必须具有指定角色标识才能进入该方法 * - * @author ruoyi + * @author tongran */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/InnerAuthAspect.java similarity index 80% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/InnerAuthAspect.java index 82d8b03..a1e089d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/InnerAuthAspect.java @@ -1,20 +1,20 @@ -package com.ruoyi.common.security.aspect; +package com.tongran.common.security.aspect; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.springframework.core.Ordered; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.exception.InnerAuthException; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.annotation.InnerAuth; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.exception.InnerAuthException; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.annotation.InnerAuth; /** * 内部服务调用验证处理 * - * @author ruoyi + * @author tongran */ @Aspect @Component diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java similarity index 80% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java index 2924805..c1a0713 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.aspect; +package com.tongran.common.security.aspect; import java.lang.reflect.Method; import org.aspectj.lang.ProceedingJoinPoint; @@ -7,10 +7,10 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; -import com.ruoyi.common.security.annotation.RequiresLogin; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.common.security.auth.AuthUtil; +import com.tongran.common.security.annotation.RequiresLogin; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.annotation.RequiresRoles; +import com.tongran.common.security.auth.AuthUtil; /** * 基于 Spring Aop 的注解鉴权 @@ -31,9 +31,9 @@ public class PreAuthorizeAspect /** * 定义AOP签名 (切入所有使用鉴权注解的方法) */ - public static final String POINTCUT_SIGN = " @annotation(com.ruoyi.common.security.annotation.RequiresLogin) || " - + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || " - + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)"; + public static final String POINTCUT_SIGN = " @annotation(com.tongran.common.security.annotation.RequiresLogin) || " + + "@annotation(com.tongran.common.security.annotation.RequiresPermissions) || " + + "@annotation(com.tongran.common.security.annotation.RequiresRoles)"; /** * 声明AOP签名 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/auth/AuthLogic.java similarity index 91% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/auth/AuthLogic.java index f50d70b..da41e36 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/auth/AuthLogic.java @@ -1,27 +1,27 @@ -package com.ruoyi.common.security.auth; +package com.tongran.common.security.auth; import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.springframework.util.PatternMatchUtils; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.exception.auth.NotLoginException; -import com.ruoyi.common.core.exception.auth.NotPermissionException; -import com.ruoyi.common.core.exception.auth.NotRoleException; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.annotation.Logical; -import com.ruoyi.common.security.annotation.RequiresLogin; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.context.SecurityContextHolder; +import com.tongran.common.core.exception.auth.NotLoginException; +import com.tongran.common.core.exception.auth.NotPermissionException; +import com.tongran.common.core.exception.auth.NotRoleException; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.annotation.Logical; +import com.tongran.common.security.annotation.RequiresLogin; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.annotation.RequiresRoles; +import com.tongran.common.security.service.TokenService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.model.LoginUser; /** * Token 权限验证，逻辑实现类 * - * @author ruoyi + * @author tongran */ public class AuthLogic { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/auth/AuthUtil.java similarity index 94% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/auth/AuthUtil.java index 8b0d86c..9d23ad5 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/auth/AuthUtil.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.security.auth; +package com.tongran.common.security.auth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.annotation.RequiresRoles; +import com.tongran.system.api.model.LoginUser; /** * Token 权限验证工具类 * - * @author ruoyi + * @author tongran */ public class AuthUtil { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/config/ApplicationConfig.java similarity index 88% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/config/ApplicationConfig.java index 5ae8d14..5f4b031 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.config; +package com.tongran.common.security.config; import java.util.TimeZone; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean; /** * 系统配置 * - * @author ruoyi + * @author tongran */ public class ApplicationConfig { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/config/WebMvcConfig.java similarity index 85% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/config/WebMvcConfig.java index 46adfd9..c44e511 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/config/WebMvcConfig.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.security.config; +package com.tongran.common.security.config; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.security.interceptor.HeaderInterceptor; +import com.tongran.common.security.interceptor.HeaderInterceptor; /** * 拦截器配置 * - * @author ruoyi + * @author tongran */ public class WebMvcConfig implements WebMvcConfigurer { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/feign/FeignAutoConfiguration.java similarity index 85% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/feign/FeignAutoConfiguration.java index 304798d..22b365f 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/feign/FeignAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.feign; +package com.tongran.common.security.feign; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import feign.RequestInterceptor; /** * Feign 配置注册 * - * @author ruoyi + * @author tongran **/ @Configuration public class FeignAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/feign/FeignRequestInterceptor.java similarity index 86% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/feign/FeignRequestInterceptor.java index 33e12c6..e22c956 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/feign/FeignRequestInterceptor.java @@ -1,19 +1,19 @@ -package com.ruoyi.common.security.feign; +package com.tongran.common.security.feign; import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.ip.IpUtils; import feign.RequestInterceptor; import feign.RequestTemplate; /** * feign 请求拦截器 * - * @author ruoyi + * @author tongran */ @Component public class FeignRequestInterceptor implements RequestInterceptor diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/handler/GlobalExceptionHandler.java similarity index 89% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/handler/GlobalExceptionHandler.java index 5a9ae98..114c8d6 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.handler; +package com.tongran.common.security.handler; import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -10,21 +10,21 @@ import org.springframework.web.bind.MissingPathVariableException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.exception.DemoModeException; -import com.ruoyi.common.core.exception.InnerAuthException; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.exception.auth.NotPermissionException; -import com.ruoyi.common.core.exception.auth.NotRoleException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.html.EscapeUtil; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.tongran.common.core.constant.HttpStatus; +import com.tongran.common.core.exception.DemoModeException; +import com.tongran.common.core.exception.InnerAuthException; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.exception.auth.NotPermissionException; +import com.tongran.common.core.exception.auth.NotRoleException; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.html.EscapeUtil; +import com.tongran.common.core.web.domain.AjaxResult; /** * 全局异常处理器 * - * @author ruoyi + * @author tongran */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/interceptor/HeaderInterceptor.java similarity index 78% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/interceptor/HeaderInterceptor.java index 18c8d2b..b8d3884 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/interceptor/HeaderInterceptor.java @@ -1,22 +1,22 @@ -package com.ruoyi.common.security.interceptor; +package com.tongran.common.security.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.auth.AuthUtil; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.context.SecurityContextHolder; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.auth.AuthUtil; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.model.LoginUser; /** * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取 * 注意：此拦截器会同时验证当前用户有效期自动刷新有效期 * - * @author ruoyi + * @author tongran */ public class HeaderInterceptor implements AsyncHandlerInterceptor { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/service/TokenService.java similarity index 88% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/service/TokenService.java index 0a63b85..3ffd6f4 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.service; +package com.tongran.common.security.service; import java.util.HashMap; import java.util.Map; @@ -8,21 +8,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.utils.JwtUtils; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.common.core.utils.uuid.IdUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.utils.JwtUtils; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.ip.IpUtils; +import com.tongran.common.core.utils.uuid.IdUtils; +import com.tongran.common.redis.service.RedisService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.model.LoginUser; /** * token验证处理 * - * @author ruoyi + * @author tongran */ @Component public class TokenService diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/utils/DictUtils.java similarity index 83% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/utils/DictUtils.java index 8282fdc..a7fe44a 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/utils/DictUtils.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.security.utils; +package com.tongran.common.security.utils; import java.util.Collection; import java.util.List; import com.alibaba.fastjson2.JSONArray; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.system.api.domain.SysDictData; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.redis.service.RedisService; +import com.tongran.system.api.domain.SysDictData; /** * 字典工具类 * - * @author ruoyi + * @author tongran */ public class DictUtils { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/utils/SecurityUtils.java similarity index 86% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java rename to tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/utils/SecurityUtils.java index 149dd8a..5260597 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/utils/SecurityUtils.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.security.utils; +package com.tongran.common.security.utils; import javax.servlet.http.HttpServletRequest; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.TokenConstants; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.TokenConstants; +import com.tongran.common.core.context.SecurityContextHolder; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.system.api.model.LoginUser; /** * 权限获取工具类 * - * @author ruoyi + * @author tongran */ public class SecurityUtils { diff --git a/tongran-common/tongran-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-common/tongran-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..de68840 --- /dev/null +++ b/tongran-common/tongran-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.tongran.common.security.config.WebMvcConfig +com.tongran.common.security.service.TokenService +com.tongran.common.security.aspect.PreAuthorizeAspect +com.tongran.common.security.aspect.InnerAuthAspect +com.tongran.common.security.handler.GlobalExceptionHandler diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/tongran-common/tongran-common-sensitive/pom.xml similarity index 60% rename from ruoyi-common/ruoyi-common-sensitive/pom.xml rename to tongran-common/tongran-common-sensitive/pom.xml index 9ed473c..e3f8257 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/tongran-common/tongran-common-sensitive/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-sensitive + tongran-common-sensitive - ruoyi-common-sensitive数据脱敏 + tongran-common-sensitive数据脱敏 - + - com.ruoyi - ruoyi-common-core + com.tongran + tongran-common-core diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/annotation/Sensitive.java similarity index 73% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java rename to tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/annotation/Sensitive.java index 30b24b3..cf6b1bf 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java +++ b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/annotation/Sensitive.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.sensitive.annotation; +package com.tongran.common.sensitive.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -6,13 +6,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.sensitive.config.SensitiveJsonSerializer; -import com.ruoyi.common.sensitive.enums.DesensitizedType; +import com.tongran.common.sensitive.config.SensitiveJsonSerializer; +import com.tongran.common.sensitive.enums.DesensitizedType; /** * 数据脱敏注解 * - * @author ruoyi + * @author tongran */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/config/SensitiveJsonSerializer.java similarity index 85% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java rename to tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/config/SensitiveJsonSerializer.java index cbb0d7e..52f3f79 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java +++ b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/config/SensitiveJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.sensitive.config; +package com.tongran.common.sensitive.config; import java.io.IOException; import java.util.Objects; @@ -8,15 +8,15 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.sensitive.annotation.Sensitive; -import com.ruoyi.common.sensitive.enums.DesensitizedType; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.context.SecurityContextHolder; +import com.tongran.common.sensitive.annotation.Sensitive; +import com.tongran.common.sensitive.enums.DesensitizedType; /** * 数据脱敏序列化过滤 * - * @author ruoyi + * @author tongran */ public class SensitiveJsonSerializer extends JsonSerializer implements ContextualSerializer { diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/enums/DesensitizedType.java similarity index 91% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java rename to tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/enums/DesensitizedType.java index 9504b9d..76dab52 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java +++ b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/enums/DesensitizedType.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.sensitive.enums; +package com.tongran.common.sensitive.enums; import java.util.function.Function; -import com.ruoyi.common.sensitive.utils.DesensitizedUtil; +import com.tongran.common.sensitive.utils.DesensitizedUtil; /** * 脱敏类型 * - * @author ruoyi + * @author tongran */ public enum DesensitizedType { diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/utils/DesensitizedUtil.java similarity index 90% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java rename to tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/utils/DesensitizedUtil.java index 9c542d6..99dd9f4 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java +++ b/tongran-common/tongran-common-sensitive/src/main/java/com/tongran/common/sensitive/utils/DesensitizedUtil.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.sensitive.utils; +package com.tongran.common.sensitive.utils; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 脱敏工具类 * - * @author ruoyi + * @author tongran */ public class DesensitizedUtil { diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/tongran-common/tongran-common-swagger/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-swagger/pom.xml rename to tongran-common/tongran-common-swagger/pom.xml index 1925955..7f8c69e 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/tongran-common/tongran-common-swagger/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-common + com.tongran + tongran-common 3.6.6 4.0.0 - ruoyi-common-swagger + tongran-common-swagger - ruoyi-common-swagger系统接口 + tongran-common-swagger系统接口 diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java b/tongran-common/tongran-common-swagger/src/main/java/com/tongran/common/swagger/config/SpringDocAutoConfiguration.java similarity index 94% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java rename to tongran-common/tongran-common-swagger/src/main/java/com/tongran/common/swagger/config/SpringDocAutoConfiguration.java index 77b6ee6..f8ec6bc 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java +++ b/tongran-common/tongran-common-swagger/src/main/java/com/tongran/common/swagger/config/SpringDocAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.config; +package com.tongran.common.swagger.config; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import com.ruoyi.common.swagger.config.properties.SpringDocProperties; +import com.tongran.common.swagger.config.properties.SpringDocProperties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; @@ -17,7 +17,7 @@ import io.swagger.v3.oas.models.servers.Server; /** * Swagger 文档配置 * - * @author ruoyi + * @author tongran */ @EnableConfigurationProperties(SpringDocProperties.class) @ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true) diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SpringDocProperties.java b/tongran-common/tongran-common-swagger/src/main/java/com/tongran/common/swagger/config/properties/SpringDocProperties.java similarity index 97% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SpringDocProperties.java rename to tongran-common/tongran-common-swagger/src/main/java/com/tongran/common/swagger/config/properties/SpringDocProperties.java index fb892c2..23e1136 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SpringDocProperties.java +++ b/tongran-common/tongran-common-swagger/src/main/java/com/tongran/common/swagger/config/properties/SpringDocProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.config.properties; +package com.tongran.common.swagger.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; @@ -8,7 +8,7 @@ import io.swagger.v3.oas.models.info.License; /** * Swagger 配置属性 * - * @author ruoyi + * @author tongran */ @ConfigurationProperties(prefix = "springdoc") public class SpringDocProperties diff --git a/tongran-common/tongran-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tongran-common/tongran-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..295c269 --- /dev/null +++ b/tongran-common/tongran-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.tongran.common.swagger.config.SpringDocAutoConfiguration \ No newline at end of file diff --git a/ruoyi-gateway/pom.xml b/tongran-gateway/pom.xml similarity index 91% rename from ruoyi-gateway/pom.xml rename to tongran-gateway/pom.xml index cf15093..07af9a6 100644 --- a/ruoyi-gateway/pom.xml +++ b/tongran-gateway/pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi + com.tongran + tongran 3.6.6 4.0.0 - ruoyi-gateway + tongran-gateway - ruoyi-gateway网关模块 + tongran-gateway网关模块 @@ -70,10 +70,10 @@ kaptcha - + - com.ruoyi - ruoyi-common-redis + com.tongran + tongran-common-redis diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/tongran-gateway/src/main/java/com/tongran/gateway/TongRanGatewayApplication.java similarity index 80% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java rename to tongran-gateway/src/main/java/com/tongran/gateway/TongRanGatewayApplication.java index 3c54b77..e1eba43 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/TongRanGatewayApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway; +package com.tongran.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,15 +7,15 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 网关启动程序 * - * @author ruoyi + * @author tongran */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiGatewayApplication +public class TongRanGatewayApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiGatewayApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依网关启动成功 ლ(´ڡ`ლ)ﾞ \n" + + SpringApplication.run(TongRanGatewayApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 彤然网关启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/CaptchaConfig.java similarity index 96% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/CaptchaConfig.java index e6c6d9d..bb2b14a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.tongran.gateway.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author ruoyi + * @author tongran */ @Configuration public class CaptchaConfig @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.gateway.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.tongran.gateway.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CorsConfig.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/CorsConfig.java similarity index 97% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CorsConfig.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/CorsConfig.java index d7da653..8a7dc2b 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CorsConfig.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.tongran.gateway.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,7 +16,7 @@ import reactor.core.publisher.Mono; /** * 跨域配置 * - * @author ruoyi + * @author tongran */ @Configuration public class CorsConfig diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/GatewayConfig.java similarity index 80% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/GatewayConfig.java index 3bb6d8e..7ccc707 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/GatewayConfig.java @@ -1,15 +1,15 @@ -package com.ruoyi.gateway.config; +package com.tongran.gateway.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import com.ruoyi.gateway.handler.SentinelFallbackHandler; +import com.tongran.gateway.handler.SentinelFallbackHandler; /** * 网关限流配置 * - * @author ruoyi + * @author tongran */ @Configuration public class GatewayConfig diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/KaptchaTextCreator.java similarity index 97% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/KaptchaTextCreator.java index f68e0fa..1f83e07 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.tongran.gateway.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 验证码文本生成器 * - * @author ruoyi + * @author tongran */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/RouterFunctionConfiguration.java similarity index 88% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/RouterFunctionConfiguration.java index db3c94e..be47ca2 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/RouterFunctionConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.tongran.gateway.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -7,12 +7,12 @@ import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.RequestPredicates; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; -import com.ruoyi.gateway.handler.ValidateCodeHandler; +import com.tongran.gateway.handler.ValidateCodeHandler; /** * 路由配置信息 * - * @author ruoyi + * @author tongran */ @Configuration public class RouterFunctionConfiguration diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/SpringDocConfig.java similarity index 94% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/SpringDocConfig.java index 2df8ea0..519d22a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/SpringDocConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.tongran.gateway.config; import java.util.Set; import java.util.stream.Collectors; @@ -13,12 +13,12 @@ import com.alibaba.nacos.client.naming.event.InstancesChangeEvent; import com.alibaba.nacos.common.notify.Event; import com.alibaba.nacos.common.notify.NotifyCenter; import com.alibaba.nacos.common.notify.listener.Subscriber; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * SpringDoc配置类 * - * @author ruoyi + * @author tongran */ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true) @@ -51,7 +51,7 @@ class SwaggerDocRegister extends Subscriber @Autowired private DiscoveryClient discoveryClient; - private final static String[] EXCLUDE_ROUTES = new String[] { "ruoyi-gateway", "ruoyi-auth", "ruoyi-file", "ruoyi-monitor" }; + private final static String[] EXCLUDE_ROUTES = new String[] { "tongran-gateway", "tongran-auth", "tongran-file", "tongran-monitor" }; public SwaggerDocRegister(SwaggerUiConfigProperties swaggerUiConfigProperties, DiscoveryClient discoveryClient) { diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/properties/CaptchaProperties.java similarity index 92% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/properties/CaptchaProperties.java index f6bb000..da62c49 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/properties/CaptchaProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config.properties; +package com.tongran.gateway.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * 验证码配置 * - * @author ruoyi + * @author tongran */ @Configuration @RefreshScope diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/properties/IgnoreWhiteProperties.java similarity index 91% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/properties/IgnoreWhiteProperties.java index 1d2c56a..ff4c686 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/properties/IgnoreWhiteProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config.properties; +package com.tongran.gateway.config.properties; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; /** * 放行白名单配置 * - * @author ruoyi + * @author tongran */ @Configuration @RefreshScope diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/tongran-gateway/src/main/java/com/tongran/gateway/config/properties/XssProperties.java similarity index 93% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java rename to tongran-gateway/src/main/java/com/tongran/gateway/config/properties/XssProperties.java index 891679e..0563e7f 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config.properties; +package com.tongran.gateway.config.properties; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; /** * XSS跨站脚本配置 * - * @author ruoyi + * @author tongran */ @Configuration @RefreshScope diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/tongran-gateway/src/main/java/com/tongran/gateway/filter/AuthFilter.java similarity index 88% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java rename to tongran-gateway/src/main/java/com/tongran/gateway/filter/AuthFilter.java index 51d39ef..e61d3a4 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/filter/AuthFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.tongran.gateway.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,22 +9,22 @@ import org.springframework.core.Ordered; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.TokenConstants; -import com.ruoyi.common.core.utils.JwtUtils; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.constant.HttpStatus; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.constant.TokenConstants; +import com.tongran.common.core.utils.JwtUtils; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.redis.service.RedisService; +import com.tongran.gateway.config.properties.IgnoreWhiteProperties; import io.jsonwebtoken.Claims; import reactor.core.publisher.Mono; /** * 网关鉴权 * - * @author ruoyi + * @author tongran */ @Component public class AuthFilter implements GlobalFilter, Ordered diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java b/tongran-gateway/src/main/java/com/tongran/gateway/filter/BlackListUrlFilter.java similarity index 94% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java rename to tongran-gateway/src/main/java/com/tongran/gateway/filter/BlackListUrlFilter.java index 343bd01..9fb5309 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/filter/BlackListUrlFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.tongran.gateway.filter; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import java.util.regex.Pattern; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.ServletUtils; /** * 黑名单过滤器 * - * @author ruoyi + * @author tongran */ @Component public class BlackListUrlFilter extends AbstractGatewayFilterFactory diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/tongran-gateway/src/main/java/com/tongran/gateway/filter/ValidateCodeFilter.java similarity index 90% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java rename to tongran-gateway/src/main/java/com/tongran/gateway/filter/ValidateCodeFilter.java index 611ac78..392b4db 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/filter/ValidateCodeFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.tongran.gateway.filter; import java.nio.CharBuffer; import java.nio.charset.StandardCharsets; @@ -12,16 +12,16 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gateway.config.properties.CaptchaProperties; -import com.ruoyi.gateway.service.ValidateCodeService; +import com.tongran.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.gateway.config.properties.CaptchaProperties; +import com.tongran.gateway.service.ValidateCodeService; import reactor.core.publisher.Flux; /** * 验证码过滤器 * - * @author ruoyi + * @author tongran */ @Component public class ValidateCodeFilter extends AbstractGatewayFilterFactory diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/tongran-gateway/src/main/java/com/tongran/gateway/filter/XssFilter.java similarity index 95% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java rename to tongran-gateway/src/main/java/com/tongran/gateway/filter/XssFilter.java index c8f1ba4..882af25 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.tongran.gateway.filter; import java.nio.charset.StandardCharsets; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +18,9 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequestDecorator; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.html.EscapeUtil; -import com.ruoyi.gateway.config.properties.XssProperties; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.html.EscapeUtil; +import com.tongran.gateway.config.properties.XssProperties; import io.netty.buffer.ByteBufAllocator; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -28,7 +28,7 @@ import reactor.core.publisher.Mono; /** * 跨站脚本过滤器 * - * @author ruoyi + * @author tongran */ @Component @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/tongran-gateway/src/main/java/com/tongran/gateway/handler/GatewayExceptionHandler.java similarity index 93% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java rename to tongran-gateway/src/main/java/com/tongran/gateway/handler/GatewayExceptionHandler.java index 29ea5e3..d58c71a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/handler/GatewayExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.handler; +package com.tongran.gateway.handler; import org.springframework.cloud.gateway.support.NotFoundException; import org.slf4j.Logger; @@ -9,13 +9,13 @@ import org.springframework.core.annotation.Order; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.ServletUtils; import reactor.core.publisher.Mono; /** * 网关统一异常处理 * - * @author ruoyi + * @author tongran */ @Order(-1) @Configuration diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java b/tongran-gateway/src/main/java/com/tongran/gateway/handler/SentinelFallbackHandler.java similarity index 92% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java rename to tongran-gateway/src/main/java/com/tongran/gateway/handler/SentinelFallbackHandler.java index 86abf88..cea51a4 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/handler/SentinelFallbackHandler.java @@ -1,8 +1,8 @@ -package com.ruoyi.gateway.handler; +package com.tongran.gateway.handler; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; import com.alibaba.csp.sentinel.slots.block.BlockException; -import com.ruoyi.common.core.utils.ServletUtils; +import com.tongran.common.core.utils.ServletUtils; import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebExceptionHandler; @@ -11,7 +11,7 @@ import reactor.core.publisher.Mono; /** * 自定义限流异常处理 * - * @author ruoyi + * @author tongran */ public class SentinelFallbackHandler implements WebExceptionHandler { diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/tongran-gateway/src/main/java/com/tongran/gateway/handler/ValidateCodeHandler.java similarity index 82% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java rename to tongran-gateway/src/main/java/com/tongran/gateway/handler/ValidateCodeHandler.java index 45e7b15..a952127 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/handler/ValidateCodeHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.handler; +package com.tongran.gateway.handler; import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; @@ -8,15 +8,15 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.gateway.service.ValidateCodeService; +import com.tongran.common.core.exception.CaptchaException; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.gateway.service.ValidateCodeService; import reactor.core.publisher.Mono; /** * 验证码获取 * - * @author ruoyi + * @author tongran */ @Component public class ValidateCodeHandler implements HandlerFunction diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/tongran-gateway/src/main/java/com/tongran/gateway/service/ValidateCodeService.java similarity index 66% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java rename to tongran-gateway/src/main/java/com/tongran/gateway/service/ValidateCodeService.java index 8a74aeb..d670aeb 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/service/ValidateCodeService.java @@ -1,13 +1,13 @@ -package com.ruoyi.gateway.service; +package com.tongran.gateway.service; import java.io.IOException; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.tongran.common.core.exception.CaptchaException; +import com.tongran.common.core.web.domain.AjaxResult; /** * 验证码处理 * - * @author ruoyi + * @author tongran */ public interface ValidateCodeService { diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/tongran-gateway/src/main/java/com/tongran/gateway/service/impl/ValidateCodeServiceImpl.java similarity index 83% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java rename to tongran-gateway/src/main/java/com/tongran/gateway/service/impl/ValidateCodeServiceImpl.java index 2185bdf..91db18e 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/tongran-gateway/src/main/java/com/tongran/gateway/service/impl/ValidateCodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.service.impl; +package com.tongran.gateway.service.impl; import java.awt.image.BufferedImage; import java.io.IOException; @@ -9,21 +9,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.sign.Base64; -import com.ruoyi.common.core.utils.uuid.IdUtils; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.gateway.config.properties.CaptchaProperties; -import com.ruoyi.gateway.service.ValidateCodeService; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.exception.CaptchaException; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.sign.Base64; +import com.tongran.common.core.utils.uuid.IdUtils; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.redis.service.RedisService; +import com.tongran.gateway.config.properties.CaptchaProperties; +import com.tongran.gateway.service.ValidateCodeService; /** * 验证码实现处理 * - * @author ruoyi + * @author tongran */ @Service public class ValidateCodeServiceImpl implements ValidateCodeService diff --git a/ruoyi-gateway/src/main/resources/banner.txt b/tongran-gateway/src/main/resources/banner.txt similarity index 100% rename from ruoyi-gateway/src/main/resources/banner.txt rename to tongran-gateway/src/main/resources/banner.txt diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/tongran-gateway/src/main/resources/bootstrap.yml similarity index 90% rename from ruoyi-gateway/src/main/resources/bootstrap.yml rename to tongran-gateway/src/main/resources/bootstrap.yml index 07147df..50a2cc0 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/tongran-gateway/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-gateway + name: tongran-gateway profiles: # 环境配置 active: dev @@ -23,7 +23,8 @@ spring: # 配置中心地址 server-addr: 172.16.15.52:8848 # server-addr: 172.16.15.103:8848 - namespace: saas-local + namespace: public +# namespace: saas-local username: nacos password: nacos # 配置文件格式 @@ -42,7 +43,7 @@ spring: ds1: nacos: server-addr: 127.0.0.1:8848 - dataId: sentinel-ruoyi-gateway + dataId: sentinel-tongran-gateway groupId: DEFAULT_GROUP data-type: json rule-type: gw-flow diff --git a/tongran-gateway/src/main/resources/logback.xml b/tongran-gateway/src/main/resources/logback.xml new file mode 100644 index 0000000..a5dbaef --- /dev/null +++ b/tongran-gateway/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/pom.xml b/tongran-modules/pom.xml similarity index 56% rename from ruoyi-modules/pom.xml rename to tongran-modules/pom.xml index 4268586..30b5e99 100644 --- a/ruoyi-modules/pom.xml +++ b/tongran-modules/pom.xml @@ -2,25 +2,25 @@ - com.ruoyi - ruoyi + com.tongran + tongran 3.6.6 4.0.0 - ruoyi-system - ruoyi-gen - ruoyi-job - ruoyi-file - ruoyi-mtragent + tongran-system + tongran-gen + tongran-job + tongran-file + tongran-mtragent - ruoyi-modules + tongran-modules pom - ruoyi-modules业务模块 + tongran-modules业务模块 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/tongran-modules/tongran-file/pom.xml similarity index 88% rename from ruoyi-modules/ruoyi-file/pom.xml rename to tongran-modules/tongran-file/pom.xml index 8c6c012..13ac637 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/tongran-modules/tongran-file/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-modules + com.tongran + tongran-modules 3.6.6 4.0.0 - ruoyi-modules-file + tongran-modules-file - ruoyi-modules-file文件服务 + tongran-modules-file文件服务 @@ -60,10 +60,10 @@ ${minio.version} - + - com.ruoyi - ruoyi-api-system + com.tongran + tongran-api-system diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/TongRanFileApplication.java similarity index 87% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/TongRanFileApplication.java index cc6fdd0..c039fc4 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/TongRanFileApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.file; +package com.tongran.file; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,14 +7,14 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 文件服务 * - * @author ruoyi + * @author tongran */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiFileApplication +public class TongRanFileApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiFileApplication.class, args); + SpringApplication.run(TongRanFileApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/config/MinioConfig.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/config/MinioConfig.java index 29beea0..1f2be8f 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/config/MinioConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.config; +package com.tongran.file.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -8,7 +8,7 @@ import io.minio.MinioClient; /** * Minio 配置信息 * - * @author ruoyi + * @author tongran */ @Configuration @ConfigurationProperties(prefix = "minio") diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/config/ResourcesConfig.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/config/ResourcesConfig.java index 8003670..27b4c52 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.config; +package com.tongran.file.config; import java.io.File; import org.springframework.beans.factory.annotation.Value; @@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * 通用映射配置 * - * @author ruoyi + * @author tongran */ @Configuration public class ResourcesConfig implements WebMvcConfigurer diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/controller/SysFileController.java similarity index 85% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/controller/SysFileController.java index e876a9e..436e61c 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/controller/SysFileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.controller; +package com.tongran.file.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,16 +7,16 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.file.service.ISysFileService; -import com.ruoyi.system.api.domain.SysFile; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.file.FileUtils; +import com.tongran.file.service.ISysFileService; +import com.tongran.system.api.domain.SysFile; /** * 文件请求处理 * - * @author ruoyi + * @author tongran */ @RestController public class SysFileController diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/FastDfsSysFileServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/service/FastDfsSysFileServiceImpl.java index 30719e0..fb19a4e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/FastDfsSysFileServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.service; +package com.tongran.file.service; import java.io.InputStream; import org.springframework.beans.factory.annotation.Autowired; @@ -8,12 +8,12 @@ import org.springframework.web.multipart.MultipartFile; import com.alibaba.nacos.common.utils.IoUtils; import com.github.tobato.fastdfs.domain.fdfs.StorePath; import com.github.tobato.fastdfs.service.FastFileStorageClient; -import com.ruoyi.common.core.utils.file.FileTypeUtils; +import com.tongran.common.core.utils.file.FileTypeUtils; /** * FastDFS 文件存储 * - * @author ruoyi + * @author tongran */ @Service public class FastDfsSysFileServiceImpl implements ISysFileService diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/ISysFileService.java similarity index 90% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/service/ISysFileService.java index 5156081..d58c799 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/ISysFileService.java @@ -1,11 +1,11 @@ -package com.ruoyi.file.service; +package com.tongran.file.service; import org.springframework.web.multipart.MultipartFile; /** * 文件上传接口 * - * @author ruoyi + * @author tongran */ public interface ISysFileService { diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/LocalSysFileServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/service/LocalSysFileServiceImpl.java index ccbefd6..bffd166 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/LocalSysFileServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.file.service; +package com.tongran.file.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.file.utils.FileUploadUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.file.FileUtils; +import com.tongran.file.utils.FileUploadUtils; /** * 本地文件存储 * - * @author ruoyi + * @author tongran */ @Primary @Service diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/MinioSysFileServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/service/MinioSysFileServiceImpl.java index a462c4c..2b4320e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/service/MinioSysFileServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.file.service; +package com.tongran.file.service; import java.io.InputStream; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.alibaba.nacos.common.utils.IoUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.file.config.MinioConfig; -import com.ruoyi.file.utils.FileUploadUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.file.config.MinioConfig; +import com.tongran.file.utils.FileUploadUtils; import io.minio.MinioClient; import io.minio.PutObjectArgs; import io.minio.RemoveObjectArgs; @@ -15,7 +15,7 @@ import io.minio.RemoveObjectArgs; /** * Minio 文件存储 * - * @author ruoyi + * @author tongran */ @Service public class MinioSysFileServiceImpl implements ISysFileService diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/tongran-modules/tongran-file/src/main/java/com/tongran/file/utils/FileUploadUtils.java similarity index 90% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java rename to tongran-modules/tongran-file/src/main/java/com/tongran/file/utils/FileUploadUtils.java index 6ae0204..f4e0970 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/tongran-modules/tongran-file/src/main/java/com/tongran/file/utils/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.utils; +package com.tongran.file.utils; import java.io.File; import java.io.IOException; @@ -6,20 +6,20 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.exception.file.FileException; -import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.core.exception.file.InvalidExtensionException; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.MimeTypeUtils; -import com.ruoyi.common.core.utils.uuid.Seq; +import com.tongran.common.core.exception.file.FileException; +import com.tongran.common.core.exception.file.FileNameLengthLimitExceededException; +import com.tongran.common.core.exception.file.FileSizeLimitExceededException; +import com.tongran.common.core.exception.file.InvalidExtensionException; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.file.FileTypeUtils; +import com.tongran.common.core.utils.file.MimeTypeUtils; +import com.tongran.common.core.utils.uuid.Seq; /** * 文件上传工具类 * - * @author ruoyi + * @author tongran */ public class FileUploadUtils { diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/banner.txt b/tongran-modules/tongran-file/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-file/src/main/resources/banner.txt rename to tongran-modules/tongran-file/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/tongran-modules/tongran-file/src/main/resources/bootstrap.yml similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml rename to tongran-modules/tongran-file/src/main/resources/bootstrap.yml index ee2018a..87396c3 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/tongran-modules/tongran-file/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-file + name: tongran-file profiles: # 环境配置 active: dev @@ -23,7 +23,8 @@ spring: # 配置中心地址 server-addr: 172.16.15.52:8848 # server-addr: 172.16.15.103:8848 - namespace: saas-local + namespace: public +# namespace: saas-local username: nacos password: nacos # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/logback.xml b/tongran-modules/tongran-file/src/main/resources/logback.xml similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/resources/logback.xml rename to tongran-modules/tongran-file/src/main/resources/logback.xml index ed6c17d..a353b6f 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/logback.xml +++ b/tongran-modules/tongran-file/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/tongran-modules/tongran-gen/pom.xml similarity index 83% rename from ruoyi-modules/ruoyi-gen/pom.xml rename to tongran-modules/tongran-gen/pom.xml index 29b4268..c9f9007 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/tongran-modules/tongran-gen/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-modules + com.tongran + tongran-modules 3.6.6 4.0.0 - ruoyi-modules-gen + tongran-modules-gen - ruoyi-modules-gen代码生成 + tongran-modules-gen代码生成 @@ -53,16 +53,16 @@ mysql-connector-j - + - com.ruoyi - ruoyi-common-log + com.tongran + tongran-common-log - + - com.ruoyi - ruoyi-common-swagger + com.tongran + tongran-common-swagger diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/TongRanGenApplication.java similarity index 76% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/TongRanGenApplication.java index 3d0cc6b..d3f5152 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/TongRanGenApplication.java @@ -1,23 +1,23 @@ -package com.ruoyi.gen; +package com.tongran.gen; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.tongran.common.security.annotation.EnableCustomConfig; +import com.tongran.common.security.annotation.EnableRyFeignClients; /** * 代码生成 * - * @author ruoyi + * @author tongran */ @EnableCustomConfig @EnableRyFeignClients @SpringBootApplication -public class RuoYiGenApplication +public class TongRanGenApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiGenApplication.class, args); + SpringApplication.run(TongRanGenApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/config/GenConfig.java similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/config/GenConfig.java index cc65951..c25cd0c 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.config; +package com.tongran.gen.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * 代码生成相关配置 * - * @author ruoyi + * @author tongran */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/controller/GenController.java similarity index 90% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/controller/GenController.java index 47eb9f3..8ffdce4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.controller; +package com.tongran.gen.controller; import java.io.IOException; import java.util.HashMap; @@ -16,23 +16,23 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.gen.config.GenConfig; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; -import com.ruoyi.gen.service.IGenTableColumnService; -import com.ruoyi.gen.service.IGenTableService; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.gen.config.GenConfig; +import com.tongran.gen.domain.GenTable; +import com.tongran.gen.domain.GenTableColumn; +import com.tongran.gen.service.IGenTableColumnService; +import com.tongran.gen.service.IGenTableService; /** * 代码生成 操作处理 * - * @author ruoyi + * @author tongran */ @RequestMapping("/gen") @RestController @@ -208,7 +208,7 @@ public class GenController extends BaseController private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"tongran.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/domain/GenTable.java similarity index 97% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/domain/GenTable.java index 785ac78..facfad1 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/domain/GenTable.java @@ -1,17 +1,17 @@ -package com.ruoyi.gen.domain; +package com.tongran.gen.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.constant.GenConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.domain.BaseEntity; /** * 业务表 gen_table * - * @author ruoyi + * @author tongran */ public class GenTable extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/domain/GenTableColumn.java similarity index 98% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/domain/GenTableColumn.java index f5a77b1..fda1597 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/domain/GenTableColumn.java @@ -1,13 +1,13 @@ -package com.ruoyi.gen.domain; +package com.tongran.gen.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.domain.BaseEntity; /** * 代码生成业务字段表 gen_table_column * - * @author ruoyi + * @author tongran */ public class GenTableColumn extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/mapper/GenTableColumnMapper.java similarity index 92% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/mapper/GenTableColumnMapper.java index 0be7cc0..7ecd481 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/mapper/GenTableColumnMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.gen.mapper; +package com.tongran.gen.mapper; import java.util.List; -import com.ruoyi.gen.domain.GenTableColumn; +import com.tongran.gen.domain.GenTableColumn; /** * 业务字段 数据层 * - * @author ruoyi + * @author tongran */ public interface GenTableColumnMapper { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/mapper/GenTableMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/mapper/GenTableMapper.java index 3487d6a..c7f4abe 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/mapper/GenTableMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.gen.mapper; +package com.tongran.gen.mapper; import java.util.List; -import com.ruoyi.gen.domain.GenTable; +import com.tongran.gen.domain.GenTable; /** * 业务 数据层 * - * @author ruoyi + * @author tongran */ public interface GenTableMapper { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/GenTableColumnServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/GenTableColumnServiceImpl.java index f009c4b..e6e9926 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/GenTableColumnServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.gen.service; +package com.tongran.gen.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.gen.domain.GenTableColumn; -import com.ruoyi.gen.mapper.GenTableColumnMapper; +import com.tongran.common.core.text.Convert; +import com.tongran.gen.domain.GenTableColumn; +import com.tongran.gen.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 * - * @author ruoyi + * @author tongran */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/GenTableServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/GenTableServiceImpl.java index 38b1464..8b1efe4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.service; +package com.tongran.gen.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,24 +23,24 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; -import com.ruoyi.gen.mapper.GenTableColumnMapper; -import com.ruoyi.gen.mapper.GenTableMapper; -import com.ruoyi.gen.util.GenUtils; -import com.ruoyi.gen.util.VelocityInitializer; -import com.ruoyi.gen.util.VelocityUtils; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.constant.GenConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.text.CharsetKit; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.gen.domain.GenTable; +import com.tongran.gen.domain.GenTableColumn; +import com.tongran.gen.mapper.GenTableColumnMapper; +import com.tongran.gen.mapper.GenTableMapper; +import com.tongran.gen.util.GenUtils; +import com.tongran.gen.util.VelocityInitializer; +import com.tongran.gen.util.VelocityUtils; /** * 业务 服务层实现 * - * @author ruoyi + * @author tongran */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/IGenTableColumnService.java similarity index 89% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/IGenTableColumnService.java index 1f23685..e3b1246 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/IGenTableColumnService.java @@ -1,12 +1,12 @@ -package com.ruoyi.gen.service; +package com.tongran.gen.service; import java.util.List; -import com.ruoyi.gen.domain.GenTableColumn; +import com.tongran.gen.domain.GenTableColumn; /** * 业务字段 服务层 * - * @author ruoyi + * @author tongran */ public interface IGenTableColumnService { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/IGenTableService.java similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/IGenTableService.java index 0da8af7..8ba672b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/service/IGenTableService.java @@ -1,13 +1,13 @@ -package com.ruoyi.gen.service; +package com.tongran.gen.service; import java.util.List; import java.util.Map; -import com.ruoyi.gen.domain.GenTable; +import com.tongran.gen.domain.GenTable; /** * 业务 服务层 * - * @author ruoyi + * @author tongran */ public interface IGenTableService { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/GenUtils.java similarity index 95% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/GenUtils.java index 3dae786..b24bda9 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/GenUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.gen.util; +package com.tongran.gen.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gen.config.GenConfig; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; +import com.tongran.common.core.constant.GenConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.gen.config.GenConfig; +import com.tongran.gen.domain.GenTable; +import com.tongran.gen.domain.GenTableColumn; /** * 代码生成器 工具类 * - * @author ruoyi + * @author tongran */ public class GenUtils { @@ -215,7 +215,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表|彤然)", ""); } /** diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/VelocityInitializer.java similarity index 88% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/VelocityInitializer.java index d6f0160..eb96a21 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/VelocityInitializer.java @@ -1,13 +1,13 @@ -package com.ruoyi.gen.util; +package com.tongran.gen.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.core.constant.Constants; +import com.tongran.common.core.constant.Constants; /** * VelocityEngine工厂 * - * @author ruoyi + * @author tongran */ public class VelocityInitializer { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/VelocityUtils.java similarity index 98% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java rename to tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/VelocityUtils.java index 005552a..a08e729 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java +++ b/tongran-modules/tongran-gen/src/main/java/com/tongran/gen/util/VelocityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.util; +package com.tongran.gen.util; import java.util.ArrayList; import java.util.HashSet; @@ -7,16 +7,16 @@ import java.util.Set; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; +import com.tongran.common.core.constant.GenConstants; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.gen.domain.GenTable; +import com.tongran.gen.domain.GenTableColumn; /** * 模板工具类 * - * @author ruoyi + * @author tongran */ public class VelocityUtils { diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt b/tongran-modules/tongran-gen/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt rename to tongran-modules/tongran-gen/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/tongran-modules/tongran-gen/src/main/resources/bootstrap.yml similarity index 91% rename from ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml rename to tongran-modules/tongran-gen/src/main/resources/bootstrap.yml index 2423fef..5545e4c 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/tongran-modules/tongran-gen/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-gen + name: tongran-gen profiles: # 环境配置 active: dev @@ -23,7 +23,8 @@ spring: server-addr: 172.16.15.52:8848 # 配置中心地址 # server-addr: 172.16.15.103:8848 - namespace: saas-local + namespace: public +# namespace: saas-local username: nacos password: nacos # 配置文件格式 diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/tongran-modules/tongran-gen/src/main/resources/logback.xml similarity index 96% rename from ruoyi-gateway/src/main/resources/logback.xml rename to tongran-modules/tongran-gen/src/main/resources/logback.xml index f8e7f8a..7709212 100644 --- a/ruoyi-gateway/src/main/resources/logback.xml +++ b/tongran-modules/tongran-gen/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/tongran-modules/tongran-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to tongran-modules/tongran-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 9723938..3baf23f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/tongran-modules/tongran-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/tongran-modules/tongran-gen/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml rename to tongran-modules/tongran-gen/src/main/resources/mapper/generator/GenTableMapper.xml index 3daf21e..b4a13f8 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/tongran-modules/tongran-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/tongran-modules/tongran-gen/src/main/resources/vm/java/controller.java.vm similarity index 90% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/java/controller.java.vm index e5fe3b5..2fdf599 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm +++ b/tongran-modules/tongran-gen/src/main/resources/vm/java/controller.java.vm @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; +import annotation.com.tongran.common.log.Log; +import enums.com.tongran.common.log.BusinessType; +import annotation.com.tongran.common.security.RequiresPermissions; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.core.web.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/tongran-modules/tongran-gen/src/main/resources/vm/java/domain.java.vm similarity index 94% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/java/domain.java.vm index 1142830..dc4ac2b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm +++ b/tongran-modules/tongran-gen/src/main/resources/vm/java/domain.java.vm @@ -5,11 +5,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.web.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.web.domain.TreeEntity; +import com.tongran.common.core.web.domain.TreeEntity; #end /** diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/tongran-modules/tongran-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/tongran-modules/tongran-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/tongran-modules/tongran-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 97% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/java/serviceImpl.java.vm index d590b92..84a8790 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/tongran-modules/tongran-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; #break #end #end @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm b/tongran-modules/tongran-gen/src/main/resources/vm/java/sub-domain.java.vm similarity index 95% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/java/sub-domain.java.vm index 2e039ff..925ede9 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm +++ b/tongran-modules/tongran-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -5,8 +5,8 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/js/api.js.vm b/tongran-modules/tongran-gen/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/js/api.js.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm b/tongran-modules/tongran-gen/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/tongran-modules/tongran-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/tongran-modules/tongran-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/tongran-modules/tongran-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm b/tongran-modules/tongran-gen/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/tongran-modules/tongran-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm rename to tongran-modules/tongran-gen/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/tongran-modules/tongran-job/pom.xml similarity index 84% rename from ruoyi-modules/ruoyi-job/pom.xml rename to tongran-modules/tongran-job/pom.xml index 245d54d..aa5083b 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/tongran-modules/tongran-job/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-modules + com.tongran + tongran-modules 3.6.6 4.0.0 - ruoyi-modules-job + tongran-modules-job - ruoyi-modules-job定时任务 + tongran-modules-job定时任务 @@ -59,16 +59,16 @@ mysql-connector-j - + - com.ruoyi - ruoyi-common-log + com.tongran + tongran-common-log - + - com.ruoyi - ruoyi-common-swagger + com.tongran + tongran-common-swagger diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/TongRanJobApplication.java similarity index 76% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/TongRanJobApplication.java index 0810b54..2648ee7 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/TongRanJobApplication.java @@ -1,23 +1,23 @@ -package com.ruoyi.job; +package com.tongran.job; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.tongran.common.security.annotation.EnableCustomConfig; +import com.tongran.common.security.annotation.EnableRyFeignClients; /** * 定时任务 * - * @author ruoyi + * @author tongran */ @EnableCustomConfig @EnableRyFeignClients @SpringBootApplication -public class RuoYiJobApplication +public class TongRanJobApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiJobApplication.class, args); + SpringApplication.run(TongRanJobApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 定时任务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/config/ScheduleConfig.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/config/ScheduleConfig.java index 912aadc..a5d3451 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.ruoyi.job.config; +//package com.tongran.job.config; // //import java.util.Properties; //import javax.sql.DataSource; @@ -9,7 +9,7 @@ ///** // * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效） // * -// * @author ruoyi +// * @author tongran // */ //@Configuration //public class ScheduleConfig diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/controller/SysJobController.java similarity index 88% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/controller/SysJobController.java index 6300efd..ed26296 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.controller; +package com.tongran.job.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,26 +12,26 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.service.ISysJobService; -import com.ruoyi.job.util.CronUtils; -import com.ruoyi.job.util.ScheduleUtils; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.exception.job.TaskException; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.job.domain.SysJob; +import com.tongran.job.service.ISysJobService; +import com.tongran.job.util.CronUtils; +import com.tongran.job.util.ScheduleUtils; /** * 调度任务信息操作处理 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/job") diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/controller/SysJobLogController.java similarity index 82% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/controller/SysJobLogController.java index caf7451..43a26f5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.controller; +package com.tongran.job.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -9,20 +9,20 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.job.domain.SysJobLog; -import com.ruoyi.job.service.ISysJobLogService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.job.domain.SysJobLog; +import com.tongran.job.service.ISysJobLogService; /** * 调度日志操作处理 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/job/log") diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/domain/SysJob.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/domain/SysJob.java index dd630ba..9a2b852 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.domain; +package com.tongran.job.domain; import java.util.Date; import javax.validation.constraints.NotBlank; @@ -6,17 +6,17 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.job.util.CronUtils; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.constant.ScheduleConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.domain.BaseEntity; +import com.tongran.job.util.CronUtils; /** * 定时任务调度表 sys_job * - * @author ruoyi + * @author tongran */ public class SysJob extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/domain/SysJobLog.java similarity index 95% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/domain/SysJobLog.java index 6c2c7ed..09be251 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/domain/SysJobLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.job.domain; +package com.tongran.job.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log * - * @author ruoyi + * @author tongran */ public class SysJobLog extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/mapper/SysJobLogMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/mapper/SysJobLogMapper.java index 80f0716..c09502b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/mapper/SysJobLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.job.mapper; +package com.tongran.job.mapper; import java.util.List; -import com.ruoyi.job.domain.SysJobLog; +import com.tongran.job.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @author ruoyi + * @author tongran */ public interface SysJobLogMapper { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/mapper/SysJobMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/mapper/SysJobMapper.java index d7e499e..dfcd6eb 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/mapper/SysJobMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.job.mapper; +package com.tongran.job.mapper; import java.util.List; -import com.ruoyi.job.domain.SysJob; +import com.tongran.job.domain.SysJob; /** * 调度任务信息 数据层 * - * @author ruoyi + * @author tongran */ public interface SysJobMapper { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/ISysJobLogService.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/service/ISysJobLogService.java index 75b3dc5..7a8d376 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/ISysJobLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.job.service; +package com.tongran.job.service; import java.util.List; -import com.ruoyi.job.domain.SysJobLog; +import com.tongran.job.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysJobLogService { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/ISysJobService.java similarity index 93% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/service/ISysJobService.java index 5270b34..5fa6391 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/ISysJobService.java @@ -1,14 +1,14 @@ -package com.ruoyi.job.service; +package com.tongran.job.service; import java.util.List; import org.quartz.SchedulerException; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.job.domain.SysJob; +import com.tongran.common.core.exception.job.TaskException; +import com.tongran.job.domain.SysJob; /** * 定时任务调度信息信息 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysJobService { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/SysJobLogServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/service/SysJobLogServiceImpl.java index 41bdcca..0404197 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/SysJobLogServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.job.service; +package com.tongran.job.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.job.domain.SysJobLog; -import com.ruoyi.job.mapper.SysJobLogMapper; +import com.tongran.job.domain.SysJobLog; +import com.tongran.job.mapper.SysJobLogMapper; /** * 定时任务调度日志信息 服务层 * - * @author ruoyi + * @author tongran */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/SysJobServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/service/SysJobServiceImpl.java index 8936b9c..cdc3190 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/service/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.service; +package com.tongran.job.service; import java.util.List; import javax.annotation.PostConstruct; @@ -9,17 +9,17 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.mapper.SysJobMapper; -import com.ruoyi.job.util.CronUtils; -import com.ruoyi.job.util.ScheduleUtils; +import com.tongran.common.core.constant.ScheduleConstants; +import com.tongran.common.core.exception.job.TaskException; +import com.tongran.job.domain.SysJob; +import com.tongran.job.mapper.SysJobMapper; +import com.tongran.job.util.CronUtils; +import com.tongran.job.util.ScheduleUtils; /** * 定时任务调度信息 服务层 * - * @author ruoyi + * @author tongran */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/task/RyTask.java similarity index 85% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/task/RyTask.java index 3a127ef..efed4ef 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/task/RyTask.java @@ -1,12 +1,12 @@ -package com.ruoyi.job.task; +package com.tongran.job.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 定时任务调度测试 * - * @author ruoyi + * @author tongran */ @Component("ryTask") public class RyTask diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/AbstractQuartzJob.java similarity index 86% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/util/AbstractQuartzJob.java index a2d5453..5b8bbb1 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/AbstractQuartzJob.java @@ -1,23 +1,23 @@ -package com.ruoyi.job.util; +package com.tongran.job.util; import java.util.Date; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.utils.ExceptionUtil; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.bean.BeanUtils; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.domain.SysJobLog; -import com.ruoyi.job.service.ISysJobLogService; +import com.tongran.common.core.constant.ScheduleConstants; +import com.tongran.common.core.utils.ExceptionUtil; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.bean.BeanUtils; +import com.tongran.job.domain.SysJob; +import com.tongran.job.domain.SysJobLog; +import com.tongran.job.service.ISysJobLogService; /** * 抽象quartz调用 * - * @author ruoyi + * @author tongran */ public abstract class AbstractQuartzJob implements Job { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/CronUtils.java similarity index 96% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/util/CronUtils.java index 9fc6c9f..c1966fc 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.util; +package com.tongran.job.util; import java.text.ParseException; import java.util.Date; @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron表达式工具类 * - * @author ruoyi + * @author tongran * */ public class CronUtils diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/JobInvokeUtil.java similarity index 96% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/util/JobInvokeUtil.java index 5848b2a..af819d6 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/JobInvokeUtil.java @@ -1,17 +1,17 @@ -package com.ruoyi.job.util; +package com.tongran.job.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.job.domain.SysJob; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.job.domain.SysJob; /** * 任务执行工具 * - * @author ruoyi + * @author tongran */ public class JobInvokeUtil { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/QuartzDisallowConcurrentExecution.java similarity index 82% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/util/QuartzDisallowConcurrentExecution.java index 325bd93..56c8d12 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/QuartzDisallowConcurrentExecution.java @@ -1,14 +1,14 @@ -package com.ruoyi.job.util; +package com.tongran.job.util; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.job.domain.SysJob; +import com.tongran.job.domain.SysJob; /** * 定时任务处理（禁止并发执行） * - * @author ruoyi + * @author tongran * */ @DisallowConcurrentExecution diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/QuartzJobExecution.java similarity index 78% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/util/QuartzJobExecution.java index bab4ee9..db40378 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/QuartzJobExecution.java @@ -1,13 +1,13 @@ -package com.ruoyi.job.util; +package com.tongran.job.util; import org.quartz.JobExecutionContext; -import com.ruoyi.job.domain.SysJob; +import com.tongran.job.domain.SysJob; /** * 定时任务处理（允许并发执行） * - * @author ruoyi + * @author tongran * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/ScheduleUtils.java similarity index 91% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java rename to tongran-modules/tongran-job/src/main/java/com/tongran/job/util/ScheduleUtils.java index 6d6e584..eed0e91 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java +++ b/tongran-modules/tongran-job/src/main/java/com/tongran/job/util/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.util; +package com.tongran.job.util; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,18 +10,18 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.common.core.exception.job.TaskException.Code; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.job.domain.SysJob; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.constant.ScheduleConstants; +import com.tongran.common.core.exception.job.TaskException; +import com.tongran.common.core.exception.job.TaskException.Code; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.job.domain.SysJob; /** * 定时任务工具类 * - * @author ruoyi + * @author tongran * */ public class ScheduleUtils diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/banner.txt b/tongran-modules/tongran-job/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/resources/banner.txt rename to tongran-modules/tongran-job/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/tongran-modules/tongran-job/src/main/resources/bootstrap.yml similarity index 96% rename from ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml rename to tongran-modules/tongran-job/src/main/resources/bootstrap.yml index d9ca211..458bd69 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/tongran-modules/tongran-job/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-job + name: tongran-job profiles: # 环境配置 active: dev diff --git a/ruoyi-auth/src/main/resources/logback.xml b/tongran-modules/tongran-job/src/main/resources/logback.xml similarity index 96% rename from ruoyi-auth/src/main/resources/logback.xml rename to tongran-modules/tongran-job/src/main/resources/logback.xml index 098a610..347eba2 100644 --- a/ruoyi-auth/src/main/resources/logback.xml +++ b/tongran-modules/tongran-job/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/tongran-modules/tongran-job/src/main/resources/mapper/job/SysJobLogMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml rename to tongran-modules/tongran-job/src/main/resources/mapper/job/SysJobLogMapper.xml index ffcd9a7..6eed8c5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/tongran-modules/tongran-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml b/tongran-modules/tongran-job/src/main/resources/mapper/job/SysJobMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml rename to tongran-modules/tongran-job/src/main/resources/mapper/job/SysJobMapper.xml index a0b0ce8..7e93acc 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/tongran-modules/tongran-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/pom.xml b/tongran-modules/tongran-mtragent/pom.xml similarity index 83% rename from ruoyi-modules/ruoyi-mtragent/pom.xml rename to tongran-modules/tongran-mtragent/pom.xml index b9ad8ff..3e000f0 100644 --- a/ruoyi-modules/ruoyi-mtragent/pom.xml +++ b/tongran-modules/tongran-mtragent/pom.xml @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi-modules + com.tongran + tongran-modules 3.6.6 - ruoyi-modules-mtragent + tongran-modules-mtragent @@ -62,22 +62,22 @@ mysql-connector-j - + - com.ruoyi - ruoyi-common-log + com.tongran + tongran-common-log - + - com.ruoyi - ruoyi-common-swagger + com.tongran + tongran-common-swagger - com.ruoyi - ruoyi-common-security + com.tongran + tongran-common-security org.projectlombok diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/RuoYiMtragentApplication.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/TongRanMtragentApplication.java similarity index 61% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/RuoYiMtragentApplication.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/TongRanMtragentApplication.java index d14b928..f67aa9a 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/RuoYiMtragentApplication.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/TongRanMtragentApplication.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent; +package com.tongran.mtragent; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.tongran.common.security.annotation.EnableCustomConfig; +import com.tongran.common.security.annotation.EnableRyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; @@ -9,17 +9,17 @@ import org.springframework.scheduling.annotation.EnableAsync; /** * 平台管理模块 * - * @author ruoyi + * @author tongran */ @EnableCustomConfig @EnableRyFeignClients @SpringBootApplication @EnableAsync -public class RuoYiMtragentApplication +public class TongRanMtragentApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiMtragentApplication.class, args); + SpringApplication.run(TongRanMtragentApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ RuoYiMtragent模块启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/config/ConsumerConfig.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/config/ConsumerConfig.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/config/ConsumerConfig.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/config/ConsumerConfig.java index 481fb7f..6322f6d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/config/ConsumerConfig.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/config/ConsumerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.config; +package com.tongran.mtragent.config; -import com.ruoyi.rocketmq.consumer.RocketMsgListener; -import com.ruoyi.rocketmq.enums.MessageTopic; -import com.ruoyi.rocketmq.model.ConsumerMode; +import com.tongran.mtragent.consumer.RocketMsgListener; +import com.tongran.mtragent.enums.MessageTopic; +import com.tongran.mtragent.model.ConsumerMode; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.exception.MQClientException; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/config/ProducerConfig.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/config/ProducerConfig.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/config/ProducerConfig.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/config/ProducerConfig.java index 89983bc..91c4a5c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/config/ProducerConfig.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/config/ProducerConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.config; +package com.tongran.mtragent.config; -import com.ruoyi.rocketmq.model.ProducerMode; +import com.tongran.mtragent.model.ProducerMode; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.DefaultMQProducer; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/consumer/RocketMsgListener.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/consumer/RocketMsgListener.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/consumer/RocketMsgListener.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/consumer/RocketMsgListener.java index 6c8c95c..558d9eb 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/consumer/RocketMsgListener.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/consumer/RocketMsgListener.java @@ -1,10 +1,10 @@ -package com.ruoyi.mtragent.consumer; +package com.tongran.mtragent.consumer; import com.alibaba.fastjson.JSON; -import com.ruoyi.mtragent.domain.DeviceMessage; -import com.ruoyi.mtragent.enums.MessageCodeEnum; -import com.ruoyi.mtragent.handler.MessageHandler; -import com.ruoyi.mtragent.producer.ConsumeException; +import com.tongran.mtragent.domain.DeviceMessage; +import com.tongran.mtragent.enums.MessageCodeEnum; +import com.tongran.mtragent.handler.MessageHandler; +import com.tongran.mtragent.producer.ConsumeException; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgTransactionListenerImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/consumer/RocketMsgTransactionListenerImpl.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgTransactionListenerImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/consumer/RocketMsgTransactionListenerImpl.java index b2399b9..fb8379b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgTransactionListenerImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/consumer/RocketMsgTransactionListenerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.consumer; +package com.tongran.mtragent.consumer; import org.apache.rocketmq.client.producer.LocalTransactionState; import org.apache.rocketmq.client.producer.TransactionListener; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/AllMtrClientController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java similarity index 86% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/AllMtrClientController.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java index 89583e1..fdb2c72 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/AllMtrClientController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.controller; +package com.tongran.mtragent.controller; import java.util.List; import java.io.IOException; @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.mtragent.domain.AllMtrClient; -import com.ruoyi.mtragent.service.IAllMtrClientService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.service.IAllMtrClientService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * mtr探测丢包clinetId记录Controller diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrClientRegistrationController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java similarity index 87% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrClientRegistrationController.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java index 7604a9f..33bfe9d 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrClientRegistrationController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java @@ -1,16 +1,16 @@ -package com.ruoyi.mtragent.controller; +package com.tongran.mtragent.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.mtragent.domain.AllMtrClient; -import com.ruoyi.mtragent.domain.RmMtrClientRegistration; -import com.ruoyi.mtragent.service.IRmMtrClientRegistrationService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.domain.RmMtrClientRegistration; +import com.tongran.mtragent.service.IRmMtrClientRegistrationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrPolicyConfigController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java similarity index 84% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrPolicyConfigController.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java index cb4616a..82d804f 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrPolicyConfigController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java @@ -1,15 +1,15 @@ -package com.ruoyi.mtragent.controller; +package com.tongran.mtragent.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.mtragent.domain.RmMtrPolicyConfig; -import com.ruoyi.mtragent.service.IRmMtrPolicyConfigService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.mtragent.domain.RmMtrPolicyConfig; +import com.tongran.mtragent.service.IRmMtrPolicyConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrProbeResultController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java similarity index 85% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrProbeResultController.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java index 4f2725e..3e3b3a3 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RmMtrProbeResultController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java @@ -1,14 +1,14 @@ -package com.ruoyi.mtragent.controller; +package com.tongran.mtragent.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.mtragent.domain.RmMtrProbeResult; -import com.ruoyi.mtragent.service.IRmMtrProbeResultService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.mtragent.domain.RmMtrProbeResult; +import com.tongran.mtragent.service.IRmMtrProbeResultService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RocketMqController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RocketMqController.java similarity index 97% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RocketMqController.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RocketMqController.java index 4de796b..76c6f6c 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/controller/RocketMqController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RocketMqController.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.controller; +package com.tongran.mtragent.controller; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.mtragent.producer.MessageProducer; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.mtragent.producer.MessageProducer; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.Message; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/AllMtrClient.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/AllMtrClient.java similarity index 92% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/AllMtrClient.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/AllMtrClient.java index 71b6407..124867e 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/AllMtrClient.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/AllMtrClient.java @@ -1,9 +1,9 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.mtragent.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * mtr探测丢包clinetId记录对象 all_mtr_client diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/DeviceMessage.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/DeviceMessage.java similarity index 79% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/DeviceMessage.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/DeviceMessage.java index 3c02c6c..e2cf556 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/DeviceMessage.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/DeviceMessage.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.mtragent.domain; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialHeartbeatListen.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/InitialHeartbeatListen.java similarity index 83% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialHeartbeatListen.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/InitialHeartbeatListen.java index b920aee..b527d40 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialHeartbeatListen.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/InitialHeartbeatListen.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.mtragent.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialHeartbeatListenLog.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/InitialHeartbeatListenLog.java similarity index 77% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialHeartbeatListenLog.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/InitialHeartbeatListenLog.java index 68dc6be..dd1da93 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialHeartbeatListenLog.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/InitialHeartbeatListenLog.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.mtragent.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/NetworkInfoDeserializer.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/NetworkInfoDeserializer.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/NetworkInfoDeserializer.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/NetworkInfoDeserializer.java index 349e6b2..a4cf002 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/NetworkInfoDeserializer.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/NetworkInfoDeserializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.mtragent.domain; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.system.api.domain.NetworkInfo; +import com.tongran.system.api.domain.NetworkInfo; import java.io.IOException; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAgentManagement.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAgentManagement.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAgentManagement.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAgentManagement.java index d3355c9..4abac57 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAgentManagement.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAgentManagement.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.mtragent.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmLog.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAlarmLog.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmLog.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAlarmLog.java index b16b844..d7ad306 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmLog.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAlarmLog.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.mtragent.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAlarmPushConfig.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAlarmPushConfig.java similarity index 86% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAlarmPushConfig.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAlarmPushConfig.java index 15b1015..572d424 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAlarmPushConfig.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmAlarmPushConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.mtragent.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrClientRegistration.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrClientRegistration.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrClientRegistration.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrClientRegistration.java index c84bd3b..e8217e9 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrClientRegistration.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrClientRegistration.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.mtragent.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrPolicyConfig.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrPolicyConfig.java similarity index 91% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrPolicyConfig.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrPolicyConfig.java index 0990bd9..7527749 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrPolicyConfig.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrPolicyConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.mtragent.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrProbeResult.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrProbeResult.java similarity index 86% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrProbeResult.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrProbeResult.java index f7883cd..b7ce32b 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmMtrProbeResult.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmMtrProbeResult.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.mtragent.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmNetworkInterface.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmNetworkInterface.java similarity index 89% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmNetworkInterface.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmNetworkInterface.java index edda238..bde0064 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmNetworkInterface.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/RmNetworkInterface.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.mtragent.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/AgentUpdateMsgVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/AgentUpdateMsgVo.java similarity index 90% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/AgentUpdateMsgVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/AgentUpdateMsgVo.java index 8a99b61..1ad9ee1 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/AgentUpdateMsgVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/AgentUpdateMsgVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.mtragent.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/MessageVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/MessageVo.java similarity index 77% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/MessageVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/MessageVo.java index 7052f02..f92442d 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/MessageVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/MessageVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.mtragent.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/MtrResultVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/MtrResultVo.java similarity index 92% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/MtrResultVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/MtrResultVo.java index 83cab55..45e6737 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/MtrResultVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/MtrResultVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.mtragent.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/PolicyTypeVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/PolicyTypeVo.java similarity index 92% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/PolicyTypeVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/PolicyTypeVo.java index 12131af..cb70941 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/PolicyTypeVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/PolicyTypeVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.mtragent.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/PolicyVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/PolicyVo.java similarity index 86% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/PolicyVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/PolicyVo.java index 1901461..94cc02f 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/PolicyVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/PolicyVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.mtragent.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterMsgVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/RegisterMsgVo.java similarity index 77% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterMsgVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/RegisterMsgVo.java index f00a980..3fab068 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterMsgVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/RegisterMsgVo.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.mtragent.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.ruoyi.rocketmq.domain.NetworkInfoDeserializer; -import com.ruoyi.system.api.domain.NetworkInfo; +import com.tongran.mtragent.domain.NetworkInfoDeserializer; +import com.tongran.system.api.domain.NetworkInfo; import lombok.Data; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RspVo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/RspVo.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RspVo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/RspVo.java index 54f4d30..0e76fa1 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RspVo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/domain/vo/RspVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.mtragent.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/AlarmTypeEnum.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/AlarmTypeEnum.java similarity index 90% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/AlarmTypeEnum.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/AlarmTypeEnum.java index 367ed3c..27e3e61 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/AlarmTypeEnum.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/AlarmTypeEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.enums; +package com.tongran.mtragent.enums; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/MessageCodeEnum.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/MessageCodeEnum.java similarity index 97% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/MessageCodeEnum.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/MessageCodeEnum.java index 778e120..feb0e6c 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/MessageCodeEnum.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/MessageCodeEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.enums; +package com.tongran.mtragent.enums; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/MessageTopic.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/MessageTopic.java similarity index 91% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/MessageTopic.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/MessageTopic.java index 74c7b2b..871a063 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/MessageTopic.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/MessageTopic.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.enums; +package com.tongran.mtragent.enums; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/PushMethodEnum.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/PushMethodEnum.java similarity index 88% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/PushMethodEnum.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/PushMethodEnum.java index e01f246..1e4da03 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/PushMethodEnum.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/PushMethodEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.enums; +package com.tongran.mtragent.enums; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/ServerLogoEnum.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/ServerLogoEnum.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/ServerLogoEnum.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/ServerLogoEnum.java index 8e18b74..31ff8c1 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/ServerLogoEnum.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/ServerLogoEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.enums; +package com.tongran.mtragent.enums; import lombok.Getter; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/SwitchLogo.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/SwitchLogo.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/SwitchLogo.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/SwitchLogo.java index 64b1937..10d9206 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/SwitchLogo.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/enums/SwitchLogo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.enums; +package com.tongran.mtragent.enums; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/handler/MessageHandler.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/handler/MessageHandler.java similarity index 97% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/handler/MessageHandler.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/handler/MessageHandler.java index 23e47d9..8845441 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/handler/MessageHandler.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/handler/MessageHandler.java @@ -1,19 +1,19 @@ -package com.ruoyi.mtragent.handler; +package com.tongran.mtragent.handler; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.mtragent.domain.*; -import com.ruoyi.mtragent.domain.vo.*; -import com.ruoyi.mtragent.enums.AlarmTypeEnum; -import com.ruoyi.mtragent.enums.PushMethodEnum; -import com.ruoyi.mtragent.model.ProducerMode; -import com.ruoyi.mtragent.producer.MessageProducer; -import com.ruoyi.mtragent.service.*; -import com.ruoyi.mtragent.utils.JsonDataParser; -import com.ruoyi.mtragent.utils.WeChatWorkBot; -import com.ruoyi.system.api.domain.NetworkInfo; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.mtragent.domain.*; +import com.tongran.mtragent.domain.vo.*; +import com.tongran.mtragent.enums.AlarmTypeEnum; +import com.tongran.mtragent.enums.PushMethodEnum; +import com.tongran.mtragent.model.ProducerMode; +import com.tongran.mtragent.producer.MessageProducer; +import com.tongran.mtragent.service.*; +import com.tongran.mtragent.utils.JsonDataParser; +import com.tongran.mtragent.utils.WeChatWorkBot; +import com.tongran.system.api.domain.NetworkInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/AllMtrClientMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/AllMtrClientMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/AllMtrClientMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/AllMtrClientMapper.java index a4f8f24..d3ad4b0 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/AllMtrClientMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/AllMtrClientMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.domain.AllMtrClient; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/InitialHeartbeatListenLogMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/InitialHeartbeatListenLogMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/InitialHeartbeatListenLogMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/InitialHeartbeatListenLogMapper.java index 3c0746f..2ba66e7 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/InitialHeartbeatListenLogMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/InitialHeartbeatListenLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.InitialHeartbeatListenLog; +import com.tongran.mtragent.domain.InitialHeartbeatListenLog; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAgentManagementMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAgentManagementMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAgentManagementMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAgentManagementMapper.java index 6238a68..35a451f 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAgentManagementMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAgentManagementMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.RmAgentManagement; +import com.tongran.mtragent.domain.RmAgentManagement; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAlarmLogMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAlarmLogMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAlarmLogMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAlarmLogMapper.java index 9342763..69f18bd 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAlarmLogMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAlarmLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.RmAlarmLog; +import com.tongran.mtragent.domain.RmAlarmLog; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAlarmPushConfigMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAlarmPushConfigMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAlarmPushConfigMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAlarmPushConfigMapper.java index 32d45bc..4535507 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmAlarmPushConfigMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmAlarmPushConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.RmAlarmPushConfig; +import com.tongran.mtragent.domain.RmAlarmPushConfig; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrClientRegistrationMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrClientRegistrationMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrClientRegistrationMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrClientRegistrationMapper.java index f80fb82..e5864ae 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrClientRegistrationMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrClientRegistrationMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.RmMtrClientRegistration; +import com.tongran.mtragent.domain.RmMtrClientRegistration; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrPolicyConfigMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrPolicyConfigMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrPolicyConfigMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrPolicyConfigMapper.java index 47e8b3d..b0093f6 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrPolicyConfigMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrPolicyConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; import java.util.List; -import com.ruoyi.mtragent.domain.RmMtrPolicyConfig; +import com.tongran.mtragent.domain.RmMtrPolicyConfig; /** * mtr探测策略配置Mapper接口 diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrProbeResultMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrProbeResultMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrProbeResultMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrProbeResultMapper.java index aa86adf..74a7e43 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmMtrProbeResultMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmMtrProbeResultMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.RmMtrProbeResult; +import com.tongran.mtragent.domain.RmMtrProbeResult; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmNetworkInterfaceMapper.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmNetworkInterfaceMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmNetworkInterfaceMapper.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmNetworkInterfaceMapper.java index 68feccc..f2ccb7a 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/mapper/RmNetworkInterfaceMapper.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/mapper/RmNetworkInterfaceMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.mapper; +package com.tongran.mtragent.mapper; -import com.ruoyi.mtragent.domain.RmNetworkInterface; +import com.tongran.mtragent.domain.RmNetworkInterface; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/model/ConsumerMode.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/model/ConsumerMode.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/model/ConsumerMode.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/model/ConsumerMode.java index 3bc8ff1..80f0cf1 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/model/ConsumerMode.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/model/ConsumerMode.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.model; +package com.tongran.mtragent.model; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/model/ProducerMode.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/model/ProducerMode.java similarity index 96% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/model/ProducerMode.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/model/ProducerMode.java index 452ce0b..be3169d 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/model/ProducerMode.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/model/ProducerMode.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.model; +package com.tongran.mtragent.model; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/producer/ConsumeException.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/producer/ConsumeException.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/producer/ConsumeException.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/producer/ConsumeException.java index 825f900..3cf7c45 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/producer/ConsumeException.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/producer/ConsumeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.producer; +package com.tongran.mtragent.producer; /** * @author 影子 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/producer/MessageProducer.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/producer/MessageProducer.java similarity index 98% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/producer/MessageProducer.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/producer/MessageProducer.java index 5b6882b..f29ad96 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/producer/MessageProducer.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/producer/MessageProducer.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.producer; +package com.tongran.mtragent.producer; import com.alibaba.fastjson.JSON; -import com.ruoyi.rocketmq.consumer.RocketMsgTransactionListenerImpl; +import com.tongran.mtragent.consumer.RocketMsgTransactionListenerImpl; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; @@ -19,7 +19,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import static com.ruoyi.rocketmq.config.ProducerConfig.producer; +import static com.tongran.mtragent.config.ProducerConfig.producer; + /** * 消息发送 diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IAllMtrClientService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IAllMtrClientService.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IAllMtrClientService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IAllMtrClientService.java index 7f01ca5..757056f 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IAllMtrClientService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IAllMtrClientService.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.domain.AllMtrClient; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IInitialHeartbeatListenLogService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IInitialHeartbeatListenLogService.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IInitialHeartbeatListenLogService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IInitialHeartbeatListenLogService.java index a84a374..0ce9d5a 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IInitialHeartbeatListenLogService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IInitialHeartbeatListenLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.InitialHeartbeatListenLog; +import com.tongran.mtragent.domain.InitialHeartbeatListenLog; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAgentManagementService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAgentManagementService.java similarity index 92% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAgentManagementService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAgentManagementService.java index 57010ae..f0e2795 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAgentManagementService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAgentManagementService.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.RmAgentManagement; +import com.tongran.mtragent.domain.RmAgentManagement; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAlarmLogService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAlarmLogService.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAlarmLogService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAlarmLogService.java index b6e3a18..145c8d6 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAlarmLogService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAlarmLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.RmAlarmLog; +import com.tongran.mtragent.domain.RmAlarmLog; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAlarmPushConfigService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAlarmPushConfigService.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAlarmPushConfigService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAlarmPushConfigService.java index 2db1c80..053928a 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmAlarmPushConfigService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmAlarmPushConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.RmAlarmPushConfig; +import com.tongran.mtragent.domain.RmAlarmPushConfig; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrClientRegistrationService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrClientRegistrationService.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrClientRegistrationService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrClientRegistrationService.java index 5a5a5b4..4e71ab1 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrClientRegistrationService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrClientRegistrationService.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.AllMtrClient; -import com.ruoyi.mtragent.domain.RmMtrClientRegistration; +import com.tongran.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.domain.RmMtrClientRegistration; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrPolicyConfigService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrPolicyConfigService.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrPolicyConfigService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrPolicyConfigService.java index ea4b22f..79d7fc3 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrPolicyConfigService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrPolicyConfigService.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.RmMtrPolicyConfig; +import com.tongran.mtragent.domain.RmMtrPolicyConfig; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrProbeResultService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrProbeResultService.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrProbeResultService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrProbeResultService.java index 3dbc79c..1ee3cab 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmMtrProbeResultService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmMtrProbeResultService.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.RmMtrProbeResult; +import com.tongran.mtragent.domain.RmMtrProbeResult; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmNetworkInterfaceService.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmNetworkInterfaceService.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmNetworkInterfaceService.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmNetworkInterfaceService.java index 08d60f9..8429c4c 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/IRmNetworkInterfaceService.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/IRmNetworkInterfaceService.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.service; +package com.tongran.mtragent.service; -import com.ruoyi.mtragent.domain.RmNetworkInterface; +import com.tongran.mtragent.domain.RmNetworkInterface; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/AllMtrClientServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/AllMtrClientServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/AllMtrClientServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/AllMtrClientServiceImpl.java index 6bd5259..f8c183b 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/AllMtrClientServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/AllMtrClientServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.AllMtrClient; -import com.ruoyi.mtragent.mapper.AllMtrClientMapper; -import com.ruoyi.mtragent.service.IAllMtrClientService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.mapper.AllMtrClientMapper; +import com.tongran.mtragent.service.IAllMtrClientService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/InitialHeartbeatListenLogServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/InitialHeartbeatListenLogServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/InitialHeartbeatListenLogServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/InitialHeartbeatListenLogServiceImpl.java index 86287cc..2b9f1fd 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/InitialHeartbeatListenLogServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/InitialHeartbeatListenLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.InitialHeartbeatListenLog; -import com.ruoyi.mtragent.mapper.InitialHeartbeatListenLogMapper; -import com.ruoyi.mtragent.service.IInitialHeartbeatListenLogService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.InitialHeartbeatListenLog; +import com.tongran.mtragent.mapper.InitialHeartbeatListenLogMapper; +import com.tongran.mtragent.service.IInitialHeartbeatListenLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAgentManagementServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAgentManagementServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAgentManagementServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAgentManagementServiceImpl.java index 6b916c5..8d50b35 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAgentManagementServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAgentManagementServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.DeviceMessage; -import com.ruoyi.mtragent.domain.RmAgentManagement; -import com.ruoyi.mtragent.domain.vo.AgentUpdateMsgVo; -import com.ruoyi.mtragent.domain.vo.PolicyTypeVo; -import com.ruoyi.mtragent.domain.vo.PolicyVo; -import com.ruoyi.mtragent.mapper.RmAgentManagementMapper; -import com.ruoyi.mtragent.model.ProducerMode; -import com.ruoyi.mtragent.producer.MessageProducer; -import com.ruoyi.mtragent.service.IRmAgentManagementService; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.DeviceMessage; +import com.tongran.mtragent.domain.RmAgentManagement; +import com.tongran.mtragent.domain.vo.AgentUpdateMsgVo; +import com.tongran.mtragent.domain.vo.PolicyTypeVo; +import com.tongran.mtragent.domain.vo.PolicyVo; +import com.tongran.mtragent.mapper.RmAgentManagementMapper; +import com.tongran.mtragent.model.ProducerMode; +import com.tongran.mtragent.producer.MessageProducer; +import com.tongran.mtragent.service.IRmAgentManagementService; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAlarmLogServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAlarmLogServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAlarmLogServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAlarmLogServiceImpl.java index 0411ac1..d24ba92 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAlarmLogServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAlarmLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.RmAlarmLog; -import com.ruoyi.mtragent.mapper.RmAlarmLogMapper; -import com.ruoyi.mtragent.service.IRmAlarmLogService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.RmAlarmLog; +import com.tongran.mtragent.mapper.RmAlarmLogMapper; +import com.tongran.mtragent.service.IRmAlarmLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAlarmPushConfigServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAlarmPushConfigServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAlarmPushConfigServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAlarmPushConfigServiceImpl.java index 2a112ae..a9d0ccf 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmAlarmPushConfigServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmAlarmPushConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.RmAlarmPushConfig; -import com.ruoyi.mtragent.mapper.RmAlarmPushConfigMapper; -import com.ruoyi.mtragent.service.IRmAlarmPushConfigService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.RmAlarmPushConfig; +import com.tongran.mtragent.mapper.RmAlarmPushConfigMapper; +import com.tongran.mtragent.service.IRmAlarmPushConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrClientRegistrationServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrClientRegistrationServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrClientRegistrationServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrClientRegistrationServiceImpl.java index 04d7278..434160f 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrClientRegistrationServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrClientRegistrationServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.AllMtrClient; -import com.ruoyi.mtragent.domain.DeviceMessage; -import com.ruoyi.mtragent.domain.RmMtrClientRegistration; -import com.ruoyi.mtragent.domain.vo.AgentUpdateMsgVo; -import com.ruoyi.mtragent.domain.vo.PolicyTypeVo; -import com.ruoyi.mtragent.domain.vo.PolicyVo; -import com.ruoyi.mtragent.mapper.AllMtrClientMapper; -import com.ruoyi.mtragent.mapper.RmMtrClientRegistrationMapper; -import com.ruoyi.mtragent.model.ProducerMode; -import com.ruoyi.mtragent.producer.MessageProducer; -import com.ruoyi.mtragent.service.IRmMtrClientRegistrationService; -import com.ruoyi.system.api.domain.NetworkInfo; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.AllMtrClient; +import com.tongran.mtragent.domain.DeviceMessage; +import com.tongran.mtragent.domain.RmMtrClientRegistration; +import com.tongran.mtragent.domain.vo.AgentUpdateMsgVo; +import com.tongran.mtragent.domain.vo.PolicyTypeVo; +import com.tongran.mtragent.domain.vo.PolicyVo; +import com.tongran.mtragent.mapper.AllMtrClientMapper; +import com.tongran.mtragent.mapper.RmMtrClientRegistrationMapper; +import com.tongran.mtragent.model.ProducerMode; +import com.tongran.mtragent.producer.MessageProducer; +import com.tongran.mtragent.service.IRmMtrClientRegistrationService; +import com.tongran.system.api.domain.NetworkInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrPolicyConfigServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrPolicyConfigServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrPolicyConfigServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrPolicyConfigServiceImpl.java index 843fe54..ad1c0d8 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrPolicyConfigServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrPolicyConfigServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.mtragent.domain.RmMtrPolicyConfig; -import com.ruoyi.mtragent.mapper.RmMtrPolicyConfigMapper; -import com.ruoyi.mtragent.service.IRmMtrPolicyConfigService; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.mtragent.domain.RmMtrPolicyConfig; +import com.tongran.mtragent.mapper.RmMtrPolicyConfigMapper; +import com.tongran.mtragent.service.IRmMtrPolicyConfigService; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.api.domain.RmNetworkInterfaceRemote; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrProbeResultServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrProbeResultServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrProbeResultServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrProbeResultServiceImpl.java index f29be30..8c45723 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmMtrProbeResultServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmMtrProbeResultServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.TableSubUtil; -import com.ruoyi.mtragent.domain.RmMtrProbeResult; -import com.ruoyi.mtragent.mapper.RmMtrProbeResultMapper; -import com.ruoyi.mtragent.service.IRmMtrProbeResultService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.TableSubUtil; +import com.tongran.mtragent.domain.RmMtrProbeResult; +import com.tongran.mtragent.mapper.RmMtrProbeResultMapper; +import com.tongran.mtragent.service.IRmMtrProbeResultService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmNetworkInterfaceServiceImpl.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmNetworkInterfaceServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmNetworkInterfaceServiceImpl.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmNetworkInterfaceServiceImpl.java index fbd3f82..37a16df 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/service/impl/RmNetworkInterfaceServiceImpl.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/service/impl/RmNetworkInterfaceServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.mtragent.service.impl; +package com.tongran.mtragent.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.mtragent.domain.DeviceMessage; -import com.ruoyi.mtragent.domain.RmNetworkInterface; -import com.ruoyi.mtragent.domain.vo.PolicyTypeVo; -import com.ruoyi.mtragent.mapper.RmNetworkInterfaceMapper; -import com.ruoyi.mtragent.model.ProducerMode; -import com.ruoyi.mtragent.producer.MessageProducer; -import com.ruoyi.mtragent.service.IRmNetworkInterfaceService; -import com.ruoyi.system.api.domain.RouteMsg; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.mtragent.domain.DeviceMessage; +import com.tongran.mtragent.domain.RmNetworkInterface; +import com.tongran.mtragent.domain.vo.PolicyTypeVo; +import com.tongran.mtragent.mapper.RmNetworkInterfaceMapper; +import com.tongran.mtragent.model.ProducerMode; +import com.tongran.mtragent.producer.MessageProducer; +import com.tongran.mtragent.service.IRmNetworkInterfaceService; +import com.tongran.system.api.domain.RouteMsg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/JsonDataParser.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/JsonDataParser.java similarity index 97% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/JsonDataParser.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/JsonDataParser.java index dc22373..7a01b54 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/JsonDataParser.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/JsonDataParser.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.utils; +package com.tongran.mtragent.utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/SwitchJsonDataParser.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/SwitchJsonDataParser.java similarity index 99% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/SwitchJsonDataParser.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/SwitchJsonDataParser.java index 144d5ce..8b307e7 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/SwitchJsonDataParser.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/SwitchJsonDataParser.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.utils; +package com.tongran.mtragent.utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/TableRouterUtil.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/TableRouterUtil.java similarity index 98% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/TableRouterUtil.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/TableRouterUtil.java index daa710b..325fd08 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/TableRouterUtil.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/TableRouterUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.utils; +package com.tongran.mtragent.utils; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/WeChatWorkBot.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/WeChatWorkBot.java similarity index 99% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/WeChatWorkBot.java rename to tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/WeChatWorkBot.java index d489dfe..6eea755 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/WeChatWorkBot.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/utils/WeChatWorkBot.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.utils; +package com.tongran.mtragent.utils; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/bootstrap.yml b/tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml similarity index 88% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/bootstrap.yml rename to tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml index d4e822d..a503098 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/bootstrap.yml +++ b/tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-mtragent + name: tongran-mtragent profiles: # 环境配置 active: dev @@ -23,7 +23,8 @@ spring: # 配置中心地址 server-addr: 172.16.15.52:8848 # server-addr: 172.16.15.103:8848 - namespace: saas-local + namespace: public +# namespace: saas-local username: nacos password: nacos # 配置文件格式 @@ -37,7 +38,7 @@ spring: address: redis://localhost:6379 logging: level: - com.ruoyi.app.mapper: DEBUG + com.tongran.app.mapper: DEBUG diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/logback.xml b/tongran-modules/tongran-mtragent/src/main/resources/logback.xml similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/logback.xml rename to tongran-modules/tongran-mtragent/src/main/resources/logback.xml index b2f084f..ad7dc9b 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/logback.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/AllMtrClientMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/AllMtrClientMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/AllMtrClientMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/AllMtrClientMapper.xml index 6650c70..4efba6a 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/AllMtrClientMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/AllMtrClientMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/InitialHeartbeatListenLogMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/InitialHeartbeatListenLogMapper.xml similarity index 97% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/InitialHeartbeatListenLogMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/InitialHeartbeatListenLogMapper.xml index cf09b43..74752a1 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/InitialHeartbeatListenLogMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/InitialHeartbeatListenLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAgentManagementMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAgentManagementMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAgentManagementMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAgentManagementMapper.xml index 7edd267..c5e1a5c 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAgentManagementMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAgentManagementMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAlarmLogMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAlarmLogMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAlarmLogMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAlarmLogMapper.xml index 56407c7..7be6ac6 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAlarmLogMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAlarmLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAlarmPushConfigMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAlarmPushConfigMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAlarmPushConfigMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAlarmPushConfigMapper.xml index 6ac15ce..8508d49 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmAlarmPushConfigMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmAlarmPushConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrClientRegistrationMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrClientRegistrationMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrClientRegistrationMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrClientRegistrationMapper.xml index 3f64be2..4dd25bb 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrClientRegistrationMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrClientRegistrationMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrPolicyConfigMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrPolicyConfigMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrPolicyConfigMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrPolicyConfigMapper.xml index facbe60..a6d2309 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrPolicyConfigMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrPolicyConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrProbeResultMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrProbeResultMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrProbeResultMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrProbeResultMapper.xml index 97eb3d1..f6b9f4c 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmMtrProbeResultMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmMtrProbeResultMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmNetworkInterfaceMapper.xml b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmNetworkInterfaceMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmNetworkInterfaceMapper.xml rename to tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmNetworkInterfaceMapper.xml index 50b63a5..48a60fd 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/resources/mapper/mtragent/RmNetworkInterfaceMapper.xml +++ b/tongran-modules/tongran-mtragent/src/main/resources/mapper/mtragent/RmNetworkInterfaceMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-mtragent/src/test/java/com/ruoyi/mtragent/AppTest.java b/tongran-modules/tongran-mtragent/src/test/java/com/ruoyi/mtragent/AppTest.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/test/java/com/ruoyi/mtragent/AppTest.java rename to tongran-modules/tongran-mtragent/src/test/java/com/ruoyi/mtragent/AppTest.java index 3190886..cd148f6 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/test/java/com/ruoyi/mtragent/AppTest.java +++ b/tongran-modules/tongran-mtragent/src/test/java/com/ruoyi/mtragent/AppTest.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent; +package com.tongran.mtragent; import junit.framework.Test; import junit.framework.TestCase; diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/tongran-modules/tongran-system/pom.xml similarity index 75% rename from ruoyi-modules/ruoyi-system/pom.xml rename to tongran-modules/tongran-system/pom.xml index 09f9447..2d62b1d 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/tongran-modules/tongran-system/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-modules + com.tongran + tongran-modules 3.6.6 4.0.0 - ruoyi-modules-system + tongran-modules-system - ruoyi-modules-system系统模块 + tongran-modules-system系统模块 @@ -47,28 +47,28 @@ mysql-connector-j - + - com.ruoyi - ruoyi-common-datasource + com.tongran + tongran-common-datasource - + - com.ruoyi - ruoyi-common-datascope + com.tongran + tongran-common-datascope - + - com.ruoyi - ruoyi-common-log + com.tongran + tongran-common-log - + - com.ruoyi - ruoyi-common-swagger + com.tongran + tongran-common-swagger org.projectlombok diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/TongRanSystemApplication.java similarity index 76% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/TongRanSystemApplication.java index 1a7cbdf..212c2dd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/TongRanSystemApplication.java @@ -1,23 +1,23 @@ -package com.ruoyi.system; +package com.tongran.system; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.tongran.common.security.annotation.EnableCustomConfig; +import com.tongran.common.security.annotation.EnableRyFeignClients; /** * 系统模块 * - * @author ruoyi + * @author tongran */ @EnableCustomConfig @EnableRyFeignClients @SpringBootApplication -public class RuoYiSystemApplication +public class TongRanSystemApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiSystemApplication.class, args); + SpringApplication.run(TongRanSystemApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/HmacScheduledTask.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/config/HmacScheduledTask.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/HmacScheduledTask.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/config/HmacScheduledTask.java index f4b927e..254512b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/HmacScheduledTask.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/config/HmacScheduledTask.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.config; +package com.tongran.system.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.RmRegistrationMachine; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IRmRegistrationMachineService; -import com.ruoyi.system.util.TableRouterUtil; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.RmRegistrationMachine; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IRmRegistrationMachineService; +import com.tongran.system.util.TableRouterUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/TableScheduleConfig.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/config/TableScheduleConfig.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/TableScheduleConfig.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/config/TableScheduleConfig.java index fdd6386..f377e94 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/TableScheduleConfig.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/config/TableScheduleConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.config; +package com.tongran.system.config; -import com.ruoyi.system.domain.*; -import com.ruoyi.system.service.*; +import com.tongran.system.domain.*; +import com.tongran.system.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AllInterfaceNameController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AllInterfaceNameController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java index 2eb006b..c37b33e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AllInterfaceNameController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.AllInterfaceName; -import com.ruoyi.system.service.IAllInterfaceNameService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.AllInterfaceName; +import com.tongran.system.service.IAllInterfaceNameService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CalculateController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/CalculateController.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CalculateController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/CalculateController.java index 25b914a..0c9f37a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CalculateController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/CalculateController.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.InitialSwitchInfoDetails; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.InitialSwitchInfoDetails; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java index 9674ed0..12681f0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsBusiness; -import com.ruoyi.system.service.IEpsBusinessService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsBusiness; +import com.tongran.system.service.IEpsBusinessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessDeployController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessDeployController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java index bcc2873..09198d4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessDeployController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsBusinessDeploy; -import com.ruoyi.system.service.IEpsBusinessDeployService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsBusinessDeploy; +import com.tongran.system.service.IEpsBusinessDeployService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessScriptController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessScriptController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java index 6b6be95..6bbf744 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessScriptController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsBusinessScript; -import com.ruoyi.system.service.IEpsBusinessScriptService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsBusinessScript; +import com.tongran.system.service.IEpsBusinessScriptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsInitialTrafficDataController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsInitialTrafficDataController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java index 2b81a27..38509d0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsInitialTrafficDataController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.service.EpsInitialTrafficDataService; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.service.EpsInitialTrafficDataService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; -import static com.ruoyi.common.core.web.domain.AjaxResult.success; +import static com.tongran.common.core.web.domain.AjaxResult.success; /** * EPS初始流量数据控制器 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsMethodChangeRecordController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsMethodChangeRecordController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java index 503fb71..bd28281 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsMethodChangeRecordController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsMethodChangeRecord; -import com.ruoyi.system.service.IEpsMethodChangeRecordService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsMethodChangeRecord; +import com.tongran.system.service.IEpsMethodChangeRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsNodeBandwidthController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsNodeBandwidthController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java index 107271d..37de1df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsNodeBandwidthController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java @@ -1,26 +1,26 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.EpsNodeBandwidth; -import com.ruoyi.system.domain.InitialSwitchInfoDetails; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IEpsNodeBandwidthService; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; -import com.ruoyi.system.util.CalculateUtil; -import com.ruoyi.system.util.DateUtil; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.InitialSwitchInfoDetails; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IEpsNodeBandwidthService; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.system.util.CalculateUtil; +import com.tongran.system.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsServerRevenueConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsServerRevenueConfigController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java index 2fa86ac..83e5d28 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsServerRevenueConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsServerRevenueConfig; -import com.ruoyi.system.service.IEpsServerRevenueConfigService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsServerRevenueConfig; +import com.tongran.system.service.IEpsServerRevenueConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTaskStatisticsController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTaskStatisticsController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java index fecc6bc..1c2b54a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTaskStatisticsController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsTaskStatistics; -import com.ruoyi.system.service.IEpsTaskStatisticsService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsTaskStatistics; +import com.tongran.system.service.IEpsTaskStatisticsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTrafficDataController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTrafficDataController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java index ac4a4bd..d73a9e7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTrafficDataController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import java.io.IOException; @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.EpsTrafficData; -import com.ruoyi.system.service.IEpsTrafficDataService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.EpsTrafficData; +import com.tongran.system.service.IEpsTrafficDataService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 流量相关数据Controller diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/InitialSwitchInfoDetailsController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/InitialSwitchInfoDetailsController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java index 58bb7f7..8b3210a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/InitialSwitchInfoDetailsController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.InitialSwitchInfoDetails; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.InitialSwitchInfoDetails; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/KnowledgeBaseController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/KnowledgeBaseController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java index 7924e03..c2c744c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/KnowledgeBaseController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.KnowledgeBase; -import com.ruoyi.system.service.IKnowledgeBaseService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.KnowledgeBase; +import com.tongran.system.service.IKnowledgeBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MtmMonitoringTemplateController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MtmMonitoringTemplateController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java index 38f9aaa..aa88d79 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MtmMonitoringTemplateController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import java.io.IOException; @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.MtmMonitoringTemplate; -import com.ruoyi.system.service.IMtmMonitoringTemplateService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.MtmMonitoringTemplate; +import com.tongran.system.service.IMtmMonitoringTemplateService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 监控模板管理Controller diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceMonitorController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ResourceMonitorController.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceMonitorController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ResourceMonitorController.java index f95d9e1..4bc9e6b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceMonitorController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ResourceMonitorController.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.system.domain.RmResourceGroup; -import com.ruoyi.system.domain.RmResourceRegistration; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IRmResourceGroupService; -import com.ruoyi.system.service.IRmResourceRegistrationService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.system.domain.RmResourceGroup; +import com.tongran.system.domain.RmResourceRegistration; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IRmResourceGroupService; +import com.tongran.system.service.IRmResourceRegistrationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmEpsTopologyManagementController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmEpsTopologyManagementController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java index 22d2e9d..791704e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmEpsTopologyManagementController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmEpsTopologyManagement; -import com.ruoyi.system.service.IRmEpsTopologyManagementService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmEpsTopologyManagement; +import com.tongran.system.service.IRmEpsTopologyManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmMonitorConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmMonitorConfigController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java index 24a587a..af2aedf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmMonitorConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmMonitorConfig; -import com.ruoyi.system.service.IRmMonitorConfigService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmMonitorConfig; +import com.tongran.system.service.IRmMonitorConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmMonitorConfigDetailsController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java similarity index 75% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmMonitorConfigDetailsController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java index 01e9a7c..1b6bdd9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmMonitorConfigDetailsController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmMonitorConfigDetails; -import com.ruoyi.system.service.IRmMonitorConfigDetailsService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmMonitorConfigDetails; +import com.tongran.system.service.IRmMonitorConfigDetailsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmRegistrationMachineController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmRegistrationMachineController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java index baa4339..bf3dc49 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmRegistrationMachineController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import java.io.IOException; @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmRegistrationMachine; -import com.ruoyi.system.service.IRmRegistrationMachineService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmRegistrationMachine; +import com.tongran.system.service.IRmRegistrationMachineService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 绑定金山machinecodeController diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceGroupController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceGroupController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java index 2a3c4e8..b365f7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceGroupController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmResourceGroup; -import com.ruoyi.system.service.IRmResourceGroupService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmResourceGroup; +import com.tongran.system.service.IRmResourceGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java index 92089e5..a411018 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.domain.RmRegisterMsgRemote; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; -import com.ruoyi.system.domain.RmResourceRegistration; -import com.ruoyi.system.service.IRmResourceRegistrationService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.api.domain.RmRegisterMsgRemote; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.system.domain.RmResourceRegistration; +import com.tongran.system.service.IRmResourceRegistrationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchInterfaceInfoController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchInterfaceInfoController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java index c2eae81..bdbef91 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchInterfaceInfoController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import java.io.IOException; @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmSwitchInterfaceInfo; -import com.ruoyi.system.service.IRmSwitchInterfaceInfoService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmSwitchInterfaceInfo; +import com.tongran.system.service.IRmSwitchInterfaceInfoService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 交换机接口信息Controller diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java index 288e8b1..22df2fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.RmSwitchManagement; -import com.ruoyi.system.service.IRmSwitchManagementService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.RmSwitchManagement; +import com.tongran.system.service.IRmSwitchManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ScreenController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ScreenController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java index ae2e5eb..7273db6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ScreenController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.domain.RmResourceRegistration; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IEpsServerRevenueConfigService; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; -import com.ruoyi.system.service.IRmResourceRegistrationService; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.domain.RmResourceRegistration; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IEpsServerRevenueConfigService; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.system.service.IRmResourceRegistrationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysConfigController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysConfigController.java index bfa9001..28221ce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.SysConfig; +import com.tongran.system.service.ISysConfigService; /** * 参数配置 信息操作处理 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/config") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDeptController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDeptController.java index cf43c68..38b8890 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import org.apache.commons.lang3.ArrayUtils; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.service.ISysDeptService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysDept; +import com.tongran.system.service.ISysDeptService; /** * 部门信息 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/dept") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDictDataController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDictDataController.java index ef90356..64983be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.ArrayList; import java.util.List; @@ -13,23 +13,23 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysDictData; +import com.tongran.system.service.ISysDictDataService; +import com.tongran.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/dict/data") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDictTypeController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDictTypeController.java index 02b4e68..431314f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDictType; -import com.ruoyi.system.service.ISysDictTypeService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysDictType; +import com.tongran.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/dict/type") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysLogininforController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysLogininforController.java index 713043f..5a7f1f1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,23 +10,23 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.redis.service.RedisService; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.api.domain.SysLogininfor; +import com.tongran.system.service.ISysLogininforService; /** * 系统访问记录 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/logininfor") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuClickController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuClickController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java index b9cee00..7713738 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuClickController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.SysMenuClick; -import com.ruoyi.system.service.ISysMenuClickService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.SysMenuClick; +import com.tongran.system.service.ISysMenuClickService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuController.java index 6cd9f24..8a90823 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,21 +11,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.service.ISysMenuService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.SysMenu; +import com.tongran.system.service.ISysMenuService; /** * 菜单信息 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/menu") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java index 0f81b6f..0e84887 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,20 +11,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.SysNotice; +import com.tongran.system.service.ISysNoticeService; /** * 公告 信息操作处理 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/notice") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysOperlogController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysOperlogController.java index 10c8045..3ea6f1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,21 +10,21 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.api.domain.SysOperLog; +import com.tongran.system.service.ISysOperLogService; /** * 操作日志记录 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/operlog") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysPostController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysPostController.java index 36ac90c..fdb5ca4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.SysPost; +import com.tongran.system.service.ISysPostService; /** * 岗位信息操作处理 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/post") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysProfileController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysProfileController.java index 5deeb9f..91a6fb9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.Arrays; import java.util.Map; @@ -11,27 +11,27 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.MimeTypeUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.RemoteFileService; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.service.ISysUserService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.file.FileTypeUtils; +import com.tongran.common.core.utils.file.MimeTypeUtils; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.service.TokenService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.RemoteFileService; +import com.tongran.system.api.domain.SysFile; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.api.model.LoginUser; +import com.tongran.system.service.ISysUserService; /** * 个人信息 业务处理 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/user/profile") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysRoleController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysRoleController.java index ef9f015..4a91fd1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,26 +12,26 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysDept; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.domain.SysUserRole; +import com.tongran.system.service.ISysDeptService; +import com.tongran.system.service.ISysRoleService; +import com.tongran.system.service.ISysUserService; /** * 角色信息 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/role") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java index b26e516..eab2474 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.io.IOException; import java.util.Date; @@ -18,35 +18,35 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysPermissionService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.service.TokenService; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysDept; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.api.model.LoginUser; +import com.tongran.system.service.ISysConfigService; +import com.tongran.system.service.ISysDeptService; +import com.tongran.system.service.ISysPermissionService; +import com.tongran.system.service.ISysPostService; +import com.tongran.system.service.ISysRoleService; +import com.tongran.system.service.ISysUserService; /** * 用户信息 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/user") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserOnlineController.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserOnlineController.java index e9ed9bb..1c78433 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; import java.util.ArrayList; import java.util.Collection; @@ -10,23 +10,23 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.redis.service.RedisService; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.api.model.LoginUser; +import com.tongran.system.domain.SysUserOnline; +import com.tongran.system.service.ISysUserOnlineService; /** * 在线用户监控 * - * @author ruoyi + * @author tongran */ @RestController @RequestMapping("/online") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserTableColumnConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserTableColumnConfigController.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java index f3b4d55..2863f5d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserTableColumnConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.controller; +package com.tongran.system.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.UserTableColumnConfig; -import com.ruoyi.system.service.IUserTableColumnConfigService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.system.domain.UserTableColumnConfig; +import com.tongran.system.service.IUserTableColumnConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/AllInterfaceName.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/AllInterfaceName.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java index 5673de0..c3a8cf1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/AllInterfaceName.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusiness.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusiness.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusiness.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusiness.java index 490cd7c..d0b752a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusiness.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusiness.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 业务信息对象 eps_business diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusinessDeploy.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusinessDeploy.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusinessDeploy.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusinessDeploy.java index 6af6c82..97942e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusinessDeploy.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusinessDeploy.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusinessScript.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusinessScript.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusinessScript.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusinessScript.java index 9019fe3..27d6923 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsBusinessScript.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsBusinessScript.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsInitialTrafficData.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsInitialTrafficData.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java index 4ccb55a..7089b22 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsInitialTrafficData.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsMethodChangeRecord.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsMethodChangeRecord.java index 5d8d4d6..469772f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsMethodChangeRecord.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsNodeBandwidth.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsNodeBandwidth.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsNodeBandwidth.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsNodeBandwidth.java index 7192ff9..6d5af41 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsNodeBandwidth.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsNodeBandwidth.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsServerRevenueConfig.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsServerRevenueConfig.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsServerRevenueConfig.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsServerRevenueConfig.java index a93e7a1..9180e5b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsServerRevenueConfig.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsServerRevenueConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsTaskStatistics.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsTaskStatistics.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsTaskStatistics.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsTaskStatistics.java index be9c8a5..a7ca4bb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsTaskStatistics.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsTaskStatistics.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsTrafficData.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsTrafficData.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsTrafficData.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsTrafficData.java index cd1dce2..a82f537 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsTrafficData.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsTrafficData.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/InitialSwitchInfoDetails.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/InitialSwitchInfoDetails.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/InitialSwitchInfoDetails.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/InitialSwitchInfoDetails.java index b410fc1..03e4e01 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/InitialSwitchInfoDetails.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/InitialSwitchInfoDetails.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/KnowledgeBase.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/KnowledgeBase.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/KnowledgeBase.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/KnowledgeBase.java index 1bcf53d..5490499 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/KnowledgeBase.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/KnowledgeBase.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 知识库对象 knowledge_base diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/MtmMonitoringTemplate.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/MtmMonitoringTemplate.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/MtmMonitoringTemplate.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/MtmMonitoringTemplate.java index 69e927f..ce748c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/MtmMonitoringTemplate.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/MtmMonitoringTemplate.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 监控模板管理对象 mtm_monitoring_template diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmEpsTopologyManagement.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmEpsTopologyManagement.java index f543cc9..cb0cf98 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmEpsTopologyManagement.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmMonitorConfig.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmMonitorConfig.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmMonitorConfig.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmMonitorConfig.java index 982be23..206568e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmMonitorConfig.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmMonitorConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmMonitorConfigDetails.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmMonitorConfigDetails.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmMonitorConfigDetails.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmMonitorConfigDetails.java index e4f7ede..55af4f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmMonitorConfigDetails.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmMonitorConfigDetails.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmRegistrationMachine.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmRegistrationMachine.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmRegistrationMachine.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmRegistrationMachine.java index dc7b13b..feb40b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmRegistrationMachine.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmRegistrationMachine.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 绑定金山machinecode对象 rm_registration_machine diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceGroup.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceGroup.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceGroup.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceGroup.java index 249850b..b721d16 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceGroup.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceGroup.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceRegistration.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceRegistration.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java index 85971de..e3e9b97 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceRegistration.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmSwitchInterfaceInfo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmSwitchInterfaceInfo.java index 74f79c8..c5ad990 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmSwitchInterfaceInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmSwitchManagement.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmSwitchManagement.java index 63d4e98..71ae164 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmSwitchManagement.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysConfig.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysConfig.java index a1e22ef..2e58024 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysConfig.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.web.domain.BaseEntity; /** * 参数配置表 sys_config * - * @author ruoyi + * @author tongran */ public class SysConfig extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysMenu.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysMenu.java index daa874a..ad7e98a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.web.domain.BaseEntity; /** * 菜单权限表 sys_menu * - * @author ruoyi + * @author tongran */ public class SysMenu extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenuClick.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysMenuClick.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenuClick.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysMenuClick.java index 2b85e42..8120f11 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenuClick.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysMenuClick.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysNotice.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysNotice.java index 144fcdf..5390707 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysNotice.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.common.core.xss.Xss; +import com.tongran.common.core.web.domain.BaseEntity; +import com.tongran.common.core.xss.Xss; /** * 通知公告表 sys_notice * - * @author ruoyi + * @author tongran */ public class SysNotice extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysPost.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysPost.java index 71ad02b..1891c75 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysPost.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.annotation.Excel.ColumnType; +import com.tongran.common.core.web.domain.BaseEntity; /** * 岗位表 sys_post * - * @author ruoyi + * @author tongran */ public class SysPost extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysRoleDept.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysRoleDept.java index 47b21bf..2d16927 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author ruoyi + * @author tongran */ public class SysRoleDept { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysRoleMenu.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysRoleMenu.java index de10a74..c7dfd4e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author ruoyi + * @author tongran */ public class SysRoleMenu { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserOnline.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserOnline.java index 69bac9a..7015a54 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserOnline.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; /** * 当前在线会话 * - * @author ruoyi + * @author tongran */ public class SysUserOnline { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserPost.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserPost.java index 6e8c416..04da393 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post * - * @author ruoyi + * @author tongran */ public class SysUserPost { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserRole.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserRole.java index 4d15810..58b8a63 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author ruoyi + * @author tongran */ public class SysUserRole { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserTableColumnConfig.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/UserTableColumnConfig.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserTableColumnConfig.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/UserTableColumnConfig.java index ca9e0b0..f763490 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserTableColumnConfig.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/UserTableColumnConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain; +package com.tongran.system.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MessageVo.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/MessageVo.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MessageVo.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/MessageVo.java index cbace6b..73eed64 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MessageVo.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/MessageVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.tongran.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/MetaVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/MetaVo.java index 53bb9f6..2861e68 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/MetaVo.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain.vo; +package com.tongran.system.domain.vo; -import com.ruoyi.common.core.utils.StringUtils; +import com.tongran.common.core.utils.StringUtils; /** * 路由显示信息 * - * @author ruoyi + * @author tongran */ public class MetaVo { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ResourceVo.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/ResourceVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ResourceVo.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/ResourceVo.java index 398d5fe..72f0934 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ResourceVo.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/ResourceVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.tongran.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/RouterVo.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/RouterVo.java index afff8c9..b39d186 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.tongran.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 路由配置信息 * - * @author ruoyi + * @author tongran */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RspVo.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/RspVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RspVo.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/RspVo.java index fea3243..fcde815 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RspVo.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/RspVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.tongran.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/TreeSelect.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/TreeSelect.java index 9308b2b..361c02d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/vo/TreeSelect.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.domain.vo; +package com.tongran.system.domain.vo; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.domain.SysMenu; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.system.api.domain.SysDept; +import com.tongran.system.domain.SysMenu; /** * Treeselect树结构实体类 * - * @author ruoyi + * @author tongran */ public class TreeSelect implements Serializable { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/enums/ReviewEnum.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/enums/ReviewEnum.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/enums/ReviewEnum.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/enums/ReviewEnum.java index cbd5408..9fa3d2d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/enums/ReviewEnum.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/enums/ReviewEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.enums; +package com.tongran.system.enums; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AllInterfaceNameMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/AllInterfaceNameMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AllInterfaceNameMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/AllInterfaceNameMapper.java index 6655650..5bd5e19 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AllInterfaceNameMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/AllInterfaceNameMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.AllInterfaceName; +import com.tongran.system.domain.AllInterfaceName; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessDeployMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessDeployMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessDeployMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessDeployMapper.java index 8ceff39..288b7b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessDeployMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessDeployMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.EpsBusinessDeploy; +import com.tongran.system.domain.EpsBusinessDeploy; /** * 业务下发管理Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessMapper.java index 9fb41e2..5b4af09 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.EpsBusiness; +import com.tongran.system.domain.EpsBusiness; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessScriptMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessScriptMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessScriptMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessScriptMapper.java index 4d6f099..b5312e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessScriptMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsBusinessScriptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.EpsBusinessScript; +import com.tongran.system.domain.EpsBusinessScript; /** * 业务脚本管理Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsInitialTrafficDataMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsInitialTrafficDataMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsInitialTrafficDataMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsInitialTrafficDataMapper.java index 46c7b8e..c2dfaed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsInitialTrafficDataMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsInitialTrafficDataMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.EpsInitialTrafficData; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsMethodChangeRecordMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsMethodChangeRecordMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsMethodChangeRecordMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsMethodChangeRecordMapper.java index 4f1fbd8..b125ab9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsMethodChangeRecordMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsMethodChangeRecordMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.EpsMethodChangeRecord; +import com.tongran.system.domain.EpsMethodChangeRecord; /** * 收益方式修改记录Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsNodeBandwidthMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsNodeBandwidthMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsNodeBandwidthMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsNodeBandwidthMapper.java index 8cd1558..5838396 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsNodeBandwidthMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsNodeBandwidthMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.EpsNodeBandwidth; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsServerRevenueConfigMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsServerRevenueConfigMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsServerRevenueConfigMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsServerRevenueConfigMapper.java index e69306d..e32f2f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsServerRevenueConfigMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsServerRevenueConfigMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.EpsServerRevenueConfig; +import com.tongran.system.domain.EpsServerRevenueConfig; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsTaskStatisticsMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsTaskStatisticsMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsTaskStatisticsMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsTaskStatisticsMapper.java index aa4a2f4..f4cb035 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsTaskStatisticsMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsTaskStatisticsMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.EpsTaskStatistics; +import com.tongran.system.domain.EpsTaskStatistics; /** * 业务95值计算任务Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsTrafficDataMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsTrafficDataMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsTrafficDataMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsTrafficDataMapper.java index 2086259..0119adb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsTrafficDataMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/EpsTrafficDataMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.EpsTrafficData; +import com.tongran.system.domain.EpsTrafficData; /** * 流量相关数据Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/InitialSwitchInfoDetailsMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/InitialSwitchInfoDetailsMapper.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/InitialSwitchInfoDetailsMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/InitialSwitchInfoDetailsMapper.java index bad3c42..afb0d4c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/InitialSwitchInfoDetailsMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/InitialSwitchInfoDetailsMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.InitialSwitchInfoDetails; +import com.tongran.system.domain.InitialSwitchInfoDetails; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/KnowledgeBaseMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/KnowledgeBaseMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/KnowledgeBaseMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/KnowledgeBaseMapper.java index d9df47f..cbf7777 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/KnowledgeBaseMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/KnowledgeBaseMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.KnowledgeBase; +import com.tongran.system.domain.KnowledgeBase; /** * 知识库Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MtmMonitoringTemplateMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/MtmMonitoringTemplateMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MtmMonitoringTemplateMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/MtmMonitoringTemplateMapper.java index df0c047..bedcfc5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MtmMonitoringTemplateMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/MtmMonitoringTemplateMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.MtmMonitoringTemplate; +import com.tongran.system.domain.MtmMonitoringTemplate; /** * 监控模板管理Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmEpsTopologyManagementMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmEpsTopologyManagementMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmEpsTopologyManagementMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmEpsTopologyManagementMapper.java index 07a3878..d4c8497 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmEpsTopologyManagementMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmEpsTopologyManagementMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.RmEpsTopologyManagement; +import com.tongran.system.domain.RmEpsTopologyManagement; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmMonitorConfigDetailsMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmMonitorConfigDetailsMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmMonitorConfigDetailsMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmMonitorConfigDetailsMapper.java index 2797a01..8a20f77 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmMonitorConfigDetailsMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmMonitorConfigDetailsMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.RmMonitorConfigDetails; +import com.tongran.system.domain.RmMonitorConfigDetails; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmMonitorConfigMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmMonitorConfigMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmMonitorConfigMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmMonitorConfigMapper.java index f576980..b7a616b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmMonitorConfigMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmMonitorConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.RmMonitorConfig; +import com.tongran.system.domain.RmMonitorConfig; /** * 监控配置Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmRegistrationMachineMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmRegistrationMachineMapper.java index c1c37a6..9d7591d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmRegistrationMachineMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.RmRegistrationMachine; +import com.tongran.system.domain.RmRegistrationMachine; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceGroupMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceGroupMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceGroupMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceGroupMapper.java index 8236912..ce3f06f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceGroupMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceGroupMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.RmResourceGroup; +import com.tongran.system.domain.RmResourceGroup; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceRegistrationMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceRegistrationMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java index 5cb96a6..3c77cf1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceRegistrationMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; -import com.ruoyi.system.domain.RmResourceRegistration; +import com.tongran.system.domain.RmResourceRegistration; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmSwitchInterfaceInfoMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmSwitchInterfaceInfoMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmSwitchInterfaceInfoMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmSwitchInterfaceInfoMapper.java index 8242b43..0fa1995 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmSwitchInterfaceInfoMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmSwitchInterfaceInfoMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.RmSwitchInterfaceInfo; +import com.tongran.system.domain.RmSwitchInterfaceInfo; /** * 交换机接口信息Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmSwitchManagementMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmSwitchManagementMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmSwitchManagementMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmSwitchManagementMapper.java index 1ad088a..7486e61 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmSwitchManagementMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmSwitchManagementMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.RmSwitchManagement; +import com.tongran.system.domain.RmSwitchManagement; /** * 交换机管理Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysConfigMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysConfigMapper.java index 69f1ac5..3911806 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysConfigMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.tongran.system.domain.SysConfig; /** * 参数配置 数据层 * - * @author ruoyi + * @author tongran */ public interface SysConfigMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDeptMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDeptMapper.java index 77e7e83..51a31ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDeptMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysDept; +import com.tongran.system.api.domain.SysDept; /** * 部门管理 数据层 * - * @author ruoyi + * @author tongran */ public interface SysDeptMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDictDataMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDictDataMapper.java index b004c59..2c9a65c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDictDataMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysDictData; +import com.tongran.system.api.domain.SysDictData; /** * 字典表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysDictDataMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDictTypeMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDictTypeMapper.java index d217293..b189231 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysDictTypeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysDictType; +import com.tongran.system.api.domain.SysDictType; /** * 字典表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysDictTypeMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysLogininforMapper.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysLogininforMapper.java index 19671f3..163d028 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysLogininforMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysLogininfor; +import com.tongran.system.api.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 * - * @author ruoyi + * @author tongran */ public interface SysLogininforMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuClickMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysMenuClickMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuClickMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysMenuClickMapper.java index 5aaaa97..a8b8ddd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuClickMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysMenuClickMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysMenuClick; +import com.tongran.system.domain.SysMenuClick; /** * 菜单点击计数Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysMenuMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysMenuMapper.java index 3302010..b04d585 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysMenu; +import com.tongran.system.domain.SysMenu; /** * 菜单表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysMenuMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysNoticeMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysNoticeMapper.java index 226fdab..a7d943e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysNoticeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.tongran.system.domain.SysNotice; /** * 通知公告表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysNoticeMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysOperLogMapper.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysOperLogMapper.java index f243dcd..2059747 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysOperLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysOperLog; +import com.tongran.system.api.domain.SysOperLog; /** * 操作日志 数据层 * - * @author ruoyi + * @author tongran */ public interface SysOperLogMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysPostMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysPostMapper.java index 19be227..4e843b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.tongran.system.domain.SysPost; /** * 岗位信息 数据层 * - * @author ruoyi + * @author tongran */ public interface SysPostMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleDeptMapper.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleDeptMapper.java index f9d3a2f..8a8569b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleDeptMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.tongran.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysRoleDeptMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleMapper.java index 1ef156f..a0ac0ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysRole; /** * 角色表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysRoleMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleMenuMapper.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleMenuMapper.java index 6602bee..383063f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysRoleMenuMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.tongran.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysRoleMenuMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserMapper.java index 60e092a..b4dfc2d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysUser; +import com.tongran.system.api.domain.SysUser; /** * 用户表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysUserMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserPostMapper.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserPostMapper.java index 2a6a720..cc0b047 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.tongran.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysUserPostMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserRoleMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserRoleMapper.java index 3143ec8..7b59dcd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/SysUserRoleMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.tongran.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 * - * @author ruoyi + * @author tongran */ public interface SysUserRoleMapper { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserTableColumnConfigMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/UserTableColumnConfigMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserTableColumnConfigMapper.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/UserTableColumnConfigMapper.java index ca9e4b4..03ccf79 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserTableColumnConfigMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/UserTableColumnConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.tongran.system.mapper; import java.util.List; -import com.ruoyi.system.domain.UserTableColumnConfig; +import com.tongran.system.domain.UserTableColumnConfig; /** * 用户自定义列配置Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/EpsInitialTrafficDataService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/EpsInitialTrafficDataService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/EpsInitialTrafficDataService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/EpsInitialTrafficDataService.java index 0bef2e2..38ccdf7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/EpsInitialTrafficDataService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/EpsInitialTrafficDataService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.EpsNodeBandwidth; -import com.ruoyi.system.domain.RmMonitorConfig; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.RmMonitorConfig; import java.math.BigDecimal; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IAllInterfaceNameService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IAllInterfaceNameService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IAllInterfaceNameService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IAllInterfaceNameService.java index 5f477e7..cae3469 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IAllInterfaceNameService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IAllInterfaceNameService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.AllInterfaceName; +import com.tongran.system.domain.AllInterfaceName; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessDeployService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessDeployService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessDeployService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessDeployService.java index 7c4287c..c531e38 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessDeployService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessDeployService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.EpsBusinessDeploy; +import com.tongran.system.domain.EpsBusinessDeploy; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessScriptService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessScriptService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessScriptService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessScriptService.java index a2dcefd..5220eba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessScriptService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessScriptService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.EpsBusinessScript; +import com.tongran.system.domain.EpsBusinessScript; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessService.java index a8ce2ed..34169e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsBusinessService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsBusinessService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.EpsBusiness; +import com.tongran.system.domain.EpsBusiness; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsMethodChangeRecordService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsMethodChangeRecordService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsMethodChangeRecordService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsMethodChangeRecordService.java index aeeede2..21be981 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsMethodChangeRecordService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsMethodChangeRecordService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.EpsMethodChangeRecord; +import com.tongran.system.domain.EpsMethodChangeRecord; /** * 收益方式修改记录Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsNodeBandwidthService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsNodeBandwidthService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsNodeBandwidthService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsNodeBandwidthService.java index 14c5fcb..bc874f1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsNodeBandwidthService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsNodeBandwidthService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import com.github.pagehelper.PageInfo; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.EpsNodeBandwidth; import java.time.temporal.ChronoUnit; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsServerRevenueConfigService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsServerRevenueConfigService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsServerRevenueConfigService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsServerRevenueConfigService.java index 65fe5ef..24c1a4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsServerRevenueConfigService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsServerRevenueConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.domain.EpsServerRevenueConfig; +import com.tongran.common.core.domain.R; +import com.tongran.system.domain.EpsServerRevenueConfig; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsTaskStatisticsService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsTaskStatisticsService.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsTaskStatisticsService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsTaskStatisticsService.java index 9417685..c074541 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsTaskStatisticsService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsTaskStatisticsService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import com.github.pagehelper.PageInfo; -import com.ruoyi.system.domain.EpsTaskStatistics; +import com.tongran.system.domain.EpsTaskStatistics; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsTrafficDataService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsTrafficDataService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsTrafficDataService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsTrafficDataService.java index 59f81e0..b0b82be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IEpsTrafficDataService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IEpsTrafficDataService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.EpsTrafficData; +import com.tongran.system.domain.EpsTrafficData; /** * 流量相关数据Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IInitialSwitchInfoDetailsService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IInitialSwitchInfoDetailsService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IInitialSwitchInfoDetailsService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IInitialSwitchInfoDetailsService.java index e6bd5a1..e2fa520 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IInitialSwitchInfoDetailsService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IInitialSwitchInfoDetailsService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.domain.EpsNodeBandwidth; -import com.ruoyi.system.domain.InitialSwitchInfoDetails; -import com.ruoyi.system.domain.RmMonitorConfig; +import com.tongran.common.core.domain.R; +import com.tongran.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.InitialSwitchInfoDetails; +import com.tongran.system.domain.RmMonitorConfig; import java.math.BigDecimal; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IKnowledgeBaseService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IKnowledgeBaseService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IKnowledgeBaseService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IKnowledgeBaseService.java index ac2395c..0f6ece3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IKnowledgeBaseService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IKnowledgeBaseService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.KnowledgeBase; +import com.tongran.system.domain.KnowledgeBase; /** * 知识库Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMtmMonitoringTemplateService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IMtmMonitoringTemplateService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMtmMonitoringTemplateService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IMtmMonitoringTemplateService.java index fc60094..f927f28 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMtmMonitoringTemplateService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IMtmMonitoringTemplateService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.MtmMonitoringTemplate; +import com.tongran.system.domain.MtmMonitoringTemplate; /** * 监控模板管理Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmEpsTopologyManagementService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmEpsTopologyManagementService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmEpsTopologyManagementService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmEpsTopologyManagementService.java index d46fa23..c262cf1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmEpsTopologyManagementService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmEpsTopologyManagementService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.RmEpsTopologyManagement; +import com.tongran.system.domain.RmEpsTopologyManagement; /** * 拓扑管理Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmMonitorConfigDetailsService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmMonitorConfigDetailsService.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmMonitorConfigDetailsService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmMonitorConfigDetailsService.java index b64c929..eee4083 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmMonitorConfigDetailsService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmMonitorConfigDetailsService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.RmMonitorConfigDetails; +import com.tongran.system.domain.RmMonitorConfigDetails; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmMonitorConfigService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmMonitorConfigService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmMonitorConfigService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmMonitorConfigService.java index d0eed35..ce296ae 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmMonitorConfigService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmMonitorConfigService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.RmMonitorConfig; +import com.tongran.system.domain.RmMonitorConfig; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmRegistrationMachineService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmRegistrationMachineService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmRegistrationMachineService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmRegistrationMachineService.java index 8d915f0..fe07b78 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmRegistrationMachineService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmRegistrationMachineService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.RmRegistrationMachine; +import com.tongran.system.domain.RmRegistrationMachine; /** * 绑定金山machinecodeService接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceGroupService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceGroupService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceGroupService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceGroupService.java index 34d5335..52ee9f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceGroupService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceGroupService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import com.github.pagehelper.PageInfo; -import com.ruoyi.system.domain.RmResourceGroup; -import com.ruoyi.system.domain.RmResourceRegistration; +import com.tongran.system.domain.RmResourceGroup; +import com.tongran.system.domain.RmResourceRegistration; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceRegistrationService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceRegistrationService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java index a417584..798bc44 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceRegistrationService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.system.api.domain.RmRegisterMsgRemote; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; -import com.ruoyi.system.domain.RmResourceRegistration; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.system.api.domain.RmRegisterMsgRemote; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.system.domain.RmResourceRegistration; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmSwitchInterfaceInfoService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmSwitchInterfaceInfoService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmSwitchInterfaceInfoService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmSwitchInterfaceInfoService.java index 0f1e4c6..97c9f11 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmSwitchInterfaceInfoService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmSwitchInterfaceInfoService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.RmSwitchInterfaceInfo; +import com.tongran.system.domain.RmSwitchInterfaceInfo; /** * 交换机接口信息Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmSwitchManagementService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmSwitchManagementService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmSwitchManagementService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmSwitchManagementService.java index adf0ab6..8fdfd14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmSwitchManagementService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmSwitchManagementService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.RmSwitchManagement; +import com.tongran.system.domain.RmSwitchManagement; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysConfigService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysConfigService.java index 52a3b00..b890712 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysConfigService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.tongran.system.domain.SysConfig; /** * 参数配置 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysConfigService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDeptService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDeptService.java index 313d577..7eb5f3b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDeptService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.domain.vo.TreeSelect; +import com.tongran.system.api.domain.SysDept; +import com.tongran.system.domain.vo.TreeSelect; /** * 部门管理 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysDeptService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDictDataService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDictDataService.java index ba9d8ea..5e516f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDictDataService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysDictData; +import com.tongran.system.api.domain.SysDictData; /** * 字典 业务层 * - * @author ruoyi + * @author tongran */ public interface ISysDictDataService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDictTypeService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDictTypeService.java index ceb80e7..8a21ec8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysDictTypeService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.api.domain.SysDictType; +import com.tongran.system.api.domain.SysDictData; +import com.tongran.system.api.domain.SysDictType; /** * 字典 业务层 * - * @author ruoyi + * @author tongran */ public interface ISysDictTypeService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysLogininforService.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysLogininforService.java index 509cc54..ef498c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysLogininforService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysLogininfor; +import com.tongran.system.api.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysLogininforService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuClickService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysMenuClickService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuClickService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysMenuClickService.java index 377b045..e7ac1f1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuClickService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysMenuClickService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.SysMenuClick; +import com.tongran.system.domain.SysMenuClick; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysMenuService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysMenuService.java index 0265f64..fd65d98 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysMenuService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.domain.vo.TreeSelect; +import com.tongran.system.domain.SysMenu; +import com.tongran.system.domain.vo.RouterVo; +import com.tongran.system.domain.vo.TreeSelect; import java.util.List; import java.util.Set; @@ -10,7 +10,7 @@ import java.util.Set; /** * 菜单 业务层 * - * @author ruoyi + * @author tongran */ public interface ISysMenuService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysNoticeService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysNoticeService.java index 47ce1b7..cda3fd3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysNoticeService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.tongran.system.domain.SysNotice; /** * 公告 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysNoticeService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysOperLogService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysOperLogService.java index 2178a9d..9612987 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysOperLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysOperLog; +import com.tongran.system.api.domain.SysOperLog; /** * 操作日志 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysOperLogService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysPermissionService.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysPermissionService.java index 230f9b2..bc17d82 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysPermissionService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.Set; -import com.ruoyi.system.api.domain.SysUser; +import com.tongran.system.api.domain.SysUser; /** * 权限信息 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysPermissionService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysPostService.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysPostService.java index 84779bf..46d14d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysPostService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.tongran.system.domain.SysPost; /** * 岗位信息 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysPostService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysRoleService.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysRoleService.java index de3ccf3..9b7f8a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysRoleService.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.domain.SysUserRole; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.domain.SysUserRole; /** * 角色业务层 * - * @author ruoyi + * @author tongran */ public interface ISysRoleService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysUserOnlineService.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysUserOnlineService.java index 9ca0ac4..d131abb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysUserOnlineService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.tongran.system.api.model.LoginUser; +import com.tongran.system.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author ruoyi + * @author tongran */ public interface ISysUserOnlineService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysUserService.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysUserService.java index cdd267e..afe61fd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/ISysUserService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysUser; +import com.tongran.system.api.domain.SysUser; /** * 用户 业务层 * - * @author ruoyi + * @author tongran */ public interface ISysUserService { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserTableColumnConfigService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IUserTableColumnConfigService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserTableColumnConfigService.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IUserTableColumnConfigService.java index dfe091f..f6ab179 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserTableColumnConfigService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IUserTableColumnConfigService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.tongran.system.service; -import com.ruoyi.system.domain.UserTableColumnConfig; +import com.tongran.system.domain.UserTableColumnConfig; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AllInterfaceNameServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AllInterfaceNameServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java index 6516172..1d92182 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AllInterfaceNameServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; -import com.ruoyi.system.domain.AllInterfaceName; -import com.ruoyi.system.domain.RmEpsTopologyManagement; -import com.ruoyi.system.mapper.AllInterfaceNameMapper; -import com.ruoyi.system.service.IAllInterfaceNameService; -import com.ruoyi.system.service.IRmEpsTopologyManagementService; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.api.domain.RmNetworkInterfaceRemote; +import com.tongran.system.domain.AllInterfaceName; +import com.tongran.system.domain.RmEpsTopologyManagement; +import com.tongran.system.mapper.AllInterfaceNameMapper; +import com.tongran.system.service.IAllInterfaceNameService; +import com.tongran.system.service.IRmEpsTopologyManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessDeployServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessDeployServiceImpl.java index 5c26ad8..c093fc4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessDeployServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.api.domain.RmDeployScriptRemote; -import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; -import com.ruoyi.system.domain.EpsBusinessDeploy; -import com.ruoyi.system.domain.EpsMethodChangeRecord; -import com.ruoyi.system.domain.RmResourceRegistration; -import com.ruoyi.system.enums.ReviewEnum; -import com.ruoyi.system.mapper.EpsBusinessDeployMapper; -import com.ruoyi.system.mapper.EpsMethodChangeRecordMapper; -import com.ruoyi.system.mapper.RmResourceRegistrationMapper; -import com.ruoyi.system.service.IEpsBusinessDeployService; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.api.domain.RmDeployScriptRemote; +import com.tongran.system.api.domain.RmNetworkInterfaceRemote; +import com.tongran.system.domain.EpsBusinessDeploy; +import com.tongran.system.domain.EpsMethodChangeRecord; +import com.tongran.system.domain.RmResourceRegistration; +import com.tongran.system.enums.ReviewEnum; +import com.tongran.system.mapper.EpsBusinessDeployMapper; +import com.tongran.system.mapper.EpsMethodChangeRecordMapper; +import com.tongran.system.mapper.RmResourceRegistrationMapper; +import com.tongran.system.service.IEpsBusinessDeployService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessScriptServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessScriptServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessScriptServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessScriptServiceImpl.java index 8c483b8..b23c6d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessScriptServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessScriptServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.EpsBusinessScript; -import com.ruoyi.system.mapper.EpsBusinessScriptMapper; -import com.ruoyi.system.service.IEpsBusinessScriptService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.EpsBusinessScript; +import com.tongran.system.mapper.EpsBusinessScriptMapper; +import com.tongran.system.service.IEpsBusinessScriptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessServiceImpl.java index 18f1649..e199ab6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsBusinessServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.EpsBusiness; -import com.ruoyi.system.mapper.EpsBusinessMapper; -import com.ruoyi.system.service.IEpsBusinessService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.EpsBusiness; +import com.tongran.system.mapper.EpsBusinessMapper; +import com.tongran.system.service.IEpsBusinessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java index 087a4d4..1dfe2ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.SpeedUtils; -import com.ruoyi.system.domain.*; -import com.ruoyi.system.enums.ReviewEnum; -import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.util.CalculateUtil; -import com.ruoyi.system.util.DateUtil; -import com.ruoyi.system.util.TableRouterUtil; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.SpeedUtils; +import com.tongran.system.domain.*; +import com.tongran.system.enums.ReviewEnum; +import com.tongran.system.mapper.*; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.util.CalculateUtil; +import com.tongran.system.util.DateUtil; +import com.tongran.system.util.TableRouterUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsMethodChangeRecordServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsMethodChangeRecordServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsMethodChangeRecordServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsMethodChangeRecordServiceImpl.java index a18a2e9..d9749b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsMethodChangeRecordServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsMethodChangeRecordServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.EpsMethodChangeRecordMapper; -import com.ruoyi.system.domain.EpsMethodChangeRecord; -import com.ruoyi.system.service.IEpsMethodChangeRecordService; +import com.tongran.system.mapper.EpsMethodChangeRecordMapper; +import com.tongran.system.domain.EpsMethodChangeRecord; +import com.tongran.system.service.IEpsMethodChangeRecordService; /** * 收益方式修改记录Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsNodeBandwidthServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsNodeBandwidthServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsNodeBandwidthServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsNodeBandwidthServiceImpl.java index 851f599..99a4a72 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsNodeBandwidthServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsNodeBandwidthServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.EpsNodeBandwidth; -import com.ruoyi.system.domain.RmSwitchManagement; -import com.ruoyi.system.mapper.EpsNodeBandwidthMapper; -import com.ruoyi.system.mapper.RmSwitchManagementMapper; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IEpsNodeBandwidthService; -import com.ruoyi.system.service.IRmMonitorConfigService; -import com.ruoyi.system.util.EchartsDataConverter; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.RmSwitchManagement; +import com.tongran.system.mapper.EpsNodeBandwidthMapper; +import com.tongran.system.mapper.RmSwitchManagementMapper; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IEpsNodeBandwidthService; +import com.tongran.system.service.IRmMonitorConfigService; +import com.tongran.system.util.EchartsDataConverter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; -import static com.ruoyi.common.core.utils.PageUtils.startPage; +import static com.tongran.common.core.utils.PageUtils.startPage; /** * 节点带宽信息Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsServerRevenueConfigServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsServerRevenueConfigServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsServerRevenueConfigServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsServerRevenueConfigServiceImpl.java index 5c77bf1..ab83ca5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsServerRevenueConfigServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsServerRevenueConfigServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.*; -import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IEpsServerRevenueConfigService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.*; +import com.tongran.system.mapper.*; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IEpsServerRevenueConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java index 6c7db6a..82873b7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.SpeedUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.domain.EpsInitialTrafficData; -import com.ruoyi.system.domain.EpsNodeBandwidth; -import com.ruoyi.system.domain.EpsTaskStatistics; -import com.ruoyi.system.domain.InitialSwitchInfoDetails; -import com.ruoyi.system.mapper.EpsNodeBandwidthMapper; -import com.ruoyi.system.mapper.EpsTaskStatisticsMapper; -import com.ruoyi.system.mapper.InitialSwitchInfoDetailsMapper; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IEpsTaskStatisticsService; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; -import com.ruoyi.system.util.CalculateUtil; -import com.ruoyi.system.util.DateUtil; -import com.ruoyi.system.util.PaginationUtil; -import com.ruoyi.system.util.TrafficRedisHashUtil; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.SpeedUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.system.domain.EpsInitialTrafficData; +import com.tongran.system.domain.EpsNodeBandwidth; +import com.tongran.system.domain.EpsTaskStatistics; +import com.tongran.system.domain.InitialSwitchInfoDetails; +import com.tongran.system.mapper.EpsNodeBandwidthMapper; +import com.tongran.system.mapper.EpsTaskStatisticsMapper; +import com.tongran.system.mapper.InitialSwitchInfoDetailsMapper; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IEpsTaskStatisticsService; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.system.util.CalculateUtil; +import com.tongran.system.util.DateUtil; +import com.tongran.system.util.PaginationUtil; +import com.tongran.system.util.TrafficRedisHashUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTrafficDataServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTrafficDataServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTrafficDataServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTrafficDataServiceImpl.java index fa33e39..fa417f1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTrafficDataServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTrafficDataServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.EpsTrafficData; -import com.ruoyi.system.mapper.EpsMethodChangeRecordMapper; -import com.ruoyi.system.mapper.EpsTrafficDataMapper; -import com.ruoyi.system.service.IEpsTrafficDataService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.EpsTrafficData; +import com.tongran.system.mapper.EpsMethodChangeRecordMapper; +import com.tongran.system.mapper.EpsTrafficDataMapper; +import com.tongran.system.service.IEpsTrafficDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java index 60acda6..a15bc2c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.*; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.system.domain.*; -import com.ruoyi.system.enums.ReviewEnum; -import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; -import com.ruoyi.system.util.CalculateUtil; -import com.ruoyi.system.util.PaginationUtil; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.*; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.system.domain.*; +import com.tongran.system.enums.ReviewEnum; +import com.tongran.system.mapper.*; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.system.util.CalculateUtil; +import com.tongran.system.util.PaginationUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +27,7 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static com.ruoyi.common.core.utils.PageUtils.startPage; +import static com.tongran.common.core.utils.PageUtils.startPage; /** * 交换机监控信息Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KnowledgeBaseServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/KnowledgeBaseServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KnowledgeBaseServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/KnowledgeBaseServiceImpl.java index eb6944d..64afcdc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KnowledgeBaseServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/KnowledgeBaseServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.KnowledgeBaseMapper; -import com.ruoyi.system.domain.KnowledgeBase; -import com.ruoyi.system.service.IKnowledgeBaseService; +import com.tongran.system.mapper.KnowledgeBaseMapper; +import com.tongran.system.domain.KnowledgeBase; +import com.tongran.system.service.IKnowledgeBaseService; /** * 知识库Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MtmMonitoringTemplateServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/MtmMonitoringTemplateServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MtmMonitoringTemplateServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/MtmMonitoringTemplateServiceImpl.java index a2d81b9..8f476c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MtmMonitoringTemplateServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/MtmMonitoringTemplateServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.MtmMonitoringTemplateMapper; -import com.ruoyi.system.domain.MtmMonitoringTemplate; -import com.ruoyi.system.service.IMtmMonitoringTemplateService; +import com.tongran.system.mapper.MtmMonitoringTemplateMapper; +import com.tongran.system.domain.MtmMonitoringTemplate; +import com.tongran.system.service.IMtmMonitoringTemplateService; /** * 监控模板管理Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmEpsTopologyManagementServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmEpsTopologyManagementServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmEpsTopologyManagementServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmEpsTopologyManagementServiceImpl.java index 2047e8f..24b04b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmEpsTopologyManagementServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmEpsTopologyManagementServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.RmEpsTopologyManagement; -import com.ruoyi.system.mapper.RmEpsTopologyManagementMapper; -import com.ruoyi.system.service.IRmEpsTopologyManagementService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.RmEpsTopologyManagement; +import com.tongran.system.mapper.RmEpsTopologyManagementMapper; +import com.tongran.system.service.IRmEpsTopologyManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java index fac65db..b088a55 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.SpeedUtils; -import com.ruoyi.system.domain.RmMonitorConfig; -import com.ruoyi.system.domain.RmMonitorConfigDetails; -import com.ruoyi.system.mapper.RmMonitorConfigDetailsMapper; -import com.ruoyi.system.mapper.RmMonitorConfigMapper; -import com.ruoyi.system.service.IRmMonitorConfigDetailsService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.SpeedUtils; +import com.tongran.system.domain.RmMonitorConfig; +import com.tongran.system.domain.RmMonitorConfigDetails; +import com.tongran.system.mapper.RmMonitorConfigDetailsMapper; +import com.tongran.system.mapper.RmMonitorConfigMapper; +import com.tongran.system.service.IRmMonitorConfigDetailsService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigServiceImpl.java index 94705a5..af1b869 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.*; -import com.ruoyi.system.mapper.RmMonitorConfigDetailsMapper; -import com.ruoyi.system.mapper.RmMonitorConfigMapper; -import com.ruoyi.system.mapper.RmResourceRegistrationMapper; -import com.ruoyi.system.service.EpsInitialTrafficDataService; -import com.ruoyi.system.service.IInitialSwitchInfoDetailsService; -import com.ruoyi.system.service.IRmMonitorConfigService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.*; +import com.tongran.system.mapper.RmMonitorConfigDetailsMapper; +import com.tongran.system.mapper.RmMonitorConfigMapper; +import com.tongran.system.mapper.RmResourceRegistrationMapper; +import com.tongran.system.service.EpsInitialTrafficDataService; +import com.tongran.system.service.IInitialSwitchInfoDetailsService; +import com.tongran.system.service.IRmMonitorConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmRegistrationMachineServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmRegistrationMachineServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmRegistrationMachineServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmRegistrationMachineServiceImpl.java index f7a323a..da87b76 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmRegistrationMachineServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmRegistrationMachineServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.RmRegistrationMachineMapper; -import com.ruoyi.system.domain.RmRegistrationMachine; -import com.ruoyi.system.service.IRmRegistrationMachineService; +import com.tongran.system.mapper.RmRegistrationMachineMapper; +import com.tongran.system.domain.RmRegistrationMachine; +import com.tongran.system.service.IRmRegistrationMachineService; /** * 绑定金山machinecodeService业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceGroupServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceGroupServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceGroupServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceGroupServiceImpl.java index 83082b5..ba550bb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceGroupServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceGroupServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.system.domain.RmResourceGroup; -import com.ruoyi.system.domain.RmResourceRegistration; -import com.ruoyi.system.mapper.RmResourceGroupMapper; -import com.ruoyi.system.mapper.RmResourceRegistrationMapper; -import com.ruoyi.system.service.IRmResourceGroupService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.system.domain.RmResourceGroup; +import com.tongran.system.domain.RmResourceRegistration; +import com.tongran.system.mapper.RmResourceGroupMapper; +import com.tongran.system.mapper.RmResourceRegistrationMapper; +import com.tongran.system.service.IRmResourceGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import static com.ruoyi.common.core.utils.PageUtils.startPage; +import static com.tongran.common.core.utils.PageUtils.startPage; /** * 资源分组Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java index bbf65e2..590e6d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java @@ -1,22 +1,22 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.api.domain.*; -import com.ruoyi.system.domain.*; -import com.ruoyi.system.domain.vo.MessageVo; -import com.ruoyi.system.domain.vo.ResourceVo; -import com.ruoyi.system.domain.vo.RspVo; -import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.IRmResourceRegistrationService; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.api.domain.*; +import com.tongran.system.domain.*; +import com.tongran.system.domain.vo.MessageVo; +import com.tongran.system.domain.vo.ResourceVo; +import com.tongran.system.domain.vo.RspVo; +import com.tongran.system.mapper.*; +import com.tongran.system.service.IRmResourceRegistrationService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; -import static com.ruoyi.common.core.utils.PageUtils.startPage; +import static com.tongran.common.core.utils.PageUtils.startPage; /** * 资源注册Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmSwitchInterfaceInfoServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmSwitchInterfaceInfoServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmSwitchInterfaceInfoServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmSwitchInterfaceInfoServiceImpl.java index fd79971..0cb00be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmSwitchInterfaceInfoServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmSwitchInterfaceInfoServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.RmSwitchInterfaceInfoMapper; -import com.ruoyi.system.domain.RmSwitchInterfaceInfo; -import com.ruoyi.system.service.IRmSwitchInterfaceInfoService; +import com.tongran.system.mapper.RmSwitchInterfaceInfoMapper; +import com.tongran.system.domain.RmSwitchInterfaceInfo; +import com.tongran.system.service.IRmSwitchInterfaceInfoService; /** * 交换机接口信息Service业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmSwitchManagementServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmSwitchManagementServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmSwitchManagementServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmSwitchManagementServiceImpl.java index f5d984f..ba3f595 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmSwitchManagementServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmSwitchManagementServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.uuid.IdUtils; -import com.ruoyi.system.api.RemoteRocketMqService; -import com.ruoyi.system.api.domain.RmMonitorPolicyRemote; -import com.ruoyi.system.domain.AllInterfaceName; -import com.ruoyi.system.domain.RmSwitchInterfaceInfo; -import com.ruoyi.system.domain.RmSwitchManagement; -import com.ruoyi.system.mapper.AllInterfaceNameMapper; -import com.ruoyi.system.mapper.RmSwitchInterfaceInfoMapper; -import com.ruoyi.system.mapper.RmSwitchManagementMapper; -import com.ruoyi.system.service.IRmSwitchManagementService; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.uuid.IdUtils; +import com.tongran.system.api.RemoteRocketMqService; +import com.tongran.system.api.domain.RmMonitorPolicyRemote; +import com.tongran.system.domain.AllInterfaceName; +import com.tongran.system.domain.RmSwitchInterfaceInfo; +import com.tongran.system.domain.RmSwitchManagement; +import com.tongran.system.mapper.AllInterfaceNameMapper; +import com.tongran.system.mapper.RmSwitchInterfaceInfoMapper; +import com.tongran.system.mapper.RmSwitchManagementMapper; +import com.tongran.system.service.IRmSwitchManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysConfigServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysConfigServiceImpl.java index 39c8f89..643d2b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysConfigServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.tongran.common.core.constant.CacheConstants; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.redis.service.RedisService; +import com.tongran.system.domain.SysConfig; +import com.tongran.system.mapper.SysConfigMapper; +import com.tongran.system.service.ISysConfigService; /** * 参数配置 服务层实现 * - * @author ruoyi + * @author tongran */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDeptServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDeptServiceImpl.java index 8f53104..fb41b40 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,25 +6,25 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.vo.TreeSelect; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.text.Convert; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.datascope.annotation.DataScope; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysDept; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.domain.vo.TreeSelect; +import com.tongran.system.mapper.SysDeptMapper; +import com.tongran.system.mapper.SysRoleMapper; +import com.tongran.system.service.ISysDeptService; /** * 部门管理 服务实现 * - * @author ruoyi + * @author tongran */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDictDataServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDictDataServiceImpl.java index a40666f..1890ad4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDictDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.tongran.common.security.utils.DictUtils; +import com.tongran.system.api.domain.SysDictData; +import com.tongran.system.mapper.SysDictDataMapper; +import com.tongran.system.service.ISysDictDataService; /** * 字典 业务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDictTypeServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDictTypeServiceImpl.java index 1ac0925..28f157e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.Comparator; import java.util.List; @@ -8,20 +8,20 @@ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.api.domain.SysDictType; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.DictUtils; +import com.tongran.system.api.domain.SysDictData; +import com.tongran.system.api.domain.SysDictType; +import com.tongran.system.mapper.SysDictDataMapper; +import com.tongran.system.mapper.SysDictTypeMapper; +import com.tongran.system.service.ISysDictTypeService; /** * 字典 业务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysLogininforServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysLogininforServiceImpl.java index ba53b22..e190260 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysLogininforServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.api.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.tongran.system.api.domain.SysLogininfor; +import com.tongran.system.mapper.SysLogininforMapper; +import com.tongran.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuClickServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysMenuClickServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuClickServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysMenuClickServiceImpl.java index 6d85daf..a9bc357 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuClickServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysMenuClickServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysMenuClick; -import com.ruoyi.system.mapper.SysMenuClickMapper; -import com.ruoyi.system.service.ISysMenuClickService; -import com.ruoyi.system.service.ISysMenuService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.SysMenu; +import com.tongran.system.domain.SysMenuClick; +import com.tongran.system.mapper.SysMenuClickMapper; +import com.tongran.system.service.ISysMenuClickService; +import com.tongran.system.service.ISysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysMenuServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysMenuServiceImpl.java index 97bbc57..3d2e434 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysMenuServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.domain.vo.TreeSelect; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.tongran.common.core.constant.Constants; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.domain.SysMenu; +import com.tongran.system.domain.vo.MetaVo; +import com.tongran.system.domain.vo.RouterVo; +import com.tongran.system.domain.vo.TreeSelect; +import com.tongran.system.mapper.SysMenuMapper; +import com.tongran.system.mapper.SysRoleMapper; +import com.tongran.system.mapper.SysRoleMenuMapper; +import com.tongran.system.service.ISysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * 菜单 业务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysNoticeServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysNoticeServiceImpl.java index 765438b..bc82023 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysNoticeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.tongran.system.domain.SysNotice; +import com.tongran.system.mapper.SysNoticeMapper; +import com.tongran.system.service.ISysNoticeService; /** * 公告 服务层实现 * - * @author ruoyi + * @author tongran */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysOperLogServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysOperLogServiceImpl.java index 232810f..fed1b20 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysOperLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.api.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.tongran.system.api.domain.SysOperLog; +import com.tongran.system.mapper.SysOperLogMapper; +import com.tongran.system.service.ISysOperLogService; /** * 操作日志 服务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysPermissionServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysPermissionServiceImpl.java index 88b9760..5bbbcca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysPermissionServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.HashSet; import java.util.List; @@ -6,18 +6,18 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysPermissionService; -import com.ruoyi.system.service.ISysRoleService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.service.ISysMenuService; +import com.tongran.system.service.ISysPermissionService; +import com.tongran.system.service.ISysRoleService; /** * 用户权限处理 * - * @author ruoyi + * @author tongran */ @Service public class SysPermissionServiceImpl implements ISysPermissionService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysPostServiceImpl.java index 4148380..fae4e47 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysPostServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.system.domain.SysPost; +import com.tongran.system.mapper.SysPostMapper; +import com.tongran.system.mapper.SysUserPostMapper; +import com.tongran.system.service.ISysPostService; /** * 岗位信息 服务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysRoleServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysRoleServiceImpl.java index 9b9e7fa..56b101f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,27 +8,27 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.datascope.annotation.DataScope; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.domain.SysRoleDept; +import com.tongran.system.domain.SysRoleMenu; +import com.tongran.system.domain.SysUserRole; +import com.tongran.system.mapper.SysRoleDeptMapper; +import com.tongran.system.mapper.SysRoleMapper; +import com.tongran.system.mapper.SysRoleMenuMapper; +import com.tongran.system.mapper.SysUserRoleMapper; +import com.tongran.system.service.ISysRoleService; /** * 角色 业务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysUserOnlineServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysUserOnlineServiceImpl.java index 046b6fd..75fd79e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.system.api.model.LoginUser; +import com.tongran.system.domain.SysUserOnline; +import com.tongran.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysUserServiceImpl.java index 3808a7b..faf5f6d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; import java.util.ArrayList; import java.util.List; @@ -10,31 +10,31 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.bean.BeanValidators; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysUserService; +import com.tongran.common.core.constant.UserConstants; +import com.tongran.common.core.exception.ServiceException; +import com.tongran.common.core.utils.SpringUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.core.utils.bean.BeanValidators; +import com.tongran.common.datascope.annotation.DataScope; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.api.domain.SysRole; +import com.tongran.system.api.domain.SysUser; +import com.tongran.system.domain.SysPost; +import com.tongran.system.domain.SysUserPost; +import com.tongran.system.domain.SysUserRole; +import com.tongran.system.mapper.SysPostMapper; +import com.tongran.system.mapper.SysRoleMapper; +import com.tongran.system.mapper.SysUserMapper; +import com.tongran.system.mapper.SysUserPostMapper; +import com.tongran.system.mapper.SysUserRoleMapper; +import com.tongran.system.service.ISysConfigService; +import com.tongran.system.service.ISysDeptService; +import com.tongran.system.service.ISysUserService; /** * 用户 业务层处理 * - * @author ruoyi + * @author tongran */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserTableColumnConfigServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/UserTableColumnConfigServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserTableColumnConfigServiceImpl.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/UserTableColumnConfigServiceImpl.java index 21303ee..46bc6a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserTableColumnConfigServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/UserTableColumnConfigServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service.impl; +package com.tongran.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.UserTableColumnConfig; -import com.ruoyi.system.mapper.UserTableColumnConfigMapper; -import com.ruoyi.system.service.IUserTableColumnConfigService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.system.domain.UserTableColumnConfig; +import com.tongran.system.mapper.UserTableColumnConfigMapper; +import com.tongran.system.service.IUserTableColumnConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CalculateUtil.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/CalculateUtil.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CalculateUtil.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/CalculateUtil.java index 8338e54..26ed654 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CalculateUtil.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/CalculateUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.util; +package com.tongran.system.util; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/DateUtil.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/DateUtil.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/DateUtil.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/DateUtil.java index 972bd5f..f74ae9a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/DateUtil.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/DateUtil.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.util; +package com.tongran.system.util; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.EpsNodeBandwidth; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.EpsNodeBandwidth; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/EchartsDataConverter.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/EchartsDataConverter.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/EchartsDataConverter.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/EchartsDataConverter.java index d8dd5ab..10cc79f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/EchartsDataConverter.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/EchartsDataConverter.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.util; +package com.tongran.system.util; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.system.domain.EpsNodeBandwidth; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.system.domain.EpsNodeBandwidth; import java.math.BigDecimal; import java.text.SimpleDateFormat; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/HmacUtils.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/HmacUtils.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/HmacUtils.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/HmacUtils.java index 247789b..57df597 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/HmacUtils.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/HmacUtils.java @@ -1,4 +1,4 @@ -//package com.ruoyi.system.util; +//package com.tongran.system.util; // //import org.springframework.http.HttpEntity; //import org.springframework.http.HttpHeaders; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/PaginationUtil.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/PaginationUtil.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/PaginationUtil.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/PaginationUtil.java index f73eeac..1a76346 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/PaginationUtil.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/PaginationUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.util; +package com.tongran.system.util; import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/TableRouterUtil.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/TableRouterUtil.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/TableRouterUtil.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/TableRouterUtil.java index 41af916..f07ed52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/TableRouterUtil.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/TableRouterUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.util; +package com.tongran.system.util; import java.time.LocalDateTime; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/TrafficRedisHashUtil.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/TrafficRedisHashUtil.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/TrafficRedisHashUtil.java rename to tongran-modules/tongran-system/src/main/java/com/tongran/system/util/TrafficRedisHashUtil.java index 7aafaac..075c006 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/TrafficRedisHashUtil.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/util/TrafficRedisHashUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.util; +package com.tongran.system.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt b/tongran-modules/tongran-system/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/banner.txt rename to tongran-modules/tongran-system/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/tongran-modules/tongran-system/src/main/resources/bootstrap.yml similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml rename to tongran-modules/tongran-system/src/main/resources/bootstrap.yml index 241e7a5..6a603c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/tongran-modules/tongran-system/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-system + name: tongran-system profiles: # 环境配置 active: dev @@ -24,7 +24,8 @@ spring: # 配置中心地址 # server-addr: 172.16.15.103:8848 # namespace: public - namespace: saas-local + namespace: public +# namespace: saas-local username: nacos password: nacos # 配置文件格式 diff --git a/tongran-modules/tongran-system/src/main/resources/logback.xml b/tongran-modules/tongran-system/src/main/resources/logback.xml new file mode 100644 index 0000000..c5c96ec --- /dev/null +++ b/tongran-modules/tongran-system/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml index 0d278e9..120600a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessDeployMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessDeployMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessDeployMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessDeployMapper.xml index 7d1ea54..f65169d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessDeployMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessDeployMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessMapper.xml index 63c3033..24ac8c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessScriptMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessScriptMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessScriptMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessScriptMapper.xml index 5edd479..1cf6f85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessScriptMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsBusinessScriptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml index b95525a..c629ce8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml @@ -2,7 +2,7 @@ - + CREATE TABLE IF NOT EXISTS ${tableName} ( diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml index 522a95c..cf6fed3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsNodeBandwidthMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsNodeBandwidthMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsNodeBandwidthMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsNodeBandwidthMapper.xml index 2ef94d9..949d70a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsNodeBandwidthMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsNodeBandwidthMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsServerRevenueConfigMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsServerRevenueConfigMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsServerRevenueConfigMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsServerRevenueConfigMapper.xml index 8e01076..1076cd9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsServerRevenueConfigMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsServerRevenueConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsTaskStatisticsMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsTaskStatisticsMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsTaskStatisticsMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsTaskStatisticsMapper.xml index 1b7efe9..40399cd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsTaskStatisticsMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsTaskStatisticsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsTrafficDataMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsTrafficDataMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsTrafficDataMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/EpsTrafficDataMapper.xml index 6b2a91c..9bacf11 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsTrafficDataMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsTrafficDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml index 0f3d050..1e7f897 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KnowledgeBaseMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/KnowledgeBaseMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KnowledgeBaseMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/KnowledgeBaseMapper.xml index 6c3bc8d..2dd55e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KnowledgeBaseMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/KnowledgeBaseMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MtmMonitoringTemplateMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/MtmMonitoringTemplateMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MtmMonitoringTemplateMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/MtmMonitoringTemplateMapper.xml index 5396bfe..b7a4822 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MtmMonitoringTemplateMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/MtmMonitoringTemplateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmEpsTopologyManagementMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmEpsTopologyManagementMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmEpsTopologyManagementMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmEpsTopologyManagementMapper.xml index 3f297bc..8e6d6ce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmEpsTopologyManagementMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmEpsTopologyManagementMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmMonitorConfigDetailsMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmMonitorConfigDetailsMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmMonitorConfigDetailsMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmMonitorConfigDetailsMapper.xml index 6c3cb56..4605940 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmMonitorConfigDetailsMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmMonitorConfigDetailsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmMonitorConfigMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmMonitorConfigMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmMonitorConfigMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmMonitorConfigMapper.xml index f0a9ab0..83f9aa9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmMonitorConfigMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmMonitorConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml index 75c39e9..c81ea3b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceGroupMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceGroupMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceGroupMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceGroupMapper.xml index c22ee3b..b39040a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceGroupMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceGroupMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml index 0497fb5..aa4d319 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchInterfaceInfoMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmSwitchInterfaceInfoMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchInterfaceInfoMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmSwitchInterfaceInfoMapper.xml index 92abe63..4b33a59 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchInterfaceInfoMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmSwitchInterfaceInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml index f7dd8c3..c4ea811 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysConfigMapper.xml index 5cc3f58..673a3f2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysDeptMapper.xml index 058bf13..3a29924 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 3b94b7f..fbc259c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 438d484..1b3a960 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysLogininforMapper.xml index b0cec6b..9744714 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuClickMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysMenuClickMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuClickMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysMenuClickMapper.xml index 43e2c08..045f7f9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuClickMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysMenuClickMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysMenuMapper.xml index 84e87c9..5c3bd74 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 65d3079..8f2515f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 9942979..7eab014 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c459..9e4998c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139b..3cd849c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleMapper.xml index 955d4ee..7e60669 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a85..405bdac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserMapper.xml index 29c7ad5..d4c2911 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc4..086ed42 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd72689..8c7d472 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml rename to tongran-modules/tongran-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml index f5358e9..0826351 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/pom.xml b/tongran-rocketmq/pom.xml similarity index 91% rename from ruoyi-rocketmq/pom.xml rename to tongran-rocketmq/pom.xml index bd7246a..bbfff4b 100644 --- a/ruoyi-rocketmq/pom.xml +++ b/tongran-rocketmq/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + tongran + com.tongran 3.6.6 4.0.0 - ruoyi-rocketmq + tongran-rocketmq @@ -53,22 +53,22 @@ mysql-connector-j - + - com.ruoyi - ruoyi-common-log + com.tongran + tongran-common-log - + - com.ruoyi - ruoyi-common-swagger + com.tongran + tongran-common-swagger - com.ruoyi - ruoyi-common-security + com.tongran + tongran-common-security org.projectlombok diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/RocketMQApplication.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/RocketMQApplication.java similarity index 75% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/RocketMQApplication.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/RocketMQApplication.java index 1d565ab..5061b6d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/RocketMQApplication.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/RocketMQApplication.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq; +package com.tongran.rocketmq; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.tongran.common.security.annotation.EnableCustomConfig; +import com.tongran.common.security.annotation.EnableRyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; @@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableAsync; /** * 平台管理模块 * - * @author ruoyi + * @author tongran */ @EnableCustomConfig @EnableRyFeignClients diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/config/ConsumerConfig.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/config/ConsumerConfig.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/config/ConsumerConfig.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/config/ConsumerConfig.java index 0d1cd75..c6971ea 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/config/ConsumerConfig.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/config/ConsumerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.config; +package com.tongran.rocketmq.config; -import com.ruoyi.mtragent.consumer.RocketMsgListener; -import com.ruoyi.mtragent.enums.MessageTopic; -import com.ruoyi.mtragent.model.ConsumerMode; +import com.tongran.rocketmq.consumer.RocketMsgListener; +import com.tongran.rocketmq.enums.MessageTopic; +import com.tongran.rocketmq.model.ConsumerMode; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.exception.MQClientException; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/config/ProducerConfig.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/config/ProducerConfig.java similarity index 95% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/config/ProducerConfig.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/config/ProducerConfig.java index 89c3f79..38faf0d 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/config/ProducerConfig.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/config/ProducerConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.mtragent.config; +package com.tongran.rocketmq.config; -import com.ruoyi.mtragent.model.ProducerMode; +import com.tongran.rocketmq.model.ProducerMode; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.DefaultMQProducer; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgListener.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgListener.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgListener.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgListener.java index b7764b1..4bfa1aa 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgListener.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgListener.java @@ -1,11 +1,11 @@ -package com.ruoyi.rocketmq.consumer; +package com.tongran.rocketmq.consumer; import com.alibaba.fastjson.JSON; -import com.ruoyi.rocketmq.domain.DeviceMessage; -import com.ruoyi.rocketmq.enums.MessageCodeEnum; -import com.ruoyi.rocketmq.handler.DeviceMessageHandler; -import com.ruoyi.rocketmq.handler.MessageHandler; -import com.ruoyi.rocketmq.producer.ConsumeException; +import com.tongran.rocketmq.domain.DeviceMessage; +import com.tongran.rocketmq.enums.MessageCodeEnum; +import com.tongran.rocketmq.handler.DeviceMessageHandler; +import com.tongran.rocketmq.handler.MessageHandler; +import com.tongran.rocketmq.producer.ConsumeException; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgListenerHistory.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgListenerHistory.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgListenerHistory.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgListenerHistory.java index c85054e..67fbf8b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/consumer/RocketMsgListenerHistory.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgListenerHistory.java @@ -1,22 +1,22 @@ -//package com.ruoyi.rocketmq.consumer; +//package com.tongran.rocketmq.consumer; // //import com.alibaba.fastjson.JSON; -//import com.ruoyi.common.core.constant.SecurityConstants; -//import com.ruoyi.common.core.domain.R; -//import com.ruoyi.common.core.utils.DateUtils; -//import com.ruoyi.common.core.utils.StringUtils; -//import com.ruoyi.rocketmq.domain.*; -//import com.ruoyi.rocketmq.domain.vo.RspVo; -//import com.ruoyi.rocketmq.enums.MessageCodeEnum; -//import com.ruoyi.rocketmq.handler.DeviceMessageHandler; -//import com.ruoyi.rocketmq.producer.ConsumeException; -//import com.ruoyi.rocketmq.service.*; -//import com.ruoyi.rocketmq.utils.JsonDataParser; -//import com.ruoyi.system.api.RemoteRevenueConfigService; -//import com.ruoyi.system.api.domain.AllInterfaceNameRemote; -//import com.ruoyi.system.api.domain.EpsInitialTrafficDataRemote; -//import com.ruoyi.system.api.domain.InitialSwitchInfoDetailsRemote; -//import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +//import com.tongran.common.core.constant.SecurityConstants; +//import com.tongran.common.core.domain.R; +//import com.tongran.common.core.utils.DateUtils; +//import com.tongran.common.core.utils.StringUtils; +//import com.tongran.rocketmq.domain.*; +//import com.tongran.rocketmq.domain.vo.RspVo; +//import com.tongran.rocketmq.enums.MessageCodeEnum; +//import com.tongran.rocketmq.handler.DeviceMessageHandler; +//import com.tongran.rocketmq.producer.ConsumeException; +//import com.tongran.rocketmq.service.*; +//import com.tongran.rocketmq.utils.JsonDataParser; +//import com.tongran.system.api.RemoteRevenueConfigService; +//import com.tongran.system.api.domain.AllInterfaceNameRemote; +//import com.tongran.system.api.domain.EpsInitialTrafficDataRemote; +//import com.tongran.system.api.domain.InitialSwitchInfoDetailsRemote; +//import com.tongran.system.api.domain.RmResourceRegistrationRemote; //import lombok.extern.slf4j.Slf4j; //import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; //import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/consumer/RocketMsgTransactionListenerImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgTransactionListenerImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/consumer/RocketMsgTransactionListenerImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgTransactionListenerImpl.java index 0a594d1..c2239d1 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/consumer/RocketMsgTransactionListenerImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/consumer/RocketMsgTransactionListenerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.consumer; +package com.tongran.rocketmq.consumer; import org.apache.rocketmq.client.producer.LocalTransactionState; import org.apache.rocketmq.client.producer.TransactionListener; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialBandwidthTrafficController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java similarity index 88% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialBandwidthTrafficController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java index 328c541..4201ee8 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialBandwidthTrafficController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; -import com.ruoyi.rocketmq.service.IInitialBandwidthTrafficService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.service.IInitialBandwidthTrafficService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialBandwidthTrafficTempController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialBandwidthTrafficTempController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java index a7e5a7e..61f7def 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialBandwidthTrafficTempController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialBandwidthTrafficTemp; -import com.ruoyi.rocketmq.service.IInitialBandwidthTrafficTempService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialBandwidthTrafficTemp; +import com.tongran.rocketmq.service.IInitialBandwidthTrafficTempService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 初始带宽流量临时表Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialCpuInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialCpuInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java index 9e0cfc9..7e03400 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialCpuInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialCpuInfo; -import com.ruoyi.rocketmq.service.IInitialCpuInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialCpuInfo; +import com.tongran.rocketmq.service.IInitialCpuInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDiskInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDiskInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java index 8d584e3..1a8ed5f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDiskInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialDiskInfo; -import com.ruoyi.rocketmq.service.IInitialDiskInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialDiskInfo; +import com.tongran.rocketmq.service.IInitialDiskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDockerInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDockerInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java index 7d61458..c373708 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDockerInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialDockerInfo; -import com.ruoyi.rocketmq.service.IInitialDockerInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialDockerInfo; +import com.tongran.rocketmq.service.IInitialDockerInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialHeartbeatListenController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialHeartbeatListenController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialHeartbeatListenController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialHeartbeatListenController.java index 9f22043..3fc1d40 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialHeartbeatListenController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialHeartbeatListenController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListen; -import com.ruoyi.rocketmq.service.IInitialHeartbeatListenService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialHeartbeatListen; +import com.tongran.rocketmq.service.IInitialHeartbeatListenService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 心跳信息Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialHeartbeatListenLogController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialHeartbeatListenLogController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialHeartbeatListenLogController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialHeartbeatListenLogController.java index 9bc3417..53018f4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialHeartbeatListenLogController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialHeartbeatListenLogController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListenLog; -import com.ruoyi.rocketmq.service.IInitialHeartbeatListenLogService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialHeartbeatListenLog; +import com.tongran.rocketmq.service.IInitialHeartbeatListenLogService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 心跳信息日志Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialMemoryInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialMemoryInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java index 8bae1ed..66de015 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialMemoryInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialMemoryInfo; -import com.ruoyi.rocketmq.service.IInitialMemoryInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialMemoryInfo; +import com.tongran.rocketmq.service.IInitialMemoryInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialMountPointInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialMountPointInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java index a97f4df..dfc7825 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialMountPointInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialMountPointInfo; -import com.ruoyi.rocketmq.service.IInitialMountPointInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialMountPointInfo; +import com.tongran.rocketmq.service.IInitialMountPointInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialOtherSystemMonitorDataController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialOtherSystemMonitorDataController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialOtherSystemMonitorDataController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialOtherSystemMonitorDataController.java index 27ecbce..8333f7f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialOtherSystemMonitorDataController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialOtherSystemMonitorDataController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialOtherSystemMonitorData; -import com.ruoyi.rocketmq.service.IInitialOtherSystemMonitorDataService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialOtherSystemMonitorData; +import com.tongran.rocketmq.service.IInitialOtherSystemMonitorDataService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 系统其他信息监控数据Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchFanInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchFanInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java index 097ca31..d745648 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchFanInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchFanInfo; -import com.ruoyi.rocketmq.service.IInitialSwitchFanInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchFanInfo; +import com.tongran.rocketmq.service.IInitialSwitchFanInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java index b618565..9c0a5a9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; -import com.ruoyi.rocketmq.service.IInitialSwitchInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.service.IInitialSwitchInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoTempController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java similarity index 85% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoTempController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java index 770f39c..2b363f6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoTempController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchInfoTemp; -import com.ruoyi.rocketmq.service.IInitialSwitchInfoTempService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchInfoTemp; +import com.tongran.rocketmq.service.IInitialSwitchInfoTempService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 交换机监控信息Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchMpuInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchMpuInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java index cbd0982..5e66744 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchMpuInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchMpuInfo; -import com.ruoyi.rocketmq.service.IInitialSwitchMpuInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchMpuInfo; +import com.tongran.rocketmq.service.IInitialSwitchMpuInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOpticalModuleController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOpticalModuleController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java index 4a6bace..2d26aa0 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOpticalModuleController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchOpticalModule; -import com.ruoyi.rocketmq.service.IInitialSwitchOpticalModuleService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchOpticalModule; +import com.tongran.rocketmq.service.IInitialSwitchOpticalModuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java index 63f4271..ad0ded6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchOtherCollectData; -import com.ruoyi.rocketmq.service.IInitialSwitchOtherCollectDataService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchOtherCollectData; +import com.tongran.rocketmq.service.IInitialSwitchOtherCollectDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchPowerSupplyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchPowerSupplyController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java index f3fccf7..14e6971 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchPowerSupplyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSwitchPowerSupply; -import com.ruoyi.rocketmq.service.IInitialSwitchPowerSupplyService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSwitchPowerSupply; +import com.tongran.rocketmq.service.IInitialSwitchPowerSupplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSystemInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java similarity index 87% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSystemInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java index 04c2b0a..ffd526d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSystemInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java @@ -1,16 +1,16 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSystemInfo; -import com.ruoyi.rocketmq.domain.vo.SystemMsgVo; -import com.ruoyi.rocketmq.service.IInitialSystemInfoService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSystemInfo; +import com.tongran.rocketmq.domain.vo.SystemMsgVo; +import com.tongran.rocketmq.service.IInitialSystemInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSystemOtherCollectDataController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSystemOtherCollectDataController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java index 647671c..2305b01 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSystemOtherCollectDataController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.InitialSystemOtherCollectData; -import com.ruoyi.rocketmq.service.IInitialSystemOtherCollectDataService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.InitialSystemOtherCollectData; +import com.tongran.rocketmq.service.IInitialSystemOtherCollectDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAgentManagementController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java similarity index 83% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAgentManagementController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java index e2562f3..2f6b15f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAgentManagementController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAgentManagement; -import com.ruoyi.rocketmq.service.IRmAgentManagementService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAgentManagement; +import com.tongran.rocketmq.service.IRmAgentManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmLogController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java similarity index 83% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmLogController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java index e3f87df..71ef18d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmLogController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAlarmLog; -import com.ruoyi.rocketmq.service.IRmAlarmLogService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAlarmLog; +import com.tongran.rocketmq.service.IRmAlarmLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmPolicyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPolicyController.java similarity index 82% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmPolicyController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPolicyController.java index 0e096a5..7a6f82a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmPolicyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPolicyController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAlarmPolicy; -import com.ruoyi.rocketmq.service.IRmAlarmPolicyService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAlarmPolicy; +import com.tongran.rocketmq.service.IRmAlarmPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmPushConfigController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java similarity index 84% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmPushConfigController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java index 91d9777..8533700 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmPushConfigController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAlarmPushConfig; -import com.ruoyi.rocketmq.service.IRmAlarmPushConfigService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAlarmPushConfig; +import com.tongran.rocketmq.service.IRmAlarmPushConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRecordController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRecordController.java similarity index 77% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRecordController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRecordController.java index 0ee387a..3ac7fb4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRecordController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRecordController.java @@ -1,17 +1,17 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAlarmRecord; -import com.ruoyi.rocketmq.service.IRmAlarmRecordService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAlarmRecord; +import com.tongran.rocketmq.service.IRmAlarmRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRuleController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRuleController.java similarity index 84% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRuleController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRuleController.java index 6364e36..3678b95 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRuleController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRuleController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAlarmRule; -import com.ruoyi.rocketmq.service.IRmAlarmRuleService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAlarmRule; +import com.tongran.rocketmq.service.IRmAlarmRuleService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 告警规则Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRuleTemplateController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRuleTemplateController.java similarity index 74% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRuleTemplateController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRuleTemplateController.java index 6f5a14e..0f53fd0 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmAlarmRuleTemplateController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmRuleTemplateController.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmAlarmRuleTemplate; -import com.ruoyi.rocketmq.service.IRmAlarmRuleTemplateService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmAlarmRuleTemplate; +import com.tongran.rocketmq.service.IRmAlarmRuleTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmDeploymentPolicyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java similarity index 84% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmDeploymentPolicyController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java index c289c00..9698257 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmDeploymentPolicyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java @@ -1,17 +1,17 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmDeploymentPolicy; -import com.ruoyi.rocketmq.service.IRmDeploymentPolicyService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmDeploymentPolicy; +import com.tongran.rocketmq.service.IRmDeploymentPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmFileInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmFileInfoController.java similarity index 84% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmFileInfoController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmFileInfoController.java index 7e05485..80bdcf9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmFileInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmFileInfoController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmFileInfo; -import com.ruoyi.rocketmq.service.IRmFileInfoService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmFileInfo; +import com.tongran.rocketmq.service.IRmFileInfoService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 文件信息Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmInitialMonitorItemController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java similarity index 74% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmInitialMonitorItemController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java index d1dadfc..ea5bd6b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmInitialMonitorItemController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmInitialMonitorItem; -import com.ruoyi.rocketmq.service.IRmInitialMonitorItemService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmInitialMonitorItem; +import com.tongran.rocketmq.service.IRmInitialMonitorItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmMonitorPolicyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmMonitorPolicyController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java index decdcf5..c89f671 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmMonitorPolicyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java @@ -1,17 +1,17 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmMonitorPolicy; -import com.ruoyi.rocketmq.service.IRmMonitorPolicyService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmMonitorPolicy; +import com.tongran.rocketmq.service.IRmMonitorPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmMonitorTemplateController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java similarity index 83% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmMonitorTemplateController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java index 8807b01..0285aac 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmMonitorTemplateController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java @@ -1,16 +1,16 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmMonitorTemplate; -import com.ruoyi.rocketmq.domain.vo.RmMonitorTemplateVo; -import com.ruoyi.rocketmq.service.IRmMonitorTemplateService; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmMonitorTemplate; +import com.tongran.rocketmq.domain.vo.RmMonitorTemplateVo; +import com.tongran.rocketmq.service.IRmMonitorTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmNetworkInterfaceController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmNetworkInterfaceController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java index 888ea8d..8620eb5 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmNetworkInterfaceController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmNetworkInterface; -import com.ruoyi.rocketmq.service.IRmNetworkInterfaceService; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmNetworkInterface; +import com.tongran.rocketmq.service.IRmNetworkInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmPolicyDeviceDetailsController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmPolicyDeviceDetailsController.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmPolicyDeviceDetailsController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmPolicyDeviceDetailsController.java index cbf096c..ee9711b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmPolicyDeviceDetailsController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmPolicyDeviceDetailsController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmPolicyDeviceDetails; -import com.ruoyi.rocketmq.service.IRmPolicyDeviceDetailsService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmPolicyDeviceDetails; +import com.tongran.rocketmq.service.IRmPolicyDeviceDetailsService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 客户端策略关联Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmResourceRemoteController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java similarity index 76% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmResourceRemoteController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java index f188b9d..c0a54c8 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmResourceRemoteController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmResourceRemote; -import com.ruoyi.rocketmq.service.IRmResourceRemoteService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.PageDomain; +import com.tongran.common.core.web.page.TableDataInfo; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmResourceRemote; +import com.tongran.rocketmq.service.IRmResourceRemoteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmTemplateLinuxController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java similarity index 85% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmTemplateLinuxController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java index 9f282d9..dfb7107 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmTemplateLinuxController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmTemplateLinux; -import com.ruoyi.rocketmq.service.IRmTemplateLinuxService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmTemplateLinux; +import com.tongran.rocketmq.service.IRmTemplateLinuxService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * Linux系统监控项Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmTemplateSwitchController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java similarity index 85% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmTemplateSwitchController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java index 0100df0..61b0ac7 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmTemplateSwitchController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java @@ -1,7 +1,6 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.rocketmq.domain.RmTemplateSwitch; -import com.ruoyi.rocketmq.service.IRmTemplateSwitchService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.tongran.common.log.annotation.Log; +import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.rocketmq.domain.RmTemplateSwitch; +import com.tongran.rocketmq.service.IRmTemplateSwitchService; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.page.TableDataInfo; /** * 交换机监控模板Controller diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RocketMqController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RocketMqController.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RocketMqController.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RocketMqController.java index ebbe958..d7a9b0c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RocketMqController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RocketMqController.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.controller; +package com.tongran.rocketmq.controller; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.rocketmq.producer.MessageProducer; +import com.tongran.common.security.annotation.InnerAuth; +import com.tongran.rocketmq.producer.MessageProducer; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.Message; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/DeviceMessage.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/DeviceMessage.java similarity index 79% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/DeviceMessage.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/DeviceMessage.java index 2721a4b..909d989 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/DeviceMessage.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/DeviceMessage.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.rocketmq.domain; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialBandwidthTraffic.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialBandwidthTraffic.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java index 2d5ea20..715bf08 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialBandwidthTraffic.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialBandwidthTrafficTemp.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialBandwidthTrafficTemp.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java index 71fca9c..a413ab1 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialBandwidthTrafficTemp.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import java.math.BigDecimal; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 初始带宽流量临时表对象 initial_bandwidth_traffic_temp diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialCpuInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialCpuInfo.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialCpuInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialCpuInfo.java index 8ee76f3..e4eb6e9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialCpuInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialCpuInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialDiskInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialDiskInfo.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialDiskInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialDiskInfo.java index c0e1aec..0efad32 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialDiskInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialDiskInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialDockerInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialDockerInfo.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialDockerInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialDockerInfo.java index 4cdbb98..bdf15f3 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialDockerInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialDockerInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/InitialHeartbeatListen.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialHeartbeatListen.java similarity index 83% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/InitialHeartbeatListen.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialHeartbeatListen.java index d98fff6..d75fcc2 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/InitialHeartbeatListen.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialHeartbeatListen.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/InitialHeartbeatListenLog.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialHeartbeatListenLog.java similarity index 77% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/InitialHeartbeatListenLog.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialHeartbeatListenLog.java index d790eea..2167136 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/InitialHeartbeatListenLog.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialHeartbeatListenLog.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialMemoryInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialMemoryInfo.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialMemoryInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialMemoryInfo.java index 7b63d0e..118aa70 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialMemoryInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialMemoryInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialMountPointInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialMountPointInfo.java similarity index 88% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialMountPointInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialMountPointInfo.java index 82afdc3..09ce9e9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialMountPointInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialMountPointInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialOtherSystemMonitorData.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialOtherSystemMonitorData.java similarity index 98% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialOtherSystemMonitorData.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialOtherSystemMonitorData.java index 75b79da..3f59f07 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialOtherSystemMonitorData.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialOtherSystemMonitorData.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 系统其他信息监控数据对象 initial_other_system_monitor_data diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchFanInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchFanInfo.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchFanInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchFanInfo.java index 25a74fc..b30794c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchFanInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchFanInfo.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 风扇信息对象 initial_switch_fan_info diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchInfo.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchInfo.java index adba65c..7595e13 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchInfo.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfoTemp.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchInfoTemp.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfoTemp.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchInfoTemp.java index 02f68ba..06861de 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfoTemp.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchInfoTemp.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchMpuInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchMpuInfo.java similarity index 88% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchMpuInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchMpuInfo.java index 55cedf2..40ae616 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchMpuInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchMpuInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchOpticalModule.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchOpticalModule.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchOpticalModule.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchOpticalModule.java index 56bef93..1ebc195 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchOpticalModule.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchOpticalModule.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchOtherCollectData.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchOtherCollectData.java similarity index 83% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchOtherCollectData.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchOtherCollectData.java index 2643977..4a36b51 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchOtherCollectData.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchOtherCollectData.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchPowerSupply.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchPowerSupply.java similarity index 87% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchPowerSupply.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchPowerSupply.java index d3066f3..8069e73 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchPowerSupply.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSwitchPowerSupply.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSystemInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSystemInfo.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSystemInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSystemInfo.java index cb9302f..7c7505c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSystemInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSystemInfo.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSystemOtherCollectData.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSystemOtherCollectData.java similarity index 83% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSystemOtherCollectData.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSystemOtherCollectData.java index 437af68..57bfa56 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSystemOtherCollectData.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialSystemOtherCollectData.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/NetworkInfoDeserializer.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/NetworkInfoDeserializer.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/NetworkInfoDeserializer.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/NetworkInfoDeserializer.java index 59a42ef..3947ca8 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/NetworkInfoDeserializer.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/NetworkInfoDeserializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.system.api.domain.NetworkInfo; +import com.tongran.system.api.domain.NetworkInfo; import java.io.IOException; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAgentManagement.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAgentManagement.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java index 59d77a2..5fcc974 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAgentManagement.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAlarmLog.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmLog.java similarity index 86% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAlarmLog.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmLog.java index 2254022..4b67179 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/RmAlarmLog.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmLog.java @@ -1,8 +1,8 @@ -package com.ruoyi.mtragent.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmPolicy.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmPolicy.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmPolicy.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmPolicy.java index 73ce094..46f10d5 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmPolicy.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmPolicy.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmPushConfig.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmPushConfig.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmPushConfig.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmPushConfig.java index a155747..53660d8 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmPushConfig.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmPushConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRecord.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRecord.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRecord.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRecord.java index a8d6f33..43fb404 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRecord.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRule.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRule.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRule.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRule.java index 716be71..3f07f0f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRule.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRule.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRuleTemplate.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRuleTemplate.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRuleTemplate.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRuleTemplate.java index 417402d..d64c756 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAlarmRuleTemplate.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmRuleTemplate.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 告警规则模板对象 rm_alarm_rule_template diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmDeploymentPolicy.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmDeploymentPolicy.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmDeploymentPolicy.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmDeploymentPolicy.java index 7eb6624..a61732a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmDeploymentPolicy.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmDeploymentPolicy.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmFileInfo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmFileInfo.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmFileInfo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmFileInfo.java index dab6272..4121242 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmFileInfo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmFileInfo.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 文件信息对象 rm_file_info diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmInitialMonitorItem.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmInitialMonitorItem.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmInitialMonitorItem.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmInitialMonitorItem.java index f3de5ce..371c159 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmInitialMonitorItem.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmInitialMonitorItem.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmMonitorPolicy.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmMonitorPolicy.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmMonitorPolicy.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmMonitorPolicy.java index 6d96f3a..2d78fa8 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmMonitorPolicy.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmMonitorPolicy.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.rocketmq.domain.vo.RmMonitorPolicyVo; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; +import com.tongran.rocketmq.domain.vo.RmMonitorPolicyVo; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmMonitorTemplate.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmMonitorTemplate.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmMonitorTemplate.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmMonitorTemplate.java index 71a4883..ac93084 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmMonitorTemplate.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmMonitorTemplate.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmNetworkInterface.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmNetworkInterface.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmNetworkInterface.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmNetworkInterface.java index fbe46c9..10fa8fe 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmNetworkInterface.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmNetworkInterface.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmPolicyDeviceDetails.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmPolicyDeviceDetails.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmPolicyDeviceDetails.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmPolicyDeviceDetails.java index a8da7f5..917cc5c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmPolicyDeviceDetails.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmPolicyDeviceDetails.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; /** * 客户端策略关联对象 rm_policy_device_details diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmResourceRemote.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmResourceRemote.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java index abe0cd0..88bf943 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmResourceRemote.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmTemplateLinux.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmTemplateLinux.java similarity index 87% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmTemplateLinux.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmTemplateLinux.java index 3dfb723..dce3c81 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmTemplateLinux.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmTemplateLinux.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmTemplateSwitch.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmTemplateSwitch.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmTemplateSwitch.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmTemplateSwitch.java index c759678..35c65ca 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmTemplateSwitch.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmTemplateSwitch.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.domain; +package com.tongran.rocketmq.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.annotation.Excel; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateMsgVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AgentUpdateMsgVo.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateMsgVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AgentUpdateMsgVo.java index 7245f48..2442cab 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateMsgVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AgentUpdateMsgVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AgentUpdateVo.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AgentUpdateVo.java index a3ba97f..d75f32c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AgentUpdateVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AlarmVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AlarmVo.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AlarmVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AlarmVo.java index 135a61b..f0a379e 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AlarmVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/AlarmVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/CollectDataVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/CollectDataVo.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/CollectDataVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/CollectDataVo.java index 346578a..eb51209 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/CollectDataVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/CollectDataVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/CollectVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/CollectVo.java similarity index 84% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/CollectVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/CollectVo.java index 7e32653..b64a51c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/CollectVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/CollectVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/PolicyTypeVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/PolicyTypeVo.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/PolicyTypeVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/PolicyTypeVo.java index ad144a2..ec0a118 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/PolicyTypeVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/PolicyTypeVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/PolicyVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/PolicyVo.java similarity index 86% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/PolicyVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/PolicyVo.java index 33c3ac9..de473dc 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/PolicyVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/PolicyVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/RegisterMsgVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RegisterMsgVo.java similarity index 77% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/RegisterMsgVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RegisterMsgVo.java index b888ce9..485c361 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/RegisterMsgVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RegisterMsgVo.java @@ -1,9 +1,9 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.rocketmq.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.ruoyi.mtragent.domain.NetworkInfoDeserializer; -import com.ruoyi.system.api.domain.NetworkInfo; +import com.tongran.rocketmq.domain.NetworkInfoDeserializer; +import com.tongran.system.api.domain.NetworkInfo; import lombok.Data; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterSwitchVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RegisterSwitchVo.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterSwitchVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RegisterSwitchVo.java index 6521078..fb06a31 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterSwitchVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RegisterSwitchVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorPolicyVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RmMonitorPolicyVo.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorPolicyVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RmMonitorPolicyVo.java index 8ba8129..c037bb6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorPolicyVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RmMonitorPolicyVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorTemplateVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RmMonitorTemplateVo.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorTemplateVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RmMonitorTemplateVo.java index 89f512a..5f53d31 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorTemplateVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RmMonitorTemplateVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.tongran.common.core.web.domain.BaseEntity; import lombok.Data; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RspResultVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RspResultVo.java similarity index 84% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RspResultVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RspResultVo.java index 700f814..04cf206 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RspResultVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RspResultVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/RspVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RspVo.java similarity index 92% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/RspVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RspVo.java index a6f2227..10c8edd 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/domain/vo/RspVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/RspVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.domain.vo; +package com.tongran.rocketmq.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/ScriptPolicyVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/ScriptPolicyVo.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/ScriptPolicyVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/ScriptPolicyVo.java index 2ea6642..f30957a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/ScriptPolicyVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/ScriptPolicyVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/ServerScriptPolicyVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/ServerScriptPolicyVo.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/ServerScriptPolicyVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/ServerScriptPolicyVo.java index d7fa479..d961aaf 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/ServerScriptPolicyVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/ServerScriptPolicyVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SwitchOidVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/SwitchOidVo.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SwitchOidVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/SwitchOidVo.java index 239b7ae..87f4403 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SwitchOidVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/SwitchOidVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; import org.snmp4j.mp.SnmpConstants; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SystemMsgVo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/SystemMsgVo.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SystemMsgVo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/SystemMsgVo.java index a82d0b1..67fcb4a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SystemMsgVo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/vo/SystemMsgVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.domain.vo; +package com.tongran.rocketmq.domain.vo; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/AlarmTypeEnum.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/AlarmTypeEnum.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/AlarmTypeEnum.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/AlarmTypeEnum.java index b8783f7..7f06bdd 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/AlarmTypeEnum.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/AlarmTypeEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.enums; +package com.tongran.rocketmq.enums; import lombok.Getter; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MessageCodeEnum.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/MessageCodeEnum.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MessageCodeEnum.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/MessageCodeEnum.java index e1dd9a8..696c51f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MessageCodeEnum.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/MessageCodeEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.enums; +package com.tongran.rocketmq.enums; import lombok.Getter; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MessageTopic.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/MessageTopic.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MessageTopic.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/MessageTopic.java index 2bfa724..0e79481 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MessageTopic.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/MessageTopic.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.enums; +package com.tongran.rocketmq.enums; import java.util.ArrayList; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/PushMethodEnum.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/PushMethodEnum.java similarity index 88% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/PushMethodEnum.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/PushMethodEnum.java index 1087962..67e789b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/PushMethodEnum.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/PushMethodEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.enums; +package com.tongran.rocketmq.enums; import lombok.Getter; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/ServerLogoEnum.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/ServerLogoEnum.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/ServerLogoEnum.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/ServerLogoEnum.java index d9d262c..4e1226f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/ServerLogoEnum.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/ServerLogoEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.enums; +package com.tongran.rocketmq.enums; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/SwitchLogo.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/SwitchLogo.java similarity index 93% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/SwitchLogo.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/SwitchLogo.java index b4d3dfb..5f3c1ee 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/enums/SwitchLogo.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/enums/SwitchLogo.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.enums; +package com.tongran.rocketmq.enums; import lombok.Getter; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/DeviceMessageHandler.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/DeviceMessageHandler.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/DeviceMessageHandler.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/DeviceMessageHandler.java index 67b5dc0..c917000 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/DeviceMessageHandler.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/DeviceMessageHandler.java @@ -1,22 +1,22 @@ -package com.ruoyi.rocketmq.handler; +package com.tongran.rocketmq.handler; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.*; -import com.ruoyi.rocketmq.domain.vo.CollectDataVo; -import com.ruoyi.rocketmq.domain.vo.RspVo; -import com.ruoyi.rocketmq.service.*; -import com.ruoyi.rocketmq.utils.DataProcessUtil; -import com.ruoyi.rocketmq.utils.JsonDataParser; -import com.ruoyi.rocketmq.utils.SwitchJsonDataParser; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.EpsInitialTrafficDataRemote; -import com.ruoyi.system.api.domain.InitialSwitchInfoDetailsRemote; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.*; +import com.tongran.rocketmq.domain.vo.CollectDataVo; +import com.tongran.rocketmq.domain.vo.RspVo; +import com.tongran.rocketmq.service.*; +import com.tongran.rocketmq.utils.DataProcessUtil; +import com.tongran.rocketmq.utils.JsonDataParser; +import com.tongran.rocketmq.utils.SwitchJsonDataParser; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.EpsInitialTrafficDataRemote; +import com.tongran.system.api.domain.InitialSwitchInfoDetailsRemote; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java similarity index 98% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java index b1a2a0e..cd7c3ae 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java @@ -1,24 +1,24 @@ -package com.ruoyi.rocketmq.handler; +package com.tongran.rocketmq.handler; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.rocketmq.domain.*; -import com.ruoyi.rocketmq.domain.vo.CollectDataVo; -import com.ruoyi.rocketmq.domain.vo.RegisterMsgVo; -import com.ruoyi.rocketmq.domain.vo.RspResultVo; -import com.ruoyi.rocketmq.domain.vo.RspVo; -import com.ruoyi.rocketmq.enums.AlarmTypeEnum; -import com.ruoyi.rocketmq.enums.PushMethodEnum; -import com.ruoyi.rocketmq.service.*; -import com.ruoyi.rocketmq.utils.DataProcessUtil; -import com.ruoyi.rocketmq.utils.JsonDataParser; -import com.ruoyi.rocketmq.utils.WeChatWorkBot; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.*; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.rocketmq.domain.*; +import com.tongran.rocketmq.domain.vo.CollectDataVo; +import com.tongran.rocketmq.domain.vo.RegisterMsgVo; +import com.tongran.rocketmq.domain.vo.RspResultVo; +import com.tongran.rocketmq.domain.vo.RspVo; +import com.tongran.rocketmq.enums.AlarmTypeEnum; +import com.tongran.rocketmq.enums.PushMethodEnum; +import com.tongran.rocketmq.service.*; +import com.tongran.rocketmq.utils.DataProcessUtil; +import com.tongran.rocketmq.utils.JsonDataParser; +import com.tongran.rocketmq.utils.WeChatWorkBot; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialBandwidthTrafficMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialBandwidthTrafficMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialBandwidthTrafficMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialBandwidthTrafficMapper.java index ad13b23..5a05ee6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialBandwidthTrafficMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialBandwidthTrafficMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialBandwidthTrafficTempMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialBandwidthTrafficTempMapper.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialBandwidthTrafficTempMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialBandwidthTrafficTempMapper.java index c6af1bd..2eb1434 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialBandwidthTrafficTempMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialBandwidthTrafficTempMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; -import com.ruoyi.rocketmq.domain.InitialBandwidthTrafficTemp; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.domain.InitialBandwidthTrafficTemp; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialCpuInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialCpuInfoMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialCpuInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialCpuInfoMapper.java index ea5710f..95e30f7 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialCpuInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialCpuInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialCpuInfo; +import com.tongran.rocketmq.domain.InitialCpuInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDiskInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialDiskInfoMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDiskInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialDiskInfoMapper.java index 8690153..d14425b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDiskInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialDiskInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialDiskInfo; +import com.tongran.rocketmq.domain.InitialDiskInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDockerInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialDockerInfoMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDockerInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialDockerInfoMapper.java index bc0bd9b..4c52da3 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDockerInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialDockerInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialDockerInfo; +import com.tongran.rocketmq.domain.InitialDockerInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialHeartbeatListenLogMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialHeartbeatListenLogMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialHeartbeatListenLogMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialHeartbeatListenLogMapper.java index e520e01..0e26365 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialHeartbeatListenLogMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialHeartbeatListenLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListenLog; +import com.tongran.rocketmq.domain.InitialHeartbeatListenLog; /** * 心跳信息日志Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialHeartbeatListenMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialHeartbeatListenMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialHeartbeatListenMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialHeartbeatListenMapper.java index 136b5ef..3038c35 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialHeartbeatListenMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialHeartbeatListenMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListen; +import com.tongran.rocketmq.domain.InitialHeartbeatListen; /** * 心跳信息Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialMemoryInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialMemoryInfoMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialMemoryInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialMemoryInfoMapper.java index 9168636..a9272fd 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialMemoryInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialMemoryInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialMemoryInfo; +import com.tongran.rocketmq.domain.InitialMemoryInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialMountPointInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialMountPointInfoMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialMountPointInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialMountPointInfoMapper.java index 3a7e5ed..80a54ee 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialMountPointInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialMountPointInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialMountPointInfo; +import com.tongran.rocketmq.domain.InitialMountPointInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialOtherSystemMonitorDataMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialOtherSystemMonitorDataMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialOtherSystemMonitorDataMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialOtherSystemMonitorDataMapper.java index e1b1312..e7a18d4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialOtherSystemMonitorDataMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialOtherSystemMonitorDataMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.InitialOtherSystemMonitorData; +import com.tongran.rocketmq.domain.InitialOtherSystemMonitorData; /** * 系统其他信息监控数据Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchFanInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchFanInfoMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchFanInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchFanInfoMapper.java index f475e31..f487253 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchFanInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchFanInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchFanInfo; +import com.tongran.rocketmq.domain.InitialSwitchFanInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchInfoMapper.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchInfoMapper.java index 0b15e1b..0632998 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.domain.InitialSwitchInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoTempMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchInfoTempMapper.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoTempMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchInfoTempMapper.java index 4f25dba..4b9cd31 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoTempMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchInfoTempMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; -import com.ruoyi.rocketmq.domain.InitialSwitchInfoTemp; +import com.tongran.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.domain.InitialSwitchInfoTemp; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchMpuInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchMpuInfoMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchMpuInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchMpuInfoMapper.java index 78c8801..4da56c9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchMpuInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchMpuInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchMpuInfo; +import com.tongran.rocketmq.domain.InitialSwitchMpuInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOpticalModuleMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchOpticalModuleMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOpticalModuleMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchOpticalModuleMapper.java index 294422a..f8346ed 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOpticalModuleMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchOpticalModuleMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchOpticalModule; +import com.tongran.rocketmq.domain.InitialSwitchOpticalModule; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java index 5b58648..b17702b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchOtherCollectData; +import com.tongran.rocketmq.domain.InitialSwitchOtherCollectData; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchPowerSupplyMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchPowerSupplyMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchPowerSupplyMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchPowerSupplyMapper.java index 3c285b0..921501b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchPowerSupplyMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSwitchPowerSupplyMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSwitchPowerSupply; +import com.tongran.rocketmq.domain.InitialSwitchPowerSupply; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSystemInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemInfoMapper.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSystemInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemInfoMapper.java index a60619f..67c66e7 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSystemInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemInfoMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSystemInfo; -import com.ruoyi.rocketmq.domain.vo.SystemMsgVo; +import com.tongran.rocketmq.domain.InitialSystemInfo; +import com.tongran.rocketmq.domain.vo.SystemMsgVo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java index 4ad878f..e0b640e 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.InitialSystemOtherCollectData; +import com.tongran.rocketmq.domain.InitialSystemOtherCollectData; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAgentManagementMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAgentManagementMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAgentManagementMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAgentManagementMapper.java index 87ab37c..6bcaee6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAgentManagementMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAgentManagementMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmAgentManagement; +import com.tongran.rocketmq.domain.RmAgentManagement; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmLogMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmLogMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmLogMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmLogMapper.java index 25d1768..6540946 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmLogMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmLog; +import com.tongran.rocketmq.domain.RmAlarmLog; /** * 客户端告警信息Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmPolicyMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmPolicyMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmPolicyMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmPolicyMapper.java index 94ee5a3..bc855c4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmPolicyMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmPolicyMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmPolicy; +import com.tongran.rocketmq.domain.RmAlarmPolicy; /** * 告警策略Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmPushConfigMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmPushConfigMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmPushConfigMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmPushConfigMapper.java index 38962ce..ef1e950 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmPushConfigMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmPushConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmPushConfig; +import com.tongran.rocketmq.domain.RmAlarmPushConfig; /** * 告警推送配置Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRecordMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRecordMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRecordMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRecordMapper.java index 2bc9140..6093748 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRecordMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRecordMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmRecord; +import com.tongran.rocketmq.domain.RmAlarmRecord; /** * 告警记录Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRuleMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRuleMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRuleMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRuleMapper.java index 9f0f32e..17ffc32 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRuleMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRuleMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmAlarmRule; +import com.tongran.rocketmq.domain.RmAlarmRule; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRuleTemplateMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRuleTemplateMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRuleTemplateMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRuleTemplateMapper.java index cf41a8d..2d27ec7 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmAlarmRuleTemplateMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmAlarmRuleTemplateMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmRuleTemplate; +import com.tongran.rocketmq.domain.RmAlarmRuleTemplate; /** * 告警规则模板Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmDeploymentPolicyMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmDeploymentPolicyMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmDeploymentPolicyMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmDeploymentPolicyMapper.java index e30b706..4a5738b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmDeploymentPolicyMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmDeploymentPolicyMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmDeploymentPolicy; +import com.tongran.rocketmq.domain.RmDeploymentPolicy; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmFileInfoMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmFileInfoMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmFileInfoMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmFileInfoMapper.java index ec842e6..9ac0417 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmFileInfoMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmFileInfoMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmFileInfo; +import com.tongran.rocketmq.domain.RmFileInfo; /** * 文件信息Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmInitialMonitorItemMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmInitialMonitorItemMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmInitialMonitorItemMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmInitialMonitorItemMapper.java index f281199..4381b6c 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmInitialMonitorItemMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmInitialMonitorItemMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmInitialMonitorItem; +import com.tongran.rocketmq.domain.RmInitialMonitorItem; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmMonitorPolicyMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmMonitorPolicyMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmMonitorPolicyMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmMonitorPolicyMapper.java index 553185c..ae486ec 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmMonitorPolicyMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmMonitorPolicyMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmMonitorPolicy; +import com.tongran.rocketmq.domain.RmMonitorPolicy; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmMonitorTemplateMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmMonitorTemplateMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmMonitorTemplateMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmMonitorTemplateMapper.java index 92a862a..a0db95e 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmMonitorTemplateMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmMonitorTemplateMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmMonitorTemplate; +import com.tongran.rocketmq.domain.RmMonitorTemplate; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmNetworkInterfaceMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmNetworkInterfaceMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmNetworkInterfaceMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmNetworkInterfaceMapper.java index c2027a0..bc05beb 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmNetworkInterfaceMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmNetworkInterfaceMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmNetworkInterface; +import com.tongran.rocketmq.domain.RmNetworkInterface; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmPolicyDeviceDetailsMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmPolicyDeviceDetailsMapper.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmPolicyDeviceDetailsMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmPolicyDeviceDetailsMapper.java index 2a5dce4..cc3098f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmPolicyDeviceDetailsMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmPolicyDeviceDetailsMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmPolicyDeviceDetails; +import com.tongran.rocketmq.domain.RmPolicyDeviceDetails; /** * 客户端策略关联Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmResourceRemoteMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmResourceRemoteMapper.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmResourceRemoteMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmResourceRemoteMapper.java index fc955c7..7502bf8 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmResourceRemoteMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmResourceRemoteMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; import java.util.List; -import com.ruoyi.rocketmq.domain.RmResourceRemote; +import com.tongran.rocketmq.domain.RmResourceRemote; /** * 资源远程管理Mapper接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmTemplateLinuxMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmTemplateLinuxMapper.java index 7b04c40..c01bd13 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmTemplateLinuxMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmTemplateLinux; +import com.tongran.rocketmq.domain.RmTemplateLinux; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmTemplateSwitchMapper.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmTemplateSwitchMapper.java index bd1bcdf..e036273 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/RmTemplateSwitchMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.mapper; +package com.tongran.rocketmq.mapper; -import com.ruoyi.rocketmq.domain.RmTemplateSwitch; +import com.tongran.rocketmq.domain.RmTemplateSwitch; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/model/ConsumerMode.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/model/ConsumerMode.java similarity index 96% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/model/ConsumerMode.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/model/ConsumerMode.java index fbb4fc7..0d75f97 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/model/ConsumerMode.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/model/ConsumerMode.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.model; +package com.tongran.rocketmq.model; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/model/ProducerMode.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/model/ProducerMode.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/model/ProducerMode.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/model/ProducerMode.java index 5d5f769..a4851cc 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/model/ProducerMode.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/model/ProducerMode.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.model; +package com.tongran.rocketmq.model; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/producer/ConsumeException.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/producer/ConsumeException.java similarity index 94% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/producer/ConsumeException.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/producer/ConsumeException.java index 4ff7081..522bf45 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/producer/ConsumeException.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/producer/ConsumeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.producer; +package com.tongran.rocketmq.producer; /** * @author 影子 diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/producer/MessageProducer.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/producer/MessageProducer.java similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/producer/MessageProducer.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/producer/MessageProducer.java index 9fbe92d..1508a6f 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/producer/MessageProducer.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/producer/MessageProducer.java @@ -1,7 +1,7 @@ -package com.ruoyi.mtragent.producer; +package com.tongran.rocketmq.producer; import com.alibaba.fastjson.JSON; -import com.ruoyi.mtragent.consumer.RocketMsgTransactionListenerImpl; +import com.tongran.rocketmq.consumer.RocketMsgTransactionListenerImpl; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; @@ -19,8 +19,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import static com.ruoyi.mtragent.config.ProducerConfig.producer; - +import static com.tongran.rocketmq.config.ProducerConfig.producer; /** * 消息发送 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialBandwidthTrafficService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialBandwidthTrafficService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java index f41380a..6755740 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialBandwidthTrafficService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialBandwidthTrafficTempService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficTempService.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialBandwidthTrafficTempService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficTempService.java index 68c344e..dd93311 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialBandwidthTrafficTempService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficTempService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; -import com.ruoyi.rocketmq.domain.InitialBandwidthTrafficTemp; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.domain.InitialBandwidthTrafficTemp; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialCpuInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialCpuInfoService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialCpuInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialCpuInfoService.java index 550c20b..7f97f37 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialCpuInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialCpuInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialCpuInfo; +import com.tongran.rocketmq.domain.InitialCpuInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDiskInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialDiskInfoService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDiskInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialDiskInfoService.java index 1347152..9a96a82 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDiskInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialDiskInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialDiskInfo; +import com.tongran.rocketmq.domain.InitialDiskInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDockerInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialDockerInfoService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDockerInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialDockerInfoService.java index ba0c946..34df7fd 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDockerInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialDockerInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialDockerInfo; +import com.tongran.rocketmq.domain.InitialDockerInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialHeartbeatListenLogService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialHeartbeatListenLogService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialHeartbeatListenLogService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialHeartbeatListenLogService.java index 34ecb12..210515a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialHeartbeatListenLogService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialHeartbeatListenLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListenLog; +import com.tongran.rocketmq.domain.InitialHeartbeatListenLog; /** * 心跳信息日志Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialHeartbeatListenService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialHeartbeatListenService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialHeartbeatListenService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialHeartbeatListenService.java index 6ab0002..93f995b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialHeartbeatListenService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialHeartbeatListenService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListen; +import com.tongran.rocketmq.domain.InitialHeartbeatListen; /** * 心跳信息Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialMemoryInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialMemoryInfoService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialMemoryInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialMemoryInfoService.java index 5676732..b121045 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialMemoryInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialMemoryInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialMemoryInfo; +import com.tongran.rocketmq.domain.InitialMemoryInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialMountPointInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialMountPointInfoService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialMountPointInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialMountPointInfoService.java index 46432ea..8da0c5e 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialMountPointInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialMountPointInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialMountPointInfo; +import com.tongran.rocketmq.domain.InitialMountPointInfo; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialOtherSystemMonitorDataService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialOtherSystemMonitorDataService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialOtherSystemMonitorDataService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialOtherSystemMonitorDataService.java index 4811ec7..998a158 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialOtherSystemMonitorDataService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialOtherSystemMonitorDataService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.InitialOtherSystemMonitorData; +import com.tongran.rocketmq.domain.InitialOtherSystemMonitorData; /** * 系统其他信息监控数据Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchFanInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchFanInfoService.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchFanInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchFanInfoService.java index 7885153..3d98252 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchFanInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchFanInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchFanInfo; +import com.tongran.rocketmq.domain.InitialSwitchFanInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchInfoService.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchInfoService.java index 6272afa..90526d0 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.domain.InitialSwitchInfo; import java.util.Date; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoTempService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchInfoTempService.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoTempService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchInfoTempService.java index 8143d19..42bcb6d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoTempService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchInfoTempService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; -import com.ruoyi.rocketmq.domain.InitialSwitchInfoTemp; +import com.tongran.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.domain.InitialSwitchInfoTemp; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchMpuInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchMpuInfoService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchMpuInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchMpuInfoService.java index 9f4b0b7..56ba369 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchMpuInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchMpuInfoService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchMpuInfo; +import com.tongran.rocketmq.domain.InitialSwitchMpuInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOpticalModuleService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchOpticalModuleService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOpticalModuleService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchOpticalModuleService.java index 3c0494b..00529f5 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOpticalModuleService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchOpticalModuleService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchOpticalModule; +import com.tongran.rocketmq.domain.InitialSwitchOpticalModule; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchOtherCollectDataService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchOtherCollectDataService.java index d0b0786..853af79 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchOtherCollectDataService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchOtherCollectData; +import com.tongran.rocketmq.domain.InitialSwitchOtherCollectData; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchPowerSupplyService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchPowerSupplyService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchPowerSupplyService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchPowerSupplyService.java index 9d6385d..a94da71 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchPowerSupplyService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSwitchPowerSupplyService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSwitchPowerSupply; +import com.tongran.rocketmq.domain.InitialSwitchPowerSupply; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSystemInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSystemInfoService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSystemInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSystemInfoService.java index de69790..d45e8ac 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSystemInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSystemInfoService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSystemInfo; -import com.ruoyi.rocketmq.domain.vo.SystemMsgVo; +import com.tongran.rocketmq.domain.InitialSystemInfo; +import com.tongran.rocketmq.domain.vo.SystemMsgVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSystemOtherCollectDataService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSystemOtherCollectDataService.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSystemOtherCollectDataService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSystemOtherCollectDataService.java index ae67a34..972e9e4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSystemOtherCollectDataService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialSystemOtherCollectDataService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.InitialSystemOtherCollectData; +import com.tongran.rocketmq.domain.InitialSystemOtherCollectData; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAgentManagementService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAgentManagementService.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAgentManagementService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAgentManagementService.java index 301a9bf..60bf5dc 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAgentManagementService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAgentManagementService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmAgentManagement; +import com.tongran.rocketmq.domain.RmAgentManagement; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmLogService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmLogService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmLogService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmLogService.java index 4d5c95a..9a5c7e0 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmLogService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmLog; +import com.tongran.rocketmq.domain.RmAlarmLog; /** * 客户端告警信息Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmPolicyService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmPolicyService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmPolicyService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmPolicyService.java index 25a5573..c3950a1 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmPolicyService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmPolicyService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmAlarmPolicy; +import com.tongran.rocketmq.domain.RmAlarmPolicy; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmPushConfigService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmPushConfigService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmPushConfigService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmPushConfigService.java index f558ade..8418311 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmPushConfigService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmPushConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmPushConfig; +import com.tongran.rocketmq.domain.RmAlarmPushConfig; /** * 告警推送配置Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRecordService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRecordService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRecordService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRecordService.java index 64c1246..c7f9018 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRecordService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; import java.util.Map; -import com.ruoyi.rocketmq.domain.RmAlarmRecord; +import com.tongran.rocketmq.domain.RmAlarmRecord; /** * 告警记录Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRuleService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRuleService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRuleService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRuleService.java index 4c2bdd2..a52f915 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRuleService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRuleService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmRule; +import com.tongran.rocketmq.domain.RmAlarmRule; /** * 告警规则Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRuleTemplateService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRuleTemplateService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRuleTemplateService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRuleTemplateService.java index cd91dc0..fb4dad1 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmAlarmRuleTemplateService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmAlarmRuleTemplateService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmAlarmRuleTemplate; +import com.tongran.rocketmq.domain.RmAlarmRuleTemplate; /** * 告警规则模板Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmDeploymentPolicyService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmDeploymentPolicyService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmDeploymentPolicyService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmDeploymentPolicyService.java index aafc980..62b1360 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmDeploymentPolicyService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmDeploymentPolicyService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmDeploymentPolicy; +import com.tongran.rocketmq.domain.RmDeploymentPolicy; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmFileInfoService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmFileInfoService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmFileInfoService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmFileInfoService.java index 149be96..9e46269 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmFileInfoService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmFileInfoService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmFileInfo; +import com.tongran.rocketmq.domain.RmFileInfo; /** * 文件信息Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmInitialMonitorItemService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmInitialMonitorItemService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmInitialMonitorItemService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmInitialMonitorItemService.java index ea7ed10..808c471 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmInitialMonitorItemService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmInitialMonitorItemService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmInitialMonitorItem; +import com.tongran.rocketmq.domain.RmInitialMonitorItem; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmMonitorPolicyService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmMonitorPolicyService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmMonitorPolicyService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmMonitorPolicyService.java index 9066ffd..58e583d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmMonitorPolicyService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmMonitorPolicyService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmMonitorPolicy; +import com.tongran.rocketmq.domain.RmMonitorPolicy; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmMonitorTemplateService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmMonitorTemplateService.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmMonitorTemplateService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmMonitorTemplateService.java index 1451a7c..51265f9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmMonitorTemplateService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmMonitorTemplateService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmMonitorTemplate; -import com.ruoyi.rocketmq.domain.vo.RmMonitorTemplateVo; +import com.tongran.rocketmq.domain.RmMonitorTemplate; +import com.tongran.rocketmq.domain.vo.RmMonitorTemplateVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmNetworkInterfaceService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmNetworkInterfaceService.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmNetworkInterfaceService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmNetworkInterfaceService.java index 07fe9f8..c7bd19b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmNetworkInterfaceService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmNetworkInterfaceService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmNetworkInterface; +import com.tongran.rocketmq.domain.RmNetworkInterface; import java.util.List; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmPolicyDeviceDetailsService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmPolicyDeviceDetailsService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmPolicyDeviceDetailsService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmPolicyDeviceDetailsService.java index 437175a..f4ddebc 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmPolicyDeviceDetailsService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmPolicyDeviceDetailsService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmPolicyDeviceDetails; +import com.tongran.rocketmq.domain.RmPolicyDeviceDetails; /** * 客户端策略关联Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmResourceRemoteService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmResourceRemoteService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java index e0559b6..c0f9502 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmResourceRemoteService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java @@ -1,6 +1,6 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; -import com.ruoyi.rocketmq.domain.RmResourceRemote; +import com.tongran.rocketmq.domain.RmResourceRemote; import java.util.List; import java.util.Map; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmTemplateLinuxService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmTemplateLinuxService.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmTemplateLinuxService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmTemplateLinuxService.java index 81ca41f..95eb537 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmTemplateLinuxService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmTemplateLinuxService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmTemplateLinux; +import com.tongran.rocketmq.domain.RmTemplateLinux; /** * Linux系统监控项Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmTemplateSwitchService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmTemplateSwitchService.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmTemplateSwitchService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmTemplateSwitchService.java index 6e5096f..8faff62 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmTemplateSwitchService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmTemplateSwitchService.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.service; +package com.tongran.rocketmq.service; import java.util.List; -import com.ruoyi.rocketmq.domain.RmTemplateSwitch; +import com.tongran.rocketmq.domain.RmTemplateSwitch; /** * 交换机监控模板Service接口 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java index 32548ab..012fc99 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.SpeedUtils; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; -import com.ruoyi.rocketmq.mapper.InitialBandwidthTrafficMapper; -import com.ruoyi.rocketmq.service.IInitialBandwidthTrafficService; -import com.ruoyi.rocketmq.utils.TableRouterUtil; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.SpeedUtils; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.mapper.InitialBandwidthTrafficMapper; +import com.tongran.rocketmq.service.IInitialBandwidthTrafficService; +import com.tongran.rocketmq.utils.TableRouterUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialBandwidthTrafficTempServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficTempServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialBandwidthTrafficTempServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficTempServiceImpl.java index 0c558e6..8f34481 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialBandwidthTrafficTempServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficTempServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.InitialBandwidthTraffic; -import com.ruoyi.rocketmq.domain.InitialBandwidthTrafficTemp; -import com.ruoyi.rocketmq.mapper.InitialBandwidthTrafficTempMapper; -import com.ruoyi.rocketmq.service.IInitialBandwidthTrafficTempService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.InitialBandwidthTraffic; +import com.tongran.rocketmq.domain.InitialBandwidthTrafficTemp; +import com.tongran.rocketmq.mapper.InitialBandwidthTrafficTempMapper; +import com.tongran.rocketmq.service.IInitialBandwidthTrafficTempService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialCpuInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialCpuInfoServiceImpl.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialCpuInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialCpuInfoServiceImpl.java index e29b381..d2ba11a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialCpuInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialCpuInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialCpuInfo; -import com.ruoyi.rocketmq.mapper.InitialCpuInfoMapper; -import com.ruoyi.rocketmq.service.IInitialCpuInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialCpuInfo; +import com.tongran.rocketmq.mapper.InitialCpuInfoMapper; +import com.tongran.rocketmq.service.IInitialCpuInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import static com.ruoyi.common.core.utils.EchartsDataUtils.convertMicrosecondsToSeconds; +import static com.tongran.common.core.utils.EchartsDataUtils.convertMicrosecondsToSeconds; /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDiskInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDiskInfoServiceImpl.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDiskInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDiskInfoServiceImpl.java index ee566d1..b918292 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDiskInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDiskInfoServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.UnitChangeUtil; -import com.ruoyi.rocketmq.domain.InitialDiskInfo; -import com.ruoyi.rocketmq.mapper.InitialDiskInfoMapper; -import com.ruoyi.rocketmq.service.IInitialDiskInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.UnitChangeUtil; +import com.tongran.rocketmq.domain.InitialDiskInfo; +import com.tongran.rocketmq.mapper.InitialDiskInfoMapper; +import com.tongran.rocketmq.service.IInitialDiskInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDockerInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDockerInfoServiceImpl.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDockerInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDockerInfoServiceImpl.java index 7351f1a..8cfa56f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDockerInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDockerInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialDockerInfo; -import com.ruoyi.rocketmq.mapper.InitialDockerInfoMapper; -import com.ruoyi.rocketmq.service.IInitialDockerInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialDockerInfo; +import com.tongran.rocketmq.mapper.InitialDockerInfoMapper; +import com.tongran.rocketmq.service.IInitialDockerInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialHeartbeatListenLogServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialHeartbeatListenLogServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialHeartbeatListenLogServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialHeartbeatListenLogServiceImpl.java index f16329f..6d344f6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialHeartbeatListenLogServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialHeartbeatListenLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.InitialHeartbeatListenLogMapper; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListenLog; -import com.ruoyi.rocketmq.service.IInitialHeartbeatListenLogService; +import com.tongran.rocketmq.mapper.InitialHeartbeatListenLogMapper; +import com.tongran.rocketmq.domain.InitialHeartbeatListenLog; +import com.tongran.rocketmq.service.IInitialHeartbeatListenLogService; /** * 心跳信息日志Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialHeartbeatListenServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialHeartbeatListenServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialHeartbeatListenServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialHeartbeatListenServiceImpl.java index 7780ccc..f05574b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialHeartbeatListenServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialHeartbeatListenServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.InitialHeartbeatListenMapper; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListen; -import com.ruoyi.rocketmq.service.IInitialHeartbeatListenService; +import com.tongran.rocketmq.mapper.InitialHeartbeatListenMapper; +import com.tongran.rocketmq.domain.InitialHeartbeatListen; +import com.tongran.rocketmq.service.IInitialHeartbeatListenService; /** * 心跳信息Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialMemoryInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialMemoryInfoServiceImpl.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialMemoryInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialMemoryInfoServiceImpl.java index a9d4e6d..314c316 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialMemoryInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialMemoryInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialMemoryInfo; -import com.ruoyi.rocketmq.mapper.InitialMemoryInfoMapper; -import com.ruoyi.rocketmq.service.IInitialMemoryInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialMemoryInfo; +import com.tongran.rocketmq.mapper.InitialMemoryInfoMapper; +import com.tongran.rocketmq.service.IInitialMemoryInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialMountPointInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialMountPointInfoServiceImpl.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialMountPointInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialMountPointInfoServiceImpl.java index eefc68a..e9b12f4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialMountPointInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialMountPointInfoServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.UnitChangeUtil; -import com.ruoyi.rocketmq.domain.InitialMountPointInfo; -import com.ruoyi.rocketmq.mapper.InitialMountPointInfoMapper; -import com.ruoyi.rocketmq.service.IInitialMountPointInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.UnitChangeUtil; +import com.tongran.rocketmq.domain.InitialMountPointInfo; +import com.tongran.rocketmq.mapper.InitialMountPointInfoMapper; +import com.tongran.rocketmq.service.IInitialMountPointInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialOtherSystemMonitorDataServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialOtherSystemMonitorDataServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialOtherSystemMonitorDataServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialOtherSystemMonitorDataServiceImpl.java index 57788a1..0c0db26 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialOtherSystemMonitorDataServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialOtherSystemMonitorDataServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.InitialOtherSystemMonitorData; -import com.ruoyi.rocketmq.mapper.InitialOtherSystemMonitorDataMapper; -import com.ruoyi.rocketmq.service.IInitialOtherSystemMonitorDataService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.InitialOtherSystemMonitorData; +import com.tongran.rocketmq.mapper.InitialOtherSystemMonitorDataMapper; +import com.tongran.rocketmq.service.IInitialOtherSystemMonitorDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchFanInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchFanInfoServiceImpl.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchFanInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchFanInfoServiceImpl.java index 27f9239..c5027a6 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchFanInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchFanInfoServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.InitialSwitchFanInfo; -import com.ruoyi.rocketmq.mapper.InitialSwitchFanInfoMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchFanInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.InitialSwitchFanInfo; +import com.tongran.rocketmq.mapper.InitialSwitchFanInfoMapper; +import com.tongran.rocketmq.service.IInitialSwitchFanInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java index 8fc256c..18b7543 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.*; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; -import com.ruoyi.rocketmq.mapper.InitialSwitchInfoMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchInfoService; -import com.ruoyi.system.api.RemoteRevenueConfigService; +import com.tongran.common.core.utils.*; +import com.tongran.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.mapper.InitialSwitchInfoMapper; +import com.tongran.rocketmq.service.IInitialSwitchInfoService; +import com.tongran.system.api.RemoteRevenueConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoTempServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoTempServiceImpl.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoTempServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoTempServiceImpl.java index cb157c9..91d9bbd 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoTempServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoTempServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.InitialSwitchInfo; -import com.ruoyi.rocketmq.domain.InitialSwitchInfoTemp; -import com.ruoyi.rocketmq.mapper.InitialSwitchInfoTempMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchInfoTempService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.InitialSwitchInfo; +import com.tongran.rocketmq.domain.InitialSwitchInfoTemp; +import com.tongran.rocketmq.mapper.InitialSwitchInfoTempMapper; +import com.tongran.rocketmq.service.IInitialSwitchInfoTempService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchMpuInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchMpuInfoServiceImpl.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchMpuInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchMpuInfoServiceImpl.java index 7d5559e..5a2d623 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchMpuInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchMpuInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialSwitchMpuInfo; -import com.ruoyi.rocketmq.mapper.InitialSwitchMpuInfoMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchMpuInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialSwitchMpuInfo; +import com.tongran.rocketmq.mapper.InitialSwitchMpuInfoMapper; +import com.tongran.rocketmq.service.IInitialSwitchMpuInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOpticalModuleServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchOpticalModuleServiceImpl.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOpticalModuleServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchOpticalModuleServiceImpl.java index c583ed4..7a5c53f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOpticalModuleServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchOpticalModuleServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialSwitchOpticalModule; -import com.ruoyi.rocketmq.mapper.InitialSwitchOpticalModuleMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchOpticalModuleService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialSwitchOpticalModule; +import com.tongran.rocketmq.mapper.InitialSwitchOpticalModuleMapper; +import com.tongran.rocketmq.service.IInitialSwitchOpticalModuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java index 5a4c211..09bc993 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialSwitchOtherCollectData; -import com.ruoyi.rocketmq.enums.SwitchLogo; -import com.ruoyi.rocketmq.mapper.InitialSwitchOtherCollectDataMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchOtherCollectDataService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialSwitchOtherCollectData; +import com.tongran.rocketmq.enums.SwitchLogo; +import com.tongran.rocketmq.mapper.InitialSwitchOtherCollectDataMapper; +import com.tongran.rocketmq.service.IInitialSwitchOtherCollectDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchPowerSupplyServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchPowerSupplyServiceImpl.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchPowerSupplyServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchPowerSupplyServiceImpl.java index a73f089..6fcfa2f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchPowerSupplyServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchPowerSupplyServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialSwitchPowerSupply; -import com.ruoyi.rocketmq.mapper.InitialSwitchPowerSupplyMapper; -import com.ruoyi.rocketmq.service.IInitialSwitchPowerSupplyService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialSwitchPowerSupply; +import com.tongran.rocketmq.mapper.InitialSwitchPowerSupplyMapper; +import com.tongran.rocketmq.service.IInitialSwitchPowerSupplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSystemInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSystemInfoServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSystemInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSystemInfoServiceImpl.java index 8f01102..3d6f30b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSystemInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSystemInfoServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.rocketmq.domain.InitialCpuInfo; -import com.ruoyi.rocketmq.domain.InitialMemoryInfo; -import com.ruoyi.rocketmq.domain.InitialSystemInfo; -import com.ruoyi.rocketmq.domain.vo.SystemMsgVo; -import com.ruoyi.rocketmq.mapper.InitialCpuInfoMapper; -import com.ruoyi.rocketmq.mapper.InitialMemoryInfoMapper; -import com.ruoyi.rocketmq.mapper.InitialSystemInfoMapper; -import com.ruoyi.rocketmq.service.IInitialSystemInfoService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.rocketmq.domain.InitialCpuInfo; +import com.tongran.rocketmq.domain.InitialMemoryInfo; +import com.tongran.rocketmq.domain.InitialSystemInfo; +import com.tongran.rocketmq.domain.vo.SystemMsgVo; +import com.tongran.rocketmq.mapper.InitialCpuInfoMapper; +import com.tongran.rocketmq.mapper.InitialMemoryInfoMapper; +import com.tongran.rocketmq.mapper.InitialSystemInfoMapper; +import com.tongran.rocketmq.service.IInitialSystemInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSystemOtherCollectDataServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSystemOtherCollectDataServiceImpl.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSystemOtherCollectDataServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSystemOtherCollectDataServiceImpl.java index b12007a..f43388b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSystemOtherCollectDataServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSystemOtherCollectDataServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.EchartsDataUtils; -import com.ruoyi.common.core.utils.UnitChangeUtil; -import com.ruoyi.rocketmq.domain.InitialCpuInfo; -import com.ruoyi.rocketmq.domain.InitialSystemOtherCollectData; -import com.ruoyi.rocketmq.enums.ServerLogoEnum; -import com.ruoyi.rocketmq.mapper.InitialCpuInfoMapper; -import com.ruoyi.rocketmq.mapper.InitialSystemOtherCollectDataMapper; -import com.ruoyi.rocketmq.service.IInitialSystemOtherCollectDataService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.EchartsDataUtils; +import com.tongran.common.core.utils.UnitChangeUtil; +import com.tongran.rocketmq.domain.InitialCpuInfo; +import com.tongran.rocketmq.domain.InitialSystemOtherCollectData; +import com.tongran.rocketmq.enums.ServerLogoEnum; +import com.tongran.rocketmq.mapper.InitialCpuInfoMapper; +import com.tongran.rocketmq.mapper.InitialSystemOtherCollectDataMapper; +import com.tongran.rocketmq.service.IInitialSystemOtherCollectDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAgentManagementServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAgentManagementServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java index e1743b8..f8b40f4 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAgentManagementServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.DeviceMessage; -import com.ruoyi.rocketmq.domain.RmAgentManagement; -import com.ruoyi.rocketmq.domain.RmNetworkInterface; -import com.ruoyi.rocketmq.domain.vo.AgentUpdateMsgVo; -import com.ruoyi.rocketmq.domain.vo.AgentUpdateVo; -import com.ruoyi.rocketmq.domain.vo.PolicyTypeVo; -import com.ruoyi.rocketmq.domain.vo.PolicyVo; -import com.ruoyi.rocketmq.mapper.RmAgentManagementMapper; -import com.ruoyi.rocketmq.mapper.RmNetworkInterfaceMapper; -import com.ruoyi.rocketmq.model.ProducerMode; -import com.ruoyi.rocketmq.producer.MessageProducer; -import com.ruoyi.rocketmq.service.IRmAgentManagementService; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.DeviceMessage; +import com.tongran.rocketmq.domain.RmAgentManagement; +import com.tongran.rocketmq.domain.RmNetworkInterface; +import com.tongran.rocketmq.domain.vo.AgentUpdateMsgVo; +import com.tongran.rocketmq.domain.vo.AgentUpdateVo; +import com.tongran.rocketmq.domain.vo.PolicyTypeVo; +import com.tongran.rocketmq.domain.vo.PolicyVo; +import com.tongran.rocketmq.mapper.RmAgentManagementMapper; +import com.tongran.rocketmq.mapper.RmNetworkInterfaceMapper; +import com.tongran.rocketmq.model.ProducerMode; +import com.tongran.rocketmq.producer.MessageProducer; +import com.tongran.rocketmq.service.IRmAgentManagementService; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmLogServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmLogServiceImpl.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmLogServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmLogServiceImpl.java index ca28f83..22ad49f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmLogServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmAlarmLogMapper; -import com.ruoyi.rocketmq.domain.RmAlarmLog; -import com.ruoyi.rocketmq.service.IRmAlarmLogService; +import com.tongran.rocketmq.mapper.RmAlarmLogMapper; +import com.tongran.rocketmq.domain.RmAlarmLog; +import com.tongran.rocketmq.service.IRmAlarmLogService; /** * 客户端告警信息Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java index 69c7242..1fe0698 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.DeviceMessage; -import com.ruoyi.rocketmq.domain.RmAlarmPolicy; -import com.ruoyi.rocketmq.domain.RmAlarmRule; -import com.ruoyi.rocketmq.domain.vo.AlarmVo; -import com.ruoyi.rocketmq.mapper.RmAlarmPolicyMapper; -import com.ruoyi.rocketmq.mapper.RmAlarmRuleMapper; -import com.ruoyi.rocketmq.model.ProducerMode; -import com.ruoyi.rocketmq.producer.MessageProducer; -import com.ruoyi.rocketmq.service.IRmAlarmPolicyService; -import com.ruoyi.rocketmq.utils.DataProcessUtil; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.DeviceMessage; +import com.tongran.rocketmq.domain.RmAlarmPolicy; +import com.tongran.rocketmq.domain.RmAlarmRule; +import com.tongran.rocketmq.domain.vo.AlarmVo; +import com.tongran.rocketmq.mapper.RmAlarmPolicyMapper; +import com.tongran.rocketmq.mapper.RmAlarmRuleMapper; +import com.tongran.rocketmq.model.ProducerMode; +import com.tongran.rocketmq.producer.MessageProducer; +import com.tongran.rocketmq.service.IRmAlarmPolicyService; +import com.tongran.rocketmq.utils.DataProcessUtil; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPushConfigServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmPushConfigServiceImpl.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPushConfigServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmPushConfigServiceImpl.java index 0390bcc..b6d185b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPushConfigServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmPushConfigServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmAlarmPushConfigMapper; -import com.ruoyi.rocketmq.domain.RmAlarmPushConfig; -import com.ruoyi.rocketmq.service.IRmAlarmPushConfigService; +import com.tongran.rocketmq.mapper.RmAlarmPushConfigMapper; +import com.tongran.rocketmq.domain.RmAlarmPushConfig; +import com.tongran.rocketmq.service.IRmAlarmPushConfigService; /** * 告警推送配置Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRecordServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRecordServiceImpl.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRecordServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRecordServiceImpl.java index a4d8617..91e3bce 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRecordServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRecordServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.RmAlarmRecord; -import com.ruoyi.rocketmq.mapper.RmAlarmRecordMapper; -import com.ruoyi.rocketmq.service.IRmAlarmRecordService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.RmAlarmRecord; +import com.tongran.rocketmq.mapper.RmAlarmRecordMapper; +import com.tongran.rocketmq.service.IRmAlarmRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRuleServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRuleServiceImpl.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRuleServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRuleServiceImpl.java index 57f17af..d5f5e32 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRuleServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRuleServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmAlarmRuleMapper; -import com.ruoyi.rocketmq.domain.RmAlarmRule; -import com.ruoyi.rocketmq.service.IRmAlarmRuleService; +import com.tongran.rocketmq.mapper.RmAlarmRuleMapper; +import com.tongran.rocketmq.domain.RmAlarmRule; +import com.tongran.rocketmq.service.IRmAlarmRuleService; /** * 告警规则Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRuleTemplateServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRuleTemplateServiceImpl.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRuleTemplateServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRuleTemplateServiceImpl.java index 3d4ac59..967608b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmRuleTemplateServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAlarmRuleTemplateServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmAlarmRuleTemplateMapper; -import com.ruoyi.rocketmq.domain.RmAlarmRuleTemplate; -import com.ruoyi.rocketmq.service.IRmAlarmRuleTemplateService; +import com.tongran.rocketmq.mapper.RmAlarmRuleTemplateMapper; +import com.tongran.rocketmq.domain.RmAlarmRuleTemplate; +import com.tongran.rocketmq.service.IRmAlarmRuleTemplateService; /** * 告警规则模板Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmDeploymentPolicyServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmDeploymentPolicyServiceImpl.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmDeploymentPolicyServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmDeploymentPolicyServiceImpl.java index db854ab..d3b63bf 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmDeploymentPolicyServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmDeploymentPolicyServiceImpl.java @@ -1,27 +1,27 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.rocketmq.domain.DeviceMessage; -import com.ruoyi.rocketmq.domain.RmDeploymentPolicy; -import com.ruoyi.rocketmq.domain.RmResourceRemote; -import com.ruoyi.rocketmq.domain.vo.PolicyTypeVo; -import com.ruoyi.rocketmq.domain.vo.PolicyVo; -import com.ruoyi.rocketmq.domain.vo.ScriptPolicyVo; -import com.ruoyi.rocketmq.domain.vo.ServerScriptPolicyVo; -import com.ruoyi.rocketmq.mapper.RmDeploymentPolicyMapper; -import com.ruoyi.rocketmq.mapper.RmResourceRemoteMapper; -import com.ruoyi.rocketmq.model.ProducerMode; -import com.ruoyi.rocketmq.producer.MessageProducer; -import com.ruoyi.rocketmq.service.IRmDeploymentPolicyService; -import com.ruoyi.rocketmq.utils.DataProcessUtil; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.rocketmq.domain.DeviceMessage; +import com.tongran.rocketmq.domain.RmDeploymentPolicy; +import com.tongran.rocketmq.domain.RmResourceRemote; +import com.tongran.rocketmq.domain.vo.PolicyTypeVo; +import com.tongran.rocketmq.domain.vo.PolicyVo; +import com.tongran.rocketmq.domain.vo.ScriptPolicyVo; +import com.tongran.rocketmq.domain.vo.ServerScriptPolicyVo; +import com.tongran.rocketmq.mapper.RmDeploymentPolicyMapper; +import com.tongran.rocketmq.mapper.RmResourceRemoteMapper; +import com.tongran.rocketmq.model.ProducerMode; +import com.tongran.rocketmq.producer.MessageProducer; +import com.tongran.rocketmq.service.IRmDeploymentPolicyService; +import com.tongran.rocketmq.utils.DataProcessUtil; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmFileInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmFileInfoServiceImpl.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmFileInfoServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmFileInfoServiceImpl.java index e0da6b7..b7ab7ef 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmFileInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmFileInfoServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmFileInfoMapper; -import com.ruoyi.rocketmq.domain.RmFileInfo; -import com.ruoyi.rocketmq.service.IRmFileInfoService; +import com.tongran.rocketmq.mapper.RmFileInfoMapper; +import com.tongran.rocketmq.domain.RmFileInfo; +import com.tongran.rocketmq.service.IRmFileInfoService; /** * 文件信息Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmInitialMonitorItemServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmInitialMonitorItemServiceImpl.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmInitialMonitorItemServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmInitialMonitorItemServiceImpl.java index 0da9836..5cf1b92 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmInitialMonitorItemServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmInitialMonitorItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.RmInitialMonitorItem; -import com.ruoyi.rocketmq.mapper.RmInitialMonitorItemMapper; -import com.ruoyi.rocketmq.service.IRmInitialMonitorItemService; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.RmInitialMonitorItem; +import com.tongran.rocketmq.mapper.RmInitialMonitorItemMapper; +import com.tongran.rocketmq.service.IRmInitialMonitorItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java index 786b3a7..d46d24a 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java @@ -1,23 +1,23 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.rocketmq.domain.*; -import com.ruoyi.rocketmq.domain.vo.*; -import com.ruoyi.rocketmq.mapper.*; -import com.ruoyi.rocketmq.model.ProducerMode; -import com.ruoyi.rocketmq.producer.MessageProducer; -import com.ruoyi.rocketmq.service.IRmMonitorPolicyService; -import com.ruoyi.rocketmq.snmp.scheduler.MultiSwitchCollectionScheduler; -import com.ruoyi.rocketmq.utils.DataProcessUtil; -import com.ruoyi.rocketmq.utils.FieldNameConverterUtil; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; -import com.ruoyi.system.api.domain.RmSwitchManagementRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.common.security.utils.SecurityUtils; +import com.tongran.rocketmq.domain.*; +import com.tongran.rocketmq.domain.vo.*; +import com.tongran.rocketmq.mapper.*; +import com.tongran.rocketmq.model.ProducerMode; +import com.tongran.rocketmq.producer.MessageProducer; +import com.tongran.rocketmq.service.IRmMonitorPolicyService; +import com.tongran.rocketmq.snmp.scheduler.MultiSwitchCollectionScheduler; +import com.tongran.rocketmq.utils.DataProcessUtil; +import com.tongran.rocketmq.utils.FieldNameConverterUtil; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.system.api.domain.RmSwitchManagementRemote; import lombok.extern.slf4j.Slf4j; import org.snmp4j.mp.SnmpConstants; import org.snmp4j.security.SecurityLevel; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java index 2a8cb06..94123fe 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.RmInitialMonitorItem; -import com.ruoyi.rocketmq.domain.RmMonitorTemplate; -import com.ruoyi.rocketmq.domain.RmTemplateLinux; -import com.ruoyi.rocketmq.domain.RmTemplateSwitch; -import com.ruoyi.rocketmq.domain.vo.RmMonitorTemplateVo; -import com.ruoyi.rocketmq.mapper.RmInitialMonitorItemMapper; -import com.ruoyi.rocketmq.mapper.RmMonitorTemplateMapper; -import com.ruoyi.rocketmq.mapper.RmTemplateLinuxMapper; -import com.ruoyi.rocketmq.mapper.RmTemplateSwitchMapper; -import com.ruoyi.rocketmq.service.IRmMonitorTemplateService; -import com.ruoyi.rocketmq.utils.DataProcessUtil; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.RmInitialMonitorItem; +import com.tongran.rocketmq.domain.RmMonitorTemplate; +import com.tongran.rocketmq.domain.RmTemplateLinux; +import com.tongran.rocketmq.domain.RmTemplateSwitch; +import com.tongran.rocketmq.domain.vo.RmMonitorTemplateVo; +import com.tongran.rocketmq.mapper.RmInitialMonitorItemMapper; +import com.tongran.rocketmq.mapper.RmMonitorTemplateMapper; +import com.tongran.rocketmq.mapper.RmTemplateLinuxMapper; +import com.tongran.rocketmq.mapper.RmTemplateSwitchMapper; +import com.tongran.rocketmq.service.IRmMonitorTemplateService; +import com.tongran.rocketmq.utils.DataProcessUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java similarity index 91% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java index eb14aca..0386818 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.DeviceMessage; -import com.ruoyi.rocketmq.domain.RmNetworkInterface; -import com.ruoyi.rocketmq.domain.vo.PolicyTypeVo; -import com.ruoyi.rocketmq.mapper.RmNetworkInterfaceMapper; -import com.ruoyi.rocketmq.model.ProducerMode; -import com.ruoyi.rocketmq.producer.MessageProducer; -import com.ruoyi.rocketmq.service.IRmNetworkInterfaceService; -import com.ruoyi.system.api.domain.RouteMsg; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.DeviceMessage; +import com.tongran.rocketmq.domain.RmNetworkInterface; +import com.tongran.rocketmq.domain.vo.PolicyTypeVo; +import com.tongran.rocketmq.mapper.RmNetworkInterfaceMapper; +import com.tongran.rocketmq.model.ProducerMode; +import com.tongran.rocketmq.producer.MessageProducer; +import com.tongran.rocketmq.service.IRmNetworkInterfaceService; +import com.tongran.system.api.domain.RouteMsg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmPolicyDeviceDetailsServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmPolicyDeviceDetailsServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmPolicyDeviceDetailsServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmPolicyDeviceDetailsServiceImpl.java index eac0674..8de359d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmPolicyDeviceDetailsServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmPolicyDeviceDetailsServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmPolicyDeviceDetailsMapper; -import com.ruoyi.rocketmq.domain.RmPolicyDeviceDetails; -import com.ruoyi.rocketmq.service.IRmPolicyDeviceDetailsService; +import com.tongran.rocketmq.mapper.RmPolicyDeviceDetailsMapper; +import com.tongran.rocketmq.domain.RmPolicyDeviceDetails; +import com.tongran.rocketmq.service.IRmPolicyDeviceDetailsService; /** * 客户端策略关联Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmResourceRemoteServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java similarity index 92% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmResourceRemoteServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java index 1725d6c..b0b2c4b 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmResourceRemoteServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.RmResourceRemote; -import com.ruoyi.rocketmq.mapper.RmResourceRemoteMapper; -import com.ruoyi.rocketmq.service.IRmResourceRemoteService; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.RmResourceRemote; +import com.tongran.rocketmq.mapper.RmResourceRemoteMapper; +import com.tongran.rocketmq.service.IRmResourceRemoteService; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmTemplateLinuxServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmTemplateLinuxServiceImpl.java similarity index 89% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmTemplateLinuxServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmTemplateLinuxServiceImpl.java index 7bd5658..458ae24 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmTemplateLinuxServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmTemplateLinuxServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmTemplateLinuxMapper; -import com.ruoyi.rocketmq.domain.RmTemplateLinux; -import com.ruoyi.rocketmq.service.IRmTemplateLinuxService; +import com.tongran.rocketmq.mapper.RmTemplateLinuxMapper; +import com.tongran.rocketmq.domain.RmTemplateLinux; +import com.tongran.rocketmq.service.IRmTemplateLinuxService; /** * Linux系统监控项Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmTemplateSwitchServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmTemplateSwitchServiceImpl.java similarity index 90% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmTemplateSwitchServiceImpl.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmTemplateSwitchServiceImpl.java index 37c2067..7444613 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmTemplateSwitchServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmTemplateSwitchServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.rocketmq.service.impl; +package com.tongran.rocketmq.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; +import com.tongran.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.rocketmq.mapper.RmTemplateSwitchMapper; -import com.ruoyi.rocketmq.domain.RmTemplateSwitch; -import com.ruoyi.rocketmq.service.IRmTemplateSwitchService; +import com.tongran.rocketmq.mapper.RmTemplateSwitchMapper; +import com.tongran.rocketmq.domain.RmTemplateSwitch; +import com.tongran.rocketmq.service.IRmTemplateSwitchService; /** * 交换机监控模板Service业务层处理 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/DynamicOidCollector.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/DynamicOidCollector.java similarity index 99% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/DynamicOidCollector.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/DynamicOidCollector.java index 8e6b5e2..c9fa804 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/DynamicOidCollector.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/DynamicOidCollector.java @@ -1,8 +1,8 @@ -package com.ruoyi.rocketmq.snmp; +package com.tongran.rocketmq.snmp; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.rocketmq.snmp.dto.CollectionResult; -import com.ruoyi.rocketmq.snmp.dto.SwitchOidDto; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.rocketmq.snmp.dto.CollectionResult; +import com.tongran.rocketmq.snmp.dto.SwitchOidDto; import lombok.extern.slf4j.Slf4j; import org.snmp4j.*; import org.snmp4j.event.ResponseEvent; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/config/SchedulerConfig.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/config/SchedulerConfig.java similarity index 95% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/config/SchedulerConfig.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/config/SchedulerConfig.java index 56d89d8..4702b6f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/config/SchedulerConfig.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/config/SchedulerConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.snmp.config; +package com.tongran.rocketmq.snmp.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/config/SwitchStrategyInitializer.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/config/SwitchStrategyInitializer.java similarity index 93% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/config/SwitchStrategyInitializer.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/config/SwitchStrategyInitializer.java index b0c11c5..ff47104 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/config/SwitchStrategyInitializer.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/config/SwitchStrategyInitializer.java @@ -1,7 +1,7 @@ -package com.ruoyi.rocketmq.snmp.config; +package com.tongran.rocketmq.snmp.config; -import com.ruoyi.rocketmq.domain.RmMonitorPolicy; -import com.ruoyi.rocketmq.service.IRmMonitorPolicyService; +import com.tongran.rocketmq.domain.RmMonitorPolicy; +import com.tongran.rocketmq.service.IRmMonitorPolicyService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/dto/CollectionResult.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/dto/CollectionResult.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/dto/CollectionResult.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/dto/CollectionResult.java index 2ac1da2..c63e4ba 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/dto/CollectionResult.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/dto/CollectionResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.snmp.dto; +package com.tongran.rocketmq.snmp.dto; import lombok.Data; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/dto/SwitchOidDto.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/dto/SwitchOidDto.java similarity index 98% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/dto/SwitchOidDto.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/dto/SwitchOidDto.java index b8f5089..87eee06 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/dto/SwitchOidDto.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/dto/SwitchOidDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.snmp.dto; +package com.tongran.rocketmq.snmp.dto; import lombok.Data; import org.snmp4j.mp.SnmpConstants; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java similarity index 98% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java index 040f394..ae57f18 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java @@ -1,16 +1,16 @@ -package com.ruoyi.rocketmq.snmp.scheduler; +package com.tongran.rocketmq.snmp.scheduler; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.enums.MsgEnum; -import com.ruoyi.rocketmq.domain.DeviceMessage; -import com.ruoyi.rocketmq.domain.InitialHeartbeatListen; -import com.ruoyi.rocketmq.domain.vo.CollectVo; -import com.ruoyi.rocketmq.domain.vo.SwitchOidVo; -import com.ruoyi.rocketmq.producer.MessageProducer; -import com.ruoyi.rocketmq.snmp.DynamicOidCollector; -import com.ruoyi.rocketmq.snmp.dto.CollectionResult; -import com.ruoyi.rocketmq.snmp.dto.SwitchOidDto; -import com.ruoyi.rocketmq.snmp.service.ProcessSwitchCollectDataService; +import com.tongran.common.core.enums.MsgEnum; +import com.tongran.rocketmq.domain.DeviceMessage; +import com.tongran.rocketmq.domain.InitialHeartbeatListen; +import com.tongran.rocketmq.domain.vo.CollectVo; +import com.tongran.rocketmq.domain.vo.SwitchOidVo; +import com.tongran.rocketmq.producer.MessageProducer; +import com.tongran.rocketmq.snmp.DynamicOidCollector; +import com.tongran.rocketmq.snmp.dto.CollectionResult; +import com.tongran.rocketmq.snmp.dto.SwitchOidDto; +import com.tongran.rocketmq.snmp.service.ProcessSwitchCollectDataService; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.snmp4j.mp.SnmpConstants; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/service/ProcessSwitchCollectDataService.java similarity index 96% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/service/ProcessSwitchCollectDataService.java index 477c2f5..87a1415 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/service/ProcessSwitchCollectDataService.java @@ -1,17 +1,17 @@ -package com.ruoyi.rocketmq.snmp.service; +package com.tongran.rocketmq.snmp.service; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.rocketmq.domain.*; -import com.ruoyi.rocketmq.domain.vo.CollectDataVo; -import com.ruoyi.rocketmq.service.*; -import com.ruoyi.rocketmq.snmp.dto.CollectionResult; -import com.ruoyi.rocketmq.utils.SwitchJsonDataParser; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.InitialSwitchInfoDetailsRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.utils.DateUtils; +import com.tongran.rocketmq.domain.*; +import com.tongran.rocketmq.domain.vo.CollectDataVo; +import com.tongran.rocketmq.service.*; +import com.tongran.rocketmq.snmp.dto.CollectionResult; +import com.tongran.rocketmq.utils.SwitchJsonDataParser; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.InitialSwitchInfoDetailsRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/DataProcessUtil.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java similarity index 94% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/DataProcessUtil.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java index 2049f3c..2e267aa 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/DataProcessUtil.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java @@ -1,16 +1,16 @@ -package com.ruoyi.rocketmq.utils; +package com.tongran.rocketmq.utils; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.rocketmq.domain.RmTemplateLinux; -import com.ruoyi.rocketmq.domain.RmTemplateSwitch; -import com.ruoyi.rocketmq.mapper.RmTemplateLinuxMapper; -import com.ruoyi.rocketmq.mapper.RmTemplateSwitchMapper; -import com.ruoyi.system.api.RemoteRevenueConfigService; -import com.ruoyi.system.api.domain.RmResourceGroupRemote; -import com.ruoyi.system.api.domain.RmResourceRegistrationRemote; -import com.ruoyi.system.api.domain.RmSwitchManagementRemote; +import com.tongran.common.core.constant.SecurityConstants; +import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.StringUtils; +import com.tongran.rocketmq.domain.RmTemplateLinux; +import com.tongran.rocketmq.domain.RmTemplateSwitch; +import com.tongran.rocketmq.mapper.RmTemplateLinuxMapper; +import com.tongran.rocketmq.mapper.RmTemplateSwitchMapper; +import com.tongran.system.api.RemoteRevenueConfigService; +import com.tongran.system.api.domain.RmResourceGroupRemote; +import com.tongran.system.api.domain.RmResourceRegistrationRemote; +import com.tongran.system.api.domain.RmSwitchManagementRemote; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/FieldNameConverterUtil.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/FieldNameConverterUtil.java similarity index 99% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/FieldNameConverterUtil.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/FieldNameConverterUtil.java index 2e9cb81..348bd56 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/FieldNameConverterUtil.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/FieldNameConverterUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.utils; +package com.tongran.rocketmq.utils; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/JsonDataParser.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/JsonDataParser.java similarity index 97% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/JsonDataParser.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/JsonDataParser.java index ba3c92c..09b095f 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/JsonDataParser.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/JsonDataParser.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.utils; +package com.tongran.rocketmq.utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/SwitchJsonDataParser.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SwitchJsonDataParser.java similarity index 99% rename from ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/SwitchJsonDataParser.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SwitchJsonDataParser.java index 6a448e0..f9aa987 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/SwitchJsonDataParser.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SwitchJsonDataParser.java @@ -1,4 +1,4 @@ -package com.ruoyi.rocketmq.utils; +package com.tongran.rocketmq.utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/TableRouterUtil.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/TableRouterUtil.java similarity index 98% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/TableRouterUtil.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/TableRouterUtil.java index 4ed00c6..e97ecfe 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/TableRouterUtil.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/TableRouterUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.utils; +package com.tongran.rocketmq.utils; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/WeChatWorkBot.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/WeChatWorkBot.java similarity index 99% rename from ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/WeChatWorkBot.java rename to tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/WeChatWorkBot.java index 0bfca31..f9e5a26 100644 --- a/ruoyi-modules/ruoyi-mtragent/src/main/java/com/ruoyi/mtragent/utils/WeChatWorkBot.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/WeChatWorkBot.java @@ -1,4 +1,4 @@ -package com.ruoyi.mtragent.utils; +package com.tongran.rocketmq.utils; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ruoyi-rocketmq/src/main/resources/bootstrap.yml b/tongran-rocketmq/src/main/resources/bootstrap.yml similarity index 88% rename from ruoyi-rocketmq/src/main/resources/bootstrap.yml rename to tongran-rocketmq/src/main/resources/bootstrap.yml index a1366de..2c101a9 100644 --- a/ruoyi-rocketmq/src/main/resources/bootstrap.yml +++ b/tongran-rocketmq/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-rocketmq + name: tongran-rocketmq profiles: # 环境配置 active: dev @@ -23,8 +23,8 @@ spring: # 配置中心地址 server-addr: 172.16.15.52:8848 # server-addr: 172.16.15.103:8848 - namespace: saas-local -# namespace: public +# namespace: saas-local + namespace: public username: nacos password: nacos # 配置文件格式 @@ -38,7 +38,7 @@ spring: address: redis://localhost:6379 logging: level: - com.ruoyi.app.mapper: DEBUG + com.tongran.app.mapper: DEBUG diff --git a/ruoyi-rocketmq/src/main/resources/logback.xml b/tongran-rocketmq/src/main/resources/logback.xml similarity index 95% rename from ruoyi-rocketmq/src/main/resources/logback.xml rename to tongran-rocketmq/src/main/resources/logback.xml index 0128aed..a76ae2a 100644 --- a/ruoyi-rocketmq/src/main/resources/logback.xml +++ b/tongran-rocketmq/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml index b97613b..d20ce9a 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml index c1902c3..9630b04 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialCpuInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialCpuInfoMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialCpuInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialCpuInfoMapper.xml index 9b55a80..31d2b4a 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialCpuInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialCpuInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml index 7d469c5..ce0fe37 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml index 7439eb3..4e3869f 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenLogMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenLogMapper.xml similarity index 97% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenLogMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenLogMapper.xml index 01f4898..932e012 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenLogMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenMapper.xml similarity index 97% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenMapper.xml index a7dcca9..38ba823 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialHeartbeatListenMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryInfoMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryInfoMapper.xml index a0e7ffc..464d59f 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialMountPointInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMountPointInfoMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialMountPointInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMountPointInfoMapper.xml index 2d0be25..3d60514 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialMountPointInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMountPointInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialOtherSystemMonitorDataMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialOtherSystemMonitorDataMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialOtherSystemMonitorDataMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialOtherSystemMonitorDataMapper.xml index 24cd68f..ef15728 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialOtherSystemMonitorDataMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialOtherSystemMonitorDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchFanInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchFanInfoMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchFanInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchFanInfoMapper.xml index 64d8972..da5628b 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchFanInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchFanInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml index 2f0e3d7..d993887 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoTempMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoTempMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoTempMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoTempMapper.xml index 8352154..f81996d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoTempMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoTempMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchMpuInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchMpuInfoMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchMpuInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchMpuInfoMapper.xml index d39bd8a..ad8944d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchMpuInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchMpuInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOpticalModuleMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOpticalModuleMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOpticalModuleMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOpticalModuleMapper.xml index 32d8250..a2d8e8d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOpticalModuleMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOpticalModuleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml index 67adb1c..934e24a 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchPowerSupplyMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchPowerSupplyMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchPowerSupplyMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchPowerSupplyMapper.xml index 1515fdf..3e4fc26 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchPowerSupplyMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchPowerSupplyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemInfoMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemInfoMapper.xml index 644325a..3ab0cb6 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml index 93626e6..c23234d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAgentManagementMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAgentManagementMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAgentManagementMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAgentManagementMapper.xml index 946cb24..7429bc7 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAgentManagementMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAgentManagementMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmLogMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmLogMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmLogMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmLogMapper.xml index c8fc58f..ed4032c 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmLogMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPolicyMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPolicyMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPolicyMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPolicyMapper.xml index a99c87a..69c53ce 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPolicyMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPolicyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPushConfigMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPushConfigMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPushConfigMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPushConfigMapper.xml index f7a7386..100face 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPushConfigMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmPushConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRecordMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRecordMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRecordMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRecordMapper.xml index e7dac71..ea6bf0d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRecordMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleMapper.xml index 1e3dc66..8d54ccf 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleTemplateMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleTemplateMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleTemplateMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleTemplateMapper.xml index e293cbd..b4f2e37 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleTemplateMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmAlarmRuleTemplateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml index e68b567..3eaa903 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmFileInfoMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFileInfoMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmFileInfoMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFileInfoMapper.xml index 9919306..cdc0866 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmFileInfoMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFileInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml index f7a5c27..f772f38 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml index 3611164..bbccaf8 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorTemplateMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorTemplateMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorTemplateMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorTemplateMapper.xml index 40d576f..b523957 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorTemplateMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorTemplateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml index cf742eb..7fb8170 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmPolicyDeviceDetailsMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmPolicyDeviceDetailsMapper.xml similarity index 98% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmPolicyDeviceDetailsMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmPolicyDeviceDetailsMapper.xml index 08543d0..e63f71d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmPolicyDeviceDetailsMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmPolicyDeviceDetailsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml index 791fb72..3b4d622 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml index af0dbe4..bd47c46 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml similarity index 99% rename from ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml rename to tongran-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml index 0385bc0..0c3e63d 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-visual/pom.xml b/tongran-visual/pom.xml similarity index 68% rename from ruoyi-visual/pom.xml rename to tongran-visual/pom.xml index 939e60a..87d8f83 100644 --- a/ruoyi-visual/pom.xml +++ b/tongran-visual/pom.xml @@ -2,21 +2,21 @@ - com.ruoyi - ruoyi + com.tongran + tongran 3.6.6 4.0.0 - ruoyi-monitor + tongran-monitor - ruoyi-visual + tongran-visual pom - ruoyi-visual图形化管理模块 + tongran-visual图形化管理模块 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/tongran-visual/tongran-monitor/pom.xml similarity index 92% rename from ruoyi-visual/ruoyi-monitor/pom.xml rename to tongran-visual/tongran-monitor/pom.xml index 7d885c1..049abaa 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/tongran-visual/tongran-monitor/pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi-visual + com.tongran + tongran-visual 3.6.6 4.0.0 - ruoyi-visual-monitor + tongran-visual-monitor - ruoyi-visual-monitor监控中心 + tongran-visual-monitor监控中心 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/tongran-visual/tongran-monitor/src/main/java/com/tongran/modules/monitor/RuoYiMonitorApplication.java similarity index 94% rename from ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java rename to tongran-visual/tongran-monitor/src/main/java/com/tongran/modules/monitor/RuoYiMonitorApplication.java index 4ea0533..e24bda5 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java +++ b/tongran-visual/tongran-monitor/src/main/java/com/tongran/modules/monitor/RuoYiMonitorApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.modules.monitor; +package com.tongran.modules.monitor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,7 +7,7 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer; /** * 监控中心 * - * @author ruoyi + * @author tongran */ @EnableAdminServer @SpringBootApplication diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/tongran-visual/tongran-monitor/src/main/java/com/tongran/modules/monitor/config/WebSecurityConfigurer.java similarity index 96% rename from ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java rename to tongran-visual/tongran-monitor/src/main/java/com/tongran/modules/monitor/config/WebSecurityConfigurer.java index 9560204..eaac1d7 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java +++ b/tongran-visual/tongran-monitor/src/main/java/com/tongran/modules/monitor/config/WebSecurityConfigurer.java @@ -1,4 +1,4 @@ -package com.ruoyi.modules.monitor.config; +package com.tongran.modules.monitor.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * 监控权限配置 * - * @author ruoyi + * @author tongran */ @EnableWebSecurity public class WebSecurityConfigurer diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt b/tongran-visual/tongran-monitor/src/main/resources/banner.txt similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt rename to tongran-visual/tongran-monitor/src/main/resources/banner.txt diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/tongran-visual/tongran-monitor/src/main/resources/bootstrap.yml similarity index 96% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml rename to tongran-visual/tongran-monitor/src/main/resources/bootstrap.yml index 34e7dab..95a9ed4 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/tongran-visual/tongran-monitor/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-monitor + name: tongran-monitor 00000000000 profiles: # 环境配置 active: dev diff --git a/tongran-visual/tongran-monitor/src/main/resources/logback.xml b/tongran-visual/tongran-monitor/src/main/resources/logback.xml new file mode 100644 index 0000000..a519410 --- /dev/null +++ b/tongran-visual/tongran-monitor/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file