liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初始化v1.2

Browse Source
This commit is contained in:
gaoyutao
2025-11-24 16:19:09 +08:00
parent c0f51ef007
commit de49404116
918 changed files with 4236 additions and 4239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LICENSE
+1 -1
View File
@@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2020 若依 Copyright (c) 2020 彤然
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
README.md
+35 -35
View File
@@ -1,52 +1,52 @@
<p align="center"> <p align="center">
<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png"> <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
</p> </p>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.6</h1> <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">tongran v3.6.6</h1>
<h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4> <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
<p align="center"> <p align="center">
<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a> <a href="https://gitee.com/y_project/tongran-Cloud/stargazers"><img src="https://gitee.com/y_project/tongran-Cloud/badge/star.svg?theme=dark"></a>
<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.6-brightgreen.svg"></a> <a href="https://gitee.com/y_project/tongran-Cloud"><img src="https://img.shields.io/badge/tongran-v3.6.6-brightgreen.svg"></a>
<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a> <a href="https://gitee.com/y_project/tongran-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p> </p>
## 平台简介 ## 平台简介
若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 彤然是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
* 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。 * 采用前后端分离的模式，微服务版本前端(基于 [tongran-Vue](https://gitee.com/y_project/tongran-Vue))。
* 后端采用Spring Boot、Spring Cloud & Alibaba。 * 后端采用Spring Boot、Spring Cloud & Alibaba。
* 注册中心、配置中心选型Nacos，权限认证使用Redis。 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
* 流量控制框架选型Sentinel，分布式事务选型Seata。 * 流量控制框架选型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)，保持同步更新。 * 提供了技术栈（[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)，保持同步更新。
* 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) * 如需不分离应用，请移步 [tongran](https://gitee.com/y_project/tongran)，如需分离应用，请移步 [tongran-Vue](https://gitee.com/y_project/tongran-Vue)
* 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp; * 阿里云优惠券：[点我进入](http://aly.tongran.vip)，腾讯云优惠券：[点我进入](http://txy.tongran.vip)&nbsp;&nbsp;
## 系统模块 ## 系统模块
~~~ ~~~
com.ruoyi com.tongran
├── ruoyi-ui // 前端框架 [80] ├── tongran-ui // 前端框架 [80]
├── ruoyi-gateway // 网关模块 [8080] ├── tongran-gateway // 网关模块 [8080]
├── ruoyi-auth // 认证中心 [9200] ├── tongran-auth // 认证中心 [9200]
├── ruoyi-api // 接口模块 ├── tongran-api // 接口模块
│ └── ruoyi-api-system // 系统接口 │ └── tongran-api-system // 系统接口
├── ruoyi-common // 通用模块 ├── tongran-common // 通用模块
│ └── ruoyi-common-core // 核心模块 │ └── tongran-common-core // 核心模块
│ └── ruoyi-common-datascope // 权限范围 │ └── tongran-common-datascope // 权限范围
│ └── ruoyi-common-datasource // 多数据源 │ └── tongran-common-datasource // 多数据源
│ └── ruoyi-common-log // 日志记录 │ └── tongran-common-log // 日志记录
│ └── ruoyi-common-redis // 缓存服务 │ └── tongran-common-redis // 缓存服务
│ └── ruoyi-common-seata // 分布式事务 │ └── tongran-common-seata // 分布式事务
│ └── ruoyi-common-security // 安全模块 │ └── tongran-common-security // 安全模块
│ └── ruoyi-common-sensitive // 数据脱敏 │ └── tongran-common-sensitive // 数据脱敏
│ └── ruoyi-common-swagger // 系统接口 │ └── tongran-common-swagger // 系统接口
├── ruoyi-modules // 业务模块 ├── tongran-modules // 业务模块
│ └── ruoyi-system // 系统模块 [9201] │ └── tongran-system // 系统模块 [9201]
│ └── ruoyi-gen // 代码生成 [9202] │ └── tongran-gen // 代码生成 [9202]
│ └── ruoyi-job // 定时任务 [9203] │ └── tongran-job // 定时任务 [9203]
│ └── ruoyi-file // 文件服务 [9300] │ └── tongran-file // 文件服务 [9300]
├── ruoyi-visual // 图形化管理模块 ├── tongran-visual // 图形化管理模块
│ └── ruoyi-visual-monitor // 监控中心 [9100] │ └── tongran-visual-monitor // 监控中心 [9100]
├──pom.xml // 公共依赖 ├──pom.xml // 公共依赖
~~~ ~~~
@@ -79,8 +79,8 @@ com.ruoyi
- admin/admin123 - admin/admin123
- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
演示地址：http://ruoyi.vip 演示地址：http://tongran.vip
文档地址：http://doc.ruoyi.vip 文档地址：http://doc.tongran.vip
## 演示图 ## 演示图
@@ -124,6 +124,6 @@ com.ruoyi
</table> </table>
## 若依微服务交流群 ## 彤然微服务交流群
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) 点击按钮入群。 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) 点击按钮入群。
bin/run-auth.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Auth工程。 echo [��Ϣ] ʹ��Jar��������Auth���̡�
echo. echo.
cd %~dp0 cd %~dp0
cd ../ruoyi-auth/target cd ../tongran-auth/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m 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 cd bin
pause pause
bin/run-gateway.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Gateway工程。 echo [��Ϣ] ʹ��Jar��������Gateway���̡�
echo. echo.
cd %~dp0 cd %~dp0
cd ../ruoyi-gateway/target cd ../tongran-gateway/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m 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 cd bin
pause pause
bin/run-modules-file.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Modules-File工程。 echo [��Ϣ] ʹ��Jar��������Modules-File���̡�
echo. echo.
cd %~dp0 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 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 cd bin
pause pause
bin/run-modules-gen.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Modules-Gen工程。 echo [��Ϣ] ʹ��Jar��������Modules-Gen���̡�
echo. echo.
cd %~dp0 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 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 cd bin
pause pause
bin/run-modules-job.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Modules-Job工程。 echo [��Ϣ] ʹ��Jar��������Modules-Job���̡�
echo. echo.
cd %~dp0 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 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 cd bin
pause pause
bin/run-modules-system.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Modules-System工程。 echo [��Ϣ] ʹ��Jar��������Modules-System���̡�
echo. echo.
cd %~dp0 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 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 cd bin
pause pause
bin/run-monitor.bat
+3 -3
View File
@@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 使用Jar命令运行Monitor工程。 echo [��Ϣ] ʹ��Jar��������Monitor���̡�
echo. echo.
cd %~dp0 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 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 cd bin
pause pause
docker/copy.sh
+15 -15
View File
@@ -14,28 +14,28 @@ cp ../sql/ry_config_20250224.sql ./mysql/db
# copy html # copy html
echo "begin copy html " echo "begin copy html "
cp -r ../ruoyi-ui/dist/** ./nginx/html/dist cp -r ../tongran-ui/dist/** ./nginx/html/dist
# copy jar # copy jar
echo "begin copy ruoyi-gateway " echo "begin copy tongran-gateway "
cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar cp ../tongran-gateway/target/tongran-gateway.jar ./tongran/gateway/jar
echo "begin copy ruoyi-auth " echo "begin copy tongran-auth "
cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar cp ../tongran-auth/target/tongran-auth.jar ./tongran/auth/jar
echo "begin copy ruoyi-visual " echo "begin copy tongran-visual "
cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar ./ruoyi/visual/monitor/jar cp ../tongran-visual/tongran-monitor/target/tongran-visual-monitor.jar ./tongran/visual/monitor/jar
echo "begin copy ruoyi-modules-system " echo "begin copy tongran-modules-system "
cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar cp ../tongran-modules/tongran-system/target/tongran-modules-system.jar ./tongran/modules/system/jar
echo "begin copy ruoyi-modules-file " echo "begin copy tongran-modules-file "
cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar cp ../tongran-modules/tongran-file/target/tongran-modules-file.jar ./tongran/modules/file/jar
echo "begin copy ruoyi-modules-job " echo "begin copy tongran-modules-job "
cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar cp ../tongran-modules/tongran-job/target/tongran-modules-job.jar ./tongran/modules/job/jar
echo "begin copy ruoyi-modules-gen " echo "begin copy tongran-modules-gen "
cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar cp ../tongran-modules/tongran-gen/target/tongran-modules-gen.jar ./tongran/modules/gen/jar
docker/deploy.sh
+2 -2
View File
@@ -26,12 +26,12 @@ port(){
# 启动基础环境（必须） # 启动基础环境（必须）
base(){ base(){
docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos docker-compose up -d tongran-mysql tongran-redis tongran-nacos
} }
# 启动程序模块（必须） # 启动程序模块（必须）
modules(){ 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
} }
# 关闭所有环境/模块 # 关闭所有环境/模块
docker/docker-compose.yml
+48 -48
View File
@@ -1,7 +1,7 @@
version : '3.8' version : '3.8'
services: services:
ruoyi-nacos: tongran-nacos:
container_name: ruoyi-nacos container_name: tongran-nacos
image: nacos/nacos-server image: nacos/nacos-server
build: build:
context: ./nacos context: ./nacos
@@ -15,9 +15,9 @@ services:
- "9848:9848" - "9848:9848"
- "9849:9849" - "9849:9849"
depends_on: depends_on:
- ruoyi-mysql - tongran-mysql
ruoyi-mysql: tongran-mysql:
container_name: ruoyi-mysql container_name: tongran-mysql
image: mysql:5.7 image: mysql:5.7
build: build:
context: ./mysql context: ./mysql
@@ -38,103 +38,103 @@ services:
environment: environment:
MYSQL_DATABASE: 'ry-cloud' MYSQL_DATABASE: 'ry-cloud'
MYSQL_ROOT_PASSWORD: password MYSQL_ROOT_PASSWORD: password
ruoyi-redis: tongran-redis:
container_name: ruoyi-redis container_name: tongran-redis
image: redis image: redis
build: build:
context: ./redis context: ./redis
ports: ports:
- "6379:6379" - "6379:6379"
volumes: volumes:
- ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf - ./redis/conf/redis.conf:/home/tongran/redis/redis.conf
- ./redis/data:/data - ./redis/data:/data
command: redis-server /home/ruoyi/redis/redis.conf command: redis-server /home/tongran/redis/redis.conf
ruoyi-nginx: tongran-nginx:
container_name: ruoyi-nginx container_name: tongran-nginx
image: nginx image: nginx
build: build:
context: ./nginx context: ./nginx
ports: ports:
- "80:80" - "80:80"
volumes: 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/conf/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/logs:/var/log/nginx - ./nginx/logs:/var/log/nginx
- ./nginx/conf.d:/etc/nginx/conf.d - ./nginx/conf.d:/etc/nginx/conf.d
depends_on: depends_on:
- ruoyi-gateway - tongran-gateway
links: links:
- ruoyi-gateway - tongran-gateway
ruoyi-gateway: tongran-gateway:
container_name: ruoyi-gateway container_name: tongran-gateway
build: build:
context: ./ruoyi/gateway context: ./tongran/gateway
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "8080:8080" - "8080:8080"
depends_on: depends_on:
- ruoyi-redis - tongran-redis
links: links:
- ruoyi-redis - tongran-redis
ruoyi-auth: tongran-auth:
container_name: ruoyi-auth container_name: tongran-auth
build: build:
context: ./ruoyi/auth context: ./tongran/auth
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "9200:9200" - "9200:9200"
depends_on: depends_on:
- ruoyi-redis - tongran-redis
links: links:
- ruoyi-redis - tongran-redis
ruoyi-modules-system: tongran-modules-system:
container_name: ruoyi-modules-system container_name: tongran-modules-system
build: build:
context: ./ruoyi/modules/system context: ./tongran/modules/system
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "9201:9201" - "9201:9201"
depends_on: depends_on:
- ruoyi-redis - tongran-redis
- ruoyi-mysql - tongran-mysql
links: links:
- ruoyi-redis - tongran-redis
- ruoyi-mysql - tongran-mysql
ruoyi-modules-gen: tongran-modules-gen:
container_name: ruoyi-modules-gen container_name: tongran-modules-gen
build: build:
context: ./ruoyi/modules/gen context: ./tongran/modules/gen
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "9202:9202" - "9202:9202"
depends_on: depends_on:
- ruoyi-mysql - tongran-mysql
links: links:
- ruoyi-mysql - tongran-mysql
ruoyi-modules-job: tongran-modules-job:
container_name: ruoyi-modules-job container_name: tongran-modules-job
build: build:
context: ./ruoyi/modules/job context: ./tongran/modules/job
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "9203:9203" - "9203:9203"
depends_on: depends_on:
- ruoyi-mysql - tongran-mysql
links: links:
- ruoyi-mysql - tongran-mysql
ruoyi-modules-file: tongran-modules-file:
container_name: ruoyi-modules-file container_name: tongran-modules-file
build: build:
context: ./ruoyi/modules/file context: ./tongran/modules/file
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "9300:9300" - "9300:9300"
volumes: volumes:
- ./ruoyi/uploadPath:/home/ruoyi/uploadPath - ./tongran/uploadPath:/home/tongran/uploadPath
ruoyi-visual-monitor: tongran-visual-monitor:
container_name: ruoyi-visual-monitor container_name: tongran-visual-monitor
build: build:
context: ./ruoyi/visual/monitor context: ./tongran/visual/monitor
dockerfile: dockerfile dockerfile: dockerfile
ports: ports:
- "9100:9100" - "9100:9100"
docker/mysql/dockerfile
+1 -1
View File
@@ -1,7 +1,7 @@
# 基础镜像 # 基础镜像
FROM mysql:5.7 FROM mysql:5.7
# author # author
MAINTAINER ruoyi MAINTAINER tongran
# 执行sql脚本 # 执行sql脚本
ADD ./db/*.sql /docker-entrypoint-initdb.d/ ADD ./db/*.sql /docker-entrypoint-initdb.d/
docker/nacos/conf/application.properties
+2 -2
View File
@@ -1,6 +1,6 @@
spring.datasource.platform=mysql spring.datasource.platform=mysql
db.num=1 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.user=root
db.password=123456 db.password=123456
@@ -16,7 +16,7 @@ management.metrics.export.influx.enabled=false
server.tomcat.accesslog.enabled=true 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.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/** nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
docker/nacos/dockerfile
+1 -1
View File
@@ -1,7 +1,7 @@
# 基础镜像 # 基础镜像
FROM nacos/nacos-server FROM nacos/nacos-server
# author # author
MAINTAINER ruoyi MAINTAINER tongran
# 复制conf文件到路径 # 复制conf文件到路径
COPY ./conf/application.properties /home/nacos/conf/application.properties COPY ./conf/application.properties /home/nacos/conf/application.properties
docker/nginx/conf/nginx.conf
+2 -2
View File
@@ -15,7 +15,7 @@ http {
server_name localhost; server_name localhost;
location / { location / {
root /home/ruoyi/projects/ruoyi-ui; root /home/tongran/projects/tongran-ui;
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
index index.html index.htm; index index.html index.htm;
} }
@@ -25,7 +25,7 @@ http {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://ruoyi-gateway:8080/; proxy_pass http://tongran-gateway:8080/;
} }
# 避免actuator暴露 # 避免actuator暴露
docker/nginx/dockerfile
+5 -5
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM nginx FROM nginx
# author # 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文件到路径 # 复制conf文件到路径
COPY ./conf/nginx.conf /etc/nginx/nginx.conf COPY ./conf/nginx.conf /etc/nginx/nginx.conf
# 复制html文件到路径 # 复制html文件到路径
COPY ./html/dist /home/ruoyi/projects/ruoyi-ui COPY ./html/dist /home/tongran/projects/tongran-ui
docker/redis/dockerfile
+5 -5
View File
@@ -1,13 +1,13 @@
# 基础镜像 # 基础镜像
FROM redis FROM redis
# author # 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文件到路径 # 复制conf文件到路径
COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf COPY ./conf/redis.conf /home/tongran/redis/redis.conf
docker/ruoyi/auth/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-auth.jar"]
docker/ruoyi/gateway/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-gateway.jar"]
docker/ruoyi/modules/file/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-modules-file.jar"]
docker/ruoyi/modules/gen/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-modules-gen.jar"]
docker/ruoyi/modules/job/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-modules-job.jar"]
docker/ruoyi/modules/system/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-modules-system.jar"]
docker/ruoyi/visual/monitor/dockerfile
+6 -6
View File
@@ -1,15 +1,15 @@
# 基础镜像 # 基础镜像
FROM openjdk:8-jre FROM openjdk:8-jre
# author # 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文件到路径 # 复制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"] ENTRYPOINT ["java","-jar","tongran-visual-monitor.jar"]
pom.xml
+42 -43
View File
@@ -4,16 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi</artifactId> <artifactId>tongran</artifactId>
<version>3.6.6</version> <version>3.6.6</version>
<name>ruoyi</name> <name>tongran</name>
<url>http://www.ruoyi.vip</url> <description>彤然微服务系统</description>
<description>若依微服务系统</description>
<properties> <properties>
<ruoyi.version>3.6.6</ruoyi.version> <tongran.version>3.6.6</tongran.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
@@ -184,85 +183,85 @@
<!-- 核心模块 --> <!-- 核心模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-core</artifactId> <artifactId>tongran-common-core</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 接口模块 --> <!-- 接口模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-swagger</artifactId> <artifactId>tongran-common-swagger</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 安全模块 --> <!-- 安全模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-security</artifactId> <artifactId>tongran-common-security</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 数据脱敏 --> <!-- 数据脱敏 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-sensitive</artifactId> <artifactId>tongran-common-sensitive</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 权限范围 --> <!-- 权限范围 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-datascope</artifactId> <artifactId>tongran-common-datascope</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 多数据源 --> <!-- 多数据源 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-datasource</artifactId> <artifactId>tongran-common-datasource</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 分布式事务 --> <!-- 分布式事务 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-seata</artifactId> <artifactId>tongran-common-seata</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 日志记录 --> <!-- 日志记录 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-log</artifactId> <artifactId>tongran-common-log</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 缓存服务 --> <!-- 缓存服务 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-redis</artifactId> <artifactId>tongran-common-redis</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
<!-- 系统接口 --> <!-- 系统接口 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-api-system</artifactId> <artifactId>tongran-api-system</artifactId>
<version>${ruoyi.version}</version> <version>${tongran.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<modules> <modules>
<module>ruoyi-auth</module> <module>tongran-auth</module>
<module>ruoyi-gateway</module> <module>tongran-gateway</module>
<module>ruoyi-visual</module> <module>tongran-visual</module>
<module>ruoyi-modules</module> <module>tongran-modules</module>
<module>ruoyi-rocketmq</module> <module>tongran-rocketmq</module>
<module>ruoyi-api</module> <module>tongran-api</module>
<module>ruoyi-common</module> <module>tongran-common</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-5
View File
@@ -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
ruoyi-common/pom.xml
-30
View File
@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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">
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>3.6.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modules>
<module>ruoyi-common-log</module>
<module>ruoyi-common-core</module>
<module>ruoyi-common-redis</module>
<module>ruoyi-common-seata</module>
<module>ruoyi-common-swagger</module>
<module>ruoyi-common-security</module>
<module>ruoyi-common-sensitive</module>
<module>ruoyi-common-datascope</module>
<module>ruoyi-common-datasource</module>
</modules>
<artifactId>ruoyi-common</artifactId>
<packaging>pom</packaging>
<description>
ruoyi-common通用模块
</description>
</project>
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
-29
View File
@@ -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";
}
ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-1
View File
@@ -1 +0,0 @@
com.ruoyi.common.core.utils.SpringUtils
ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-1
View File
@@ -1 +0,0 @@
com.ruoyi.common.datascope.aspect.DataScopeAspect
ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-2
View File
@@ -1,2 +0,0 @@
com.ruoyi.common.log.service.AsyncLogService
com.ruoyi.common.log.aspect.LogAspect
ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-2
View File
@@ -1,2 +0,0 @@
com.ruoyi.common.redis.configure.RedisConfig
com.ruoyi.common.redis.service.RedisService
ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-5
View File
@@ -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
ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-1
View File
@@ -1 +0,0 @@
com.ruoyi.common.swagger.config.SpringDocAutoConfiguration
ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
-74
View File
@@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/ruoyi-job" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
</configuration>
ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
-74
View File
@@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/ruoyi-system" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
</configuration>
ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
-74
View File
@@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/ruoyi-visual-monitor" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
</configuration>
sql/ry_20250523.sql
+15 -15
View File
@@ -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(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(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(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(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(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(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(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(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(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(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(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(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('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('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('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('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, '角色管理菜单'); 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('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('2', '维护通知：2018-07-01 彤然系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员');
-- ---------------------------- -- ----------------------------
sql/ry_config_20250224.sql
+8 -8
View File
@@ -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 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','',''), (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','',''), (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,'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','',''), (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,'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','',''), (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,'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','',''), (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,'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','',''), (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,'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','',''), (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,'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,''), (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-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,''); (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,'');
/******************************************/ /******************************************/
ruoyi-api/pom.xml → tongran-api/pom.xml
+5 -5
View File
@@ -2,21 +2,21 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi</artifactId> <artifactId>tongran</artifactId>
<version>3.6.6</version> <version>3.6.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<modules> <modules>
<module>ruoyi-api-system</module> <module>tongran-api-system</module>
</modules> </modules>
<artifactId>ruoyi-api</artifactId> <artifactId>tongran-api</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<description> <description>
ruoyi-api系统接口 tongran-api系统接口
</description> </description>
</project> </project>
ruoyi-api/ruoyi-api-system/pom.xml → tongran-api/tongran-api-system/pom.xml
+7 -7
View File
@@ -3,24 +3,24 @@
xmlns="http://maven.apache.org/POM/4.0.0" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-api</artifactId> <artifactId>tongran-api</artifactId>
<version>3.6.6</version> <version>3.6.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-api-system</artifactId> <artifactId>tongran-api-system</artifactId>
<description> <description>
ruoyi-api-system系统接口模块 tongran-api-system系统接口模块
</description> </description>
<dependencies> <dependencies>
<!-- RuoYi Common Core--> <!-- tongran Common Core-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-core</artifactId> <artifactId>tongran-common-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteFileService.java
+6 -6
View File
@@ -1,4 +1,4 @@
package com.ruoyi.system.api; package com.tongran.system.api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType; 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.RequestParam;
import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.tongran.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.system.api.domain.SysFile; import com.tongran.system.api.domain.SysFile;
import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; import com.tongran.system.api.factory.RemoteFileFallbackFactory;
/** /**
* 文件服务 * 文件服务
* *
* @author ruoyi * @author tongran
*/ */
@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
public interface RemoteFileService public interface RemoteFileService
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteLogService.java
+8 -8
View File
@@ -1,20 +1,20 @@
package com.ruoyi.system.api; package com.tongran.system.api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import com.ruoyi.common.core.constant.SecurityConstants; import com.tongran.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.tongran.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.system.api.domain.SysLogininfor; import com.tongran.system.api.domain.SysLogininfor;
import com.ruoyi.system.api.domain.SysOperLog; import com.tongran.system.api.domain.SysOperLog;
import com.ruoyi.system.api.factory.RemoteLogFallbackFactory; import com.tongran.system.api.factory.RemoteLogFallbackFactory;
/** /**
* 日志服务 * 日志服务
* *
* @author ruoyi * @author tongran
*/ */
@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
public interface RemoteLogService public interface RemoteLogService
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRevenueConfigService.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRevenueConfigService.java
+8 -8
View File
@@ -1,11 +1,11 @@
package com.ruoyi.system.api; package com.tongran.system.api;
import com.ruoyi.common.core.constant.SecurityConstants; import com.tongran.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.tongran.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.common.core.web.page.TableDataInfo; import com.tongran.common.core.web.page.TableDataInfo;
import com.ruoyi.system.api.domain.*; import com.tongran.system.api.domain.*;
import com.ruoyi.system.api.factory.RemoteRevenueConfigFallbackFactory; import com.tongran.system.api.factory.RemoteRevenueConfigFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; 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) @FeignClient(contextId = "remoteRevenueConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteRevenueConfigFallbackFactory.class)
public interface RemoteRevenueConfigService public interface RemoteRevenueConfigService
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteRocketMqService.java
+9 -9
View File
@@ -1,13 +1,13 @@
package com.ruoyi.system.api; package com.tongran.system.api;
import com.ruoyi.common.core.constant.SecurityConstants; import com.tongran.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.tongran.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.system.api.domain.RmAlarmRecordRemote; import com.tongran.system.api.domain.RmAlarmRecordRemote;
import com.ruoyi.system.api.domain.RmDeployScriptRemote; import com.tongran.system.api.domain.RmDeployScriptRemote;
import com.ruoyi.system.api.domain.RmMonitorPolicyRemote; import com.tongran.system.api.domain.RmMonitorPolicyRemote;
import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; import com.tongran.system.api.domain.RmNetworkInterfaceRemote;
import com.ruoyi.system.api.factory.RemoteRocketMqFallbackFactory; import com.tongran.system.api.factory.RemoteRocketMqFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/RemoteUserService.java
+10 -10
View File
@@ -1,20 +1,20 @@
package com.ruoyi.system.api; package com.tongran.system.api;
import com.ruoyi.common.core.constant.SecurityConstants; import com.tongran.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.tongran.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.system.api.domain.EpsInitialTrafficDataRemote; import com.tongran.system.api.domain.EpsInitialTrafficDataRemote;
import com.ruoyi.system.api.domain.NodeBandwidth; import com.tongran.system.api.domain.NodeBandwidth;
import com.ruoyi.system.api.domain.SysUser; import com.tongran.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; import com.tongran.system.api.factory.RemoteUserFallbackFactory;
import com.ruoyi.system.api.model.LoginUser; import com.tongran.system.api.model.LoginUser;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
* 用户服务 * 用户服务
* *
* @author ruoyi * @author tongran
*/ */
@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
public interface RemoteUserService public interface RemoteUserService
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AllInterfaceNameRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/AllInterfaceNameRemote.java
+3 -3
View File
@@ -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.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.util.Set; import java.util.Set;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsBusinessScriptRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsBusinessScriptRemote.java
+3 -3
View File
@@ -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.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
/** /**
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsInitialTrafficDataRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsInitialTrafficDataRemote.java
+3 -3
View File
@@ -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.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/EpsNodeBandwidthRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/EpsNodeBandwidthRemote.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/InitialSwitchInfoDetailsRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/InitialSwitchInfoDetailsRemote.java
+3 -3
View File
@@ -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.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NetworkInfo.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NetworkInfo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/NodeBandwidth.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/NodeBandwidth.java
+3 -3
View File
@@ -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.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmAlarmRecordRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmAlarmRecordRemote.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmDeployScriptRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmDeployScriptRemote.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmMonitorPolicyRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmMonitorPolicyRemote.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmNetworkInterfaceRemote.java
+3 -3
View File
@@ -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.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
@Data @Data
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmRegisterMsgRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmRegisterMsgRemote.java
+1 -1
View File
@@ -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.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceGroupRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceGroupRemote.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmResourceRegistrationRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmSwitchManagementRemote.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmSwitchManagementRemote.java
+2 -2
View File
@@ -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 lombok.Data;
import java.util.Date; import java.util.Date;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RouteMsg.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RouteMsg.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import lombok.Data; import lombok.Data;
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDept.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -8,12 +8,12 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; 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 * 部门表 sys_dept
* *
* @author ruoyi * @author tongran
*/ */
public class SysDept extends BaseEntity public class SysDept extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictData.java
+6 -6
View File
@@ -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.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.tongran.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.constant.UserConstants; import com.tongran.common.core.constant.UserConstants;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
/** /**
* 字典数据表 sys_dict_data * 字典数据表 sys_dict_data
* *
* @author ruoyi * @author tongran
*/ */
public class SysDictData extends BaseEntity public class SysDictData extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysDictType.java
+5 -5
View File
@@ -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.NotBlank;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.tongran.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
/** /**
* 字典类型表 sys_dict_type * 字典类型表 sys_dict_type
* *
* @author ruoyi * @author tongran
*/ */
public class SysDictType extends BaseEntity public class SysDictType extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysFile.java
+2 -2
View File
@@ -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.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; 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 public class SysFile
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysLogininfor.java
+5 -5
View File
@@ -1,15 +1,15 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.tongran.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
/** /**
* 系统访问记录表 sys_logininfor * 系统访问记录表 sys_logininfor
* *
* @author ruoyi * @author tongran
*/ */
public class SysLogininfor extends BaseEntity public class SysLogininfor extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysOperLog.java
+5 -5
View File
@@ -1,15 +1,15 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.tongran.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
/** /**
* 操作日志记录表 oper_log * 操作日志记录表 oper_log
* *
* @author ruoyi * @author tongran
*/ */
public class SysOperLog extends BaseEntity public class SysOperLog extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysRole.java
+5 -5
View File
@@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import java.util.Set; import java.util.Set;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@@ -6,14 +6,14 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.tongran.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
/** /**
* 角色表 sys_role * 角色表 sys_role
* *
* @author ruoyi * @author tongran
*/ */
public class SysRole extends BaseEntity public class SysRole extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/SysUser.java
+9 -9
View File
@@ -1,22 +1,22 @@
package com.ruoyi.system.api.domain; package com.tongran.system.api.domain;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.validation.constraints.*; import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel; import com.tongran.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.tongran.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.annotation.Excel.Type; import com.tongran.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.constant.UserConstants; import com.tongran.common.core.constant.UserConstants;
import com.ruoyi.common.core.annotation.Excels; import com.tongran.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.tongran.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss; import com.tongran.common.core.xss.Xss;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
* *
* @author ruoyi * @author tongran
*/ */
public class SysUser extends BaseEntity public class SysUser extends BaseEntity
{ {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteFileFallbackFactory.java
+5 -5
View File
@@ -1,18 +1,18 @@
package com.ruoyi.system.api.factory; package com.tongran.system.api.factory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.system.api.RemoteFileService; import com.tongran.system.api.RemoteFileService;
import com.ruoyi.system.api.domain.SysFile; import com.tongran.system.api.domain.SysFile;
/** /**
* 文件服务降级处理 * 文件服务降级处理
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService> public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteLogFallbackFactory.java
+6 -6
View File
@@ -1,18 +1,18 @@
package com.ruoyi.system.api.factory; package com.tongran.system.api.factory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.system.api.RemoteLogService; import com.tongran.system.api.RemoteLogService;
import com.ruoyi.system.api.domain.SysLogininfor; import com.tongran.system.api.domain.SysLogininfor;
import com.ruoyi.system.api.domain.SysOperLog; import com.tongran.system.api.domain.SysOperLog;
/** /**
* 日志服务降级处理 * 日志服务降级处理
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService> public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRevenueConfigFallbackFactory.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRevenueConfigFallbackFactory.java
+6 -6
View File
@@ -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.tongran.common.core.domain.R;
import com.ruoyi.common.core.web.page.TableDataInfo; import com.tongran.common.core.web.page.TableDataInfo;
import com.ruoyi.system.api.RemoteRevenueConfigService; import com.tongran.system.api.RemoteRevenueConfigService;
import com.ruoyi.system.api.domain.*; import com.tongran.system.api.domain.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
@@ -14,7 +14,7 @@ import java.util.List;
/** /**
* 用户服务降级处理 * 用户服务降级处理
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class RemoteRevenueConfigFallbackFactory implements FallbackFactory<RemoteRevenueConfigService> public class RemoteRevenueConfigFallbackFactory implements FallbackFactory<RemoteRevenueConfigService>
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteRocketMqFallbackFactory.java
+8 -8
View File
@@ -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.tongran.common.core.domain.R;
import com.ruoyi.system.api.RemoteRocketMqService; import com.tongran.system.api.RemoteRocketMqService;
import com.ruoyi.system.api.domain.RmAlarmRecordRemote; import com.tongran.system.api.domain.RmAlarmRecordRemote;
import com.ruoyi.system.api.domain.RmDeployScriptRemote; import com.tongran.system.api.domain.RmDeployScriptRemote;
import com.ruoyi.system.api.domain.RmMonitorPolicyRemote; import com.tongran.system.api.domain.RmMonitorPolicyRemote;
import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; import com.tongran.system.api.domain.RmNetworkInterfaceRemote;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
@@ -18,7 +18,7 @@ import java.util.Map;
/** /**
* 用户服务降级处理 * 用户服务降级处理
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class RemoteRocketMqFallbackFactory implements FallbackFactory<RemoteRocketMqService> public class RemoteRocketMqFallbackFactory implements FallbackFactory<RemoteRocketMqService>
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/factory/RemoteUserFallbackFactory.java
+8 -8
View File
@@ -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.tongran.common.core.domain.R;
import com.ruoyi.system.api.RemoteUserService; import com.tongran.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.EpsInitialTrafficDataRemote; import com.tongran.system.api.domain.EpsInitialTrafficDataRemote;
import com.ruoyi.system.api.domain.NodeBandwidth; import com.tongran.system.api.domain.NodeBandwidth;
import com.ruoyi.system.api.domain.SysUser; import com.tongran.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser; import com.tongran.system.api.model.LoginUser;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
/** /**
* 用户服务降级处理 * 用户服务降级处理
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService> public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java → tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/model/LoginUser.java
+3 -3
View File
@@ -1,13 +1,13 @@
package com.ruoyi.system.api.model; package com.tongran.system.api.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set; 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 public class LoginUser implements Serializable
{ {
tongran-api/tongran-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+5
View File
@@ -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
ruoyi-auth/pom.xml → tongran-auth/pom.xml
+7 -7
View File
@@ -2,16 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi</artifactId> <artifactId>tongran</artifactId>
<version>3.6.6</version> <version>3.6.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-auth</artifactId> <artifactId>tongran-auth</artifactId>
<description> <description>
ruoyi-auth认证授权中心 tongran-auth认证授权中心
</description> </description>
<dependencies> <dependencies>
@@ -46,10 +46,10 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<!-- RuoYi Common Security--> <!-- tongran Common Security-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common-security</artifactId> <artifactId>tongran-common-security</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java → tongran-auth/src/main/java/com/tongran/auth/TongRanAuthApplication.java
+5 -5
View File
@@ -1,22 +1,22 @@
package com.ruoyi.auth; package com.tongran.auth;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; 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 @EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
public class RuoYiAuthApplication public class TongRanAuthApplication
{ {
public static void main(String[] args) public static void main(String[] args)
{ {
SpringApplication.run(RuoYiAuthApplication.class, args); SpringApplication.run(TongRanAuthApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" + " .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" + " | _ _ \\ \\ \\ / / \n" +
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java → tongran-auth/src/main/java/com/tongran/auth/controller/TokenController.java
+12 -12
View File
@@ -1,4 +1,4 @@
package com.ruoyi.auth.controller; package com.tongran.auth.controller;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.auth.form.LoginBody; import com.tongran.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody; import com.tongran.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService; import com.tongran.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.common.core.utils.JwtUtils; import com.tongran.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils; import com.tongran.common.core.utils.StringUtils;
import com.ruoyi.common.security.auth.AuthUtil; import com.tongran.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService; import com.tongran.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils; import com.tongran.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser; import com.tongran.system.api.model.LoginUser;
/** /**
* token 控制 * token 控制
* *
* @author ruoyi * @author tongran
*/ */
@RestController @RestController
public class TokenController public class TokenController
ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java → tongran-auth/src/main/java/com/tongran/auth/form/LoginBody.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.auth.form; package com.tongran.auth.form;
/** /**
* 用户登录对象 * 用户登录对象
* *
* @author ruoyi * @author tongran
*/ */
public class LoginBody public class LoginBody
{ {
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java → tongran-auth/src/main/java/com/tongran/auth/form/RegisterBody.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.auth.form; package com.tongran.auth.form;
/** /**
* 用户注册对象 * 用户注册对象
* *
* @author ruoyi * @author tongran
*/ */
public class RegisterBody extends LoginBody public class RegisterBody extends LoginBody
{ {
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java → tongran-auth/src/main/java/com/tongran/auth/service/SysLoginService.java
+18 -18
View File
@@ -1,28 +1,28 @@
package com.ruoyi.auth.service; package com.tongran.auth.service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants; import com.tongran.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants; import com.tongran.common.core.constant.Constants;
import com.ruoyi.common.core.constant.SecurityConstants; import com.tongran.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.UserConstants; import com.tongran.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R; import com.tongran.common.core.domain.R;
import com.ruoyi.common.core.enums.UserStatus; import com.tongran.common.core.enums.UserStatus;
import com.ruoyi.common.core.exception.ServiceException; import com.tongran.common.core.exception.ServiceException;
import com.ruoyi.common.core.text.Convert; import com.tongran.common.core.text.Convert;
import com.ruoyi.common.core.utils.DateUtils; import com.tongran.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils; import com.tongran.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils; import com.tongran.common.core.utils.ip.IpUtils;
import com.ruoyi.common.redis.service.RedisService; import com.tongran.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils; import com.tongran.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteUserService; import com.tongran.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.SysUser; import com.tongran.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser; import com.tongran.system.api.model.LoginUser;
/** /**
* 登录校验方法 * 登录校验方法
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class SysLoginService public class SysLoginService
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java → tongran-auth/src/main/java/com/tongran/auth/service/SysPasswordService.java
+8 -8
View File
@@ -1,19 +1,19 @@
package com.ruoyi.auth.service; package com.tongran.auth.service;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants; import com.tongran.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants; import com.tongran.common.core.constant.Constants;
import com.ruoyi.common.core.exception.ServiceException; import com.tongran.common.core.exception.ServiceException;
import com.ruoyi.common.redis.service.RedisService; import com.tongran.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils; import com.tongran.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser; import com.tongran.system.api.domain.SysUser;
/** /**
* 登录密码方法 * 登录密码方法
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class SysPasswordService public class SysPasswordService
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java → tongran-auth/src/main/java/com/tongran/auth/service/SysRecordLogService.java
+8 -8
View File
@@ -1,18 +1,18 @@
package com.ruoyi.auth.service; package com.tongran.auth.service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.Constants; import com.tongran.common.core.constant.Constants;
import com.ruoyi.common.core.constant.SecurityConstants; import com.tongran.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.StringUtils; import com.tongran.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils; import com.tongran.common.core.utils.ip.IpUtils;
import com.ruoyi.system.api.RemoteLogService; import com.tongran.system.api.RemoteLogService;
import com.ruoyi.system.api.domain.SysLogininfor; import com.tongran.system.api.domain.SysLogininfor;
/** /**
* 记录日志方法 * 记录日志方法
* *
* @author ruoyi * @author tongran
*/ */
@Component @Component
public class SysRecordLogService public class SysRecordLogService
ruoyi-auth/src/main/resources/banner.txt → tongran-auth/src/main/resources/banner.txt
View File
ruoyi-auth/src/main/resources/bootstrap.yml → tongran-auth/src/main/resources/bootstrap.yml
+3 -2
View File
@@ -6,7 +6,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: ruoyi-auth name: tongran-auth
profiles: profiles:
# 环境配置 # 环境配置
active: dev active: dev
@@ -23,7 +23,8 @@ spring:
# 配置中心地址 # 配置中心地址
server-addr: 172.16.15.52:8848 server-addr: 172.16.15.52:8848
# server-addr: 172.16.15.103:8848 # server-addr: 172.16.15.103:8848
namespace: saas-local namespace: public
# namespace: saas-local
username: nacos username: nacos
password: nacos password: nacos
# 配置文件格式 # 配置文件格式
ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml → tongran-auth/src/main/resources/logback.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="logs/ruoyi-gen" /> <property name="log.path" value="logs/tongran-auth" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -58,7 +58,7 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" /> <logger name="com.tongran" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />
tongran-common/pom.xml
+30
View File
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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">
<parent>
<groupId>com.tongran</groupId>
<artifactId>tongran</artifactId>
<version>3.6.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modules>
<module>tongran-common-log</module>
<module>tongran-common-core</module>
<module>tongran-common-redis</module>
<module>tongran-common-seata</module>
<module>tongran-common-swagger</module>
<module>tongran-common-security</module>
<module>tongran-common-sensitive</module>
<module>tongran-common-datascope</module>
<module>tongran-common-datasource</module>
</modules>
<artifactId>tongran-common</artifactId>
<packaging>pom</packaging>
<description>
tongran-common通用模块
</description>
</project>
ruoyi-common/ruoyi-common-core/pom.xml → tongran-common/tongran-common-core/pom.xml
+4 -4
View File
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.ruoyi</groupId> <groupId>com.tongran</groupId>
<artifactId>ruoyi-common</artifactId> <artifactId>tongran-common</artifactId>
<version>3.6.6</version> <version>3.6.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-core</artifactId> <artifactId>tongran-common-core</artifactId>
<description> <description>
ruoyi-common-core核心模块 tongran-common-core核心模块
</description> </description>
<dependencies> <dependencies>
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excel.java
+3 -3
View File
@@ -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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -7,12 +7,12 @@ import java.lang.annotation.Target;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.IndexedColors;
import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter; import com.tongran.common.core.utils.poi.ExcelHandlerAdapter;
/** /**
* 自定义导出Excel数据注解 * 自定义导出Excel数据注解
* *
* @author ruoyi * @author tongran
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/annotation/Excels.java
+2 -2
View File
@@ -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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/** /**
* Excel注解集 * Excel注解集
* *
* @author ruoyi * @author tongran
*/ */
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/CacheConstants.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.common.core.constant; package com.tongran.common.core.constant;
/** /**
* 缓存常量信息 * 缓存常量信息
* *
* @author ruoyi * @author tongran
*/ */
public class CacheConstants public class CacheConstants
{ {
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/Constants.java
+5 -5
View File
@@ -1,9 +1,9 @@
package com.ruoyi.common.core.constant; package com.tongran.common.core.constant;
/** /**
* 通用常量信息 * 通用常量信息
* *
* @author ruoyi * @author tongran
*/ */
public class Constants public class Constants
{ {
@@ -120,16 +120,16 @@ public class Constants
/** /**
* 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） * 自动识别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", 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" };
} }
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/GenConstants.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.common.core.constant; package com.tongran.common.core.constant;
/** /**
* 代码生成通用常量 * 代码生成通用常量
* *
* @author ruoyi * @author tongran
*/ */
public class GenConstants public class GenConstants
{ {
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/HttpStatus.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.common.core.constant; package com.tongran.common.core.constant;
/** /**
* 返回状态码 * 返回状态码
* *
* @author ruoyi * @author tongran
*/ */
public class HttpStatus public class HttpStatus
{ {
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ScheduleConstants.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.common.core.constant; package com.tongran.common.core.constant;
/** /**
* 任务调度通用常量 * 任务调度通用常量
* *
* @author ruoyi * @author tongran
*/ */
public class ScheduleConstants public class ScheduleConstants
{ {
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java → tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/SecurityConstants.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.ruoyi.common.core.constant; package com.tongran.common.core.constant;
/** /**
* 权限相关通用常量 * 权限相关通用常量
* *
* @author ruoyi * @author tongran
*/ */
public class SecurityConstants public class SecurityConstants
{ {
tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/ServiceNameConstants.java
+29
View File
@@ -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";
}

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