daichao
/
law-office-system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: daichao:72b835f05b0e10dd891a47a4e236ec8f184de428
Branches Tags
daichao:master
daichao:dev
daichao:main
..
compare: daichao:4ee169b0c8828517b977cba47953d64d2b0e505a
Branches Tags
daichao:dev
daichao:master
daichao:main

No commits in common. "72b835f05b0e10dd891a47a4e236ec8f184de428" and "4ee169b0c8828517b977cba47953d64d2b0e505a" have entirely different histories.
72b835f05b ... 4ee169b0c8

328 changed files with 35858 additions and 36560 deletions
Show Stats Expand all files Collapse all files

2
.github/FUNDING.yml vendored
View File

@ -1 +1 @@
custom: http://doc.ruoyi.vip/tcctlo-vue/other/donate.html custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html

6
README.md
View File

@ -1,11 +1,11 @@
<p align="center"> <p align="center">
<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png"> <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
</p> </p>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.9</h1> <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.8</h1>
<h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4> <h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
<p align="center"> <p align="center">
<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a> <a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.9-brightgreen.svg"></a> <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.8-brightgreen.svg"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a> <a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p> </p>
@ -92,4 +92,4 @@
## 若依前后端分离交流群 ## 若依前后端分离交流群
QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/已满-151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) [![加入QQ群](https://img.shields.io/badge/已满-224622315-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=F58bgRa-Dp-rsQJThiJqIYv8t4-lWfXh&authKey=UmUs4CVG5OPA1whvsa4uSespOvyd8%2FAr9olEGaWAfdLmfKQk%2FVBp2YU3u2xXXt76&noverify=0&group_code=224622315) [![加入QQ群](https://img.shields.io/badge/已满-287842588-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Nxb2EQ5qozWa218Wbs7zgBnjLSNk_tVT&authKey=obBKXj6SBKgrFTJZx0AqQnIYbNOvBB2kmgwWvGhzxR67RoRr84%2Bus5OadzMcdJl5&noverify=0&group_code=287842588) [![加入QQ群](https://img.shields.io/badge/187944233-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=numtK1M_I4eVd2Gvg8qtbuL8JgX42qNh&authKey=giV9XWMaFZTY%2FqPlmWbkB9g3fi0Ev5CwEtT9Tgei0oUlFFCQLDp4ozWRiVIzubIm&noverify=0&group_code=187944233) 点击按钮入群。 QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) 点击按钮入群。

4
bin/run.bat
View File

@ -4,11 +4,11 @@ echo [
echo. echo.
cd %~dp0 cd %~dp0
cd ../tcctlo-admin/target cd ../ruoyi-admin/target
set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -jar %JAVA_OPTS% tcctlo-admin.jar java -jar %JAVA_OPTS% ruoyi-admin.jar
cd bin cd bin
pause pause

0
doc/╚⌠╥└╗╖╛│╩╣╙├╩╓▓ß.docx → doc/若依环境使用手册.docx
View File

62
pom.xml
View File

@ -4,16 +4,16 @@
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.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo</artifactId> <artifactId>ruoyi</artifactId>
<version>3.8.9</version> <version>3.8.8</version>
<name>tcctlo</name> <name>ruoyi</name>
<url>http://www.ruoyi.vip</url> <url>http://www.ruoyi.vip</url>
<description>律所OA办公系统</description> <description>若依管理系统</description>
<properties> <properties>
<tcctlo.version>3.8.9</tcctlo.version> <ruoyi.version>3.8.8</ruoyi.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>
@ -185,57 +185,49 @@
<!-- 定时任务--> <!-- 定时任务-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-quartz</artifactId> <artifactId>ruoyi-quartz</artifactId>
<version>${tcctlo.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-generator</artifactId> <artifactId>ruoyi-generator</artifactId>
<version>${tcctlo.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-framework</artifactId> <artifactId>ruoyi-framework</artifactId>
<version>${tcctlo.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 系统模块--> <!-- 系统模块-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-system</artifactId> <artifactId>ruoyi-system</artifactId>
<version>${tcctlo.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 通用工具--> <!-- 通用工具-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-common</artifactId> <artifactId>ruoyi-common</artifactId>
<version>${tcctlo.version}</version> <version>${ruoyi.version}</version>
</dependency>
<!-- 律所OA业务模块 -->
<dependency>
<groupId>com.tcctlo.law</groupId>
<artifactId>tcctlo-law-office</artifactId>
<version>${tcctlo.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<modules> <modules>
<module>tcctlo-admin</module> <module>ruoyi-admin</module>
<module>tcctlo-framework</module> <module>ruoyi-framework</module>
<module>tcctlo-system</module> <module>ruoyi-system</module>
<module>tcctlo-quartz</module> <module>ruoyi-quartz</module>
<module>tcctlo-generator</module> <module>ruoyi-generator</module>
<module>tcctlo-common</module> <module>ruoyi-common</module>
<module>tcctlo-law-office</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>

27
tcctlo-admin/pom.xml → ruoyi-admin/pom.xml
View File

@ -3,13 +3,13 @@
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>
<artifactId>tcctlo</artifactId> <artifactId>ruoyi</artifactId>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<version>3.8.9</version> <version>3.8.8</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>tcctlo-admin</artifactId> <artifactId>ruoyi-admin</artifactId>
<description> <description>
web服务入口 web服务入口
@ -45,27 +45,20 @@
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-framework</artifactId> <artifactId>ruoyi-framework</artifactId>
</dependency> </dependency>
<!-- 定时任务--> <!-- 定时任务-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-quartz</artifactId> <artifactId>ruoyi-quartz</artifactId>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<artifactId>tcctlo-generator</artifactId> <artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- 律所OA业务模块 -->
<dependency>
<groupId>com.tcctlo.law</groupId>
<artifactId>tcctlo-law-office</artifactId>
<version>${tcctlo.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
tcctlo-admin/src/main/java/com/tcctlo/TCCTLawOfficeApplication.java → ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -1,6 +1,5 @@
package com.tcctlo; package com.ruoyi;
import org.dromara.x.file.storage.spring.EnableFileStorage;
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;
@ -11,13 +10,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author ruoyi * @author ruoyi
*/ */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@EnableFileStorage public class RuoYiApplication
public class TCCTLawOfficeApplication
{ {
public static void main(String[] args) public static void main(String[] args)
{ {
// System.setProperty("spring.devtools.restart.enabled", "false"); // System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(TCCTLawOfficeApplication.class, args); SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" + " .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" + " | _ _ \\ \\ \\ / / \n" +

4
tcctlo-admin/src/main/java/com/tcctlo/RuoYiServletInitializer.java → ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
View File

@ -1,4 +1,4 @@
package com.tcctlo; package com.ruoyi;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@ -13,6 +13,6 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
{ {
return application.sources(TCCTLawOfficeApplication.class); return application.sources(RuoYiApplication.class);
} }
} }

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/common/CaptchaController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.common; package com.ruoyi.web.controller.common;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
@ -11,14 +11,14 @@ import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.Producer;
import com.tcctlo.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.tcctlo.common.constant.CacheConstants; import com.ruoyi.common.constant.CacheConstants;
import com.tcctlo.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.tcctlo.common.utils.sign.Base64; import com.ruoyi.common.utils.sign.Base64;
import com.tcctlo.common.utils.uuid.IdUtils; import com.ruoyi.common.utils.uuid.IdUtils;
import com.tcctlo.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
/** /**
* 验证码操作处理 * 验证码操作处理

42
tcctlo-admin/src/main/java/com/tcctlo/web/controller/common/CommonController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -1,14 +1,9 @@
package com.tcctlo.web.controller.common; package com.ruoyi.web.controller.common;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.dromara.x.file.storage.core.FileInfo;
import org.dromara.x.file.storage.core.FileStorageService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -18,13 +13,13 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.tcctlo.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.tcctlo.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.tcctlo.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.FileUtils;
import com.tcctlo.framework.config.ServerConfig; import com.ruoyi.framework.config.ServerConfig;
/** /**
* 通用请求处理 * 通用请求处理
@ -40,9 +35,6 @@ public class CommonController
@Autowired @Autowired
private ServerConfig serverConfig; private ServerConfig serverConfig;
@Autowired
private FileStorageService fileStorageService;//注入实列
private static final String FILE_DELIMETER = ","; private static final String FILE_DELIMETER = ",";
/** /**
@ -85,23 +77,15 @@ public class CommonController
{ {
try try
{ {
/*// 上传文件路径 // 上传文件路径
String filePath = RuoYiConfig.getUploadPath(); String filePath = RuoYiConfig.getUploadPath();
// 上传并返回新文件名称 // 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file); String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;*/ String url = serverConfig.getUrl() + fileName;
//指定OSS保存文件路径 格式：
String objectName = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd")) + "/";
//上传图片，返回文件信息
FileInfo fileInfo = fileStorageService.of(file)
.setPath(objectName) //保存到相对路径下，为了方便管理，不需要可以不写
.upload(); //将文件上传到对应地方
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("url", fileInfo.getUrl()); ajax.put("url", url);
ajax.put("fileName", fileInfo.getUrl()); //此处的值需要改为url，因为前端的访问地址会做一个判断，如果以http开头就直接显示此图片 ajax.put("fileName", fileName);
ajax.put("newFileName", FileUtils.getName(fileInfo.getUrl())); ajax.put("newFileName", FileUtils.getName(fileName));
ajax.put("originalFilename", file.getOriginalFilename()); ajax.put("originalFilename", file.getOriginalFilename());
return ajax; return ajax;
} }

10
tcctlo-admin/src/main/java/com/tcctlo/web/controller/monitor/CacheController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.constant.CacheConstants; import com.ruoyi.common.constant.CacheConstants;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.system.domain.SysCache; import com.ruoyi.system.domain.SysCache;
/** /**
* 缓存监控 * 缓存监控

6
tcctlo-admin/src/main/java/com/tcctlo/web/controller/monitor/ServerController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
View File

@ -1,11 +1,11 @@
package com.tcctlo.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.framework.web.domain.Server; import com.ruoyi.framework.web.domain.Server;
/** /**
* 服务器监控 * 服务器监控

20
tcctlo-admin/src/main/java/com/tcctlo/web/controller/monitor/SysLogininforController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.framework.web.service.SysPasswordService; import com.ruoyi.framework.web.service.SysPasswordService;
import com.tcctlo.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import com.tcctlo.system.service.ISysLogininforService; import com.ruoyi.system.service.ISysLogininforService;
/** /**
* 系统访问记录 * 系统访问记录

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/monitor/SysOperlogController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import com.tcctlo.system.service.ISysOperLogService; import com.ruoyi.system.service.ISysOperLogService;
/** /**
* 操作日志记录 * 操作日志记录

24
tcctlo-admin/src/main/java/com/tcctlo/web/controller/monitor/SysUserOnlineController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.constant.CacheConstants; import com.ruoyi.common.constant.CacheConstants;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.system.domain.SysUserOnline; import com.ruoyi.system.domain.SysUserOnline;
import com.tcctlo.system.service.ISysUserOnlineService; import com.ruoyi.system.service.ISysUserOnlineService;
/** /**
* 在线用户监控 * 在线用户监控

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysConfigController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
import com.tcctlo.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
/** /**
* 参数配置 信息操作处理 * 参数配置 信息操作处理

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysDeptController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
/** /**
* 部门信息 * 部门信息

22
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysDictDataController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -14,16 +14,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import com.tcctlo.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysDictTypeController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息

6
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysIndexController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@ -1,10 +1,10 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* 首页 * 首页

24
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysLoginController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -7,17 +7,17 @@ import org.springframework.web.bind.annotation.GetMapping;
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.tcctlo.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.tcctlo.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.tcctlo.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginBody;
import com.tcctlo.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.tcctlo.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.tcctlo.framework.web.service.SysLoginService; import com.ruoyi.framework.web.service.SysLoginService;
import com.tcctlo.framework.web.service.SysPermissionService; import com.ruoyi.framework.web.service.SysPermissionService;
import com.tcctlo.framework.web.service.TokenService; import com.ruoyi.framework.web.service.TokenService;
import com.tcctlo.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
/** /**
* 登录验证 * 登录验证

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysMenuController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
/** /**
* 菜单信息 * 菜单信息

16
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysNoticeController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
import com.tcctlo.system.service.ISysNoticeService; import com.ruoyi.system.service.ISysNoticeService;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理

18
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysPostController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import com.tcctlo.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
/** /**
* 岗位信息操作处理 * 岗位信息操作处理

33
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysProfileController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -1,6 +1,5 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -10,19 +9,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.tcctlo.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.tcctlo.common.utils.file.MimeTypeUtils; import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.tcctlo.framework.web.service.TokenService; import com.ruoyi.framework.web.service.TokenService;
import com.tcctlo.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
/** /**
* 个人信息 业务处理 * 个人信息 业务处理
@ -88,10 +87,8 @@ public class SysProfileController extends BaseController
*/ */
@Log(title = "个人信息", businessType = BusinessType.UPDATE) @Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd") @PutMapping("/updatePwd")
public AjaxResult updatePwd(@RequestBody Map<String, String> params) public AjaxResult updatePwd(String oldPassword, String newPassword)
{ {
String oldPassword = params.get("oldPassword");
String newPassword = params.get("newPassword");
LoginUser loginUser = getLoginUser(); LoginUser loginUser = getLoginUser();
String userName = loginUser.getUsername(); String userName = loginUser.getUsername();
String password = loginUser.getPassword(); String password = loginUser.getPassword();

14
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysRegisterController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
View File

@ -1,15 +1,15 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
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.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.model.RegisterBody; import com.ruoyi.common.core.domain.model.RegisterBody;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.framework.web.service.SysRegisterService; import com.ruoyi.framework.web.service.SysRegisterService;
import com.tcctlo.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
/** /**
* 注册验证 * 注册验证

36
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysRoleController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -13,23 +13,23 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.tcctlo.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.tcctlo.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.tcctlo.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.framework.web.service.SysPermissionService; import com.ruoyi.framework.web.service.SysPermissionService;
import com.tcctlo.framework.web.service.TokenService; import com.ruoyi.framework.web.service.TokenService;
import com.tcctlo.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import com.tcctlo.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import com.tcctlo.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.tcctlo.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
/** /**
* 角色信息 * 角色信息

32
tcctlo-admin/src/main/java/com/tcctlo/web/controller/system/SysUserController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.tcctlo.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.tcctlo.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.tcctlo.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.tcctlo.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import com.tcctlo.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
import com.tcctlo.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.tcctlo.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
/** /**
* 用户信息 * 用户信息

8
tcctlo-admin/src/main/java/com/tcctlo/web/controller/tool/TestController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.controller.tool; package com.ruoyi.web.controller.tool;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.tcctlo.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.tcctlo.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

6
tcctlo-admin/src/main/java/com/tcctlo/web/core/config/SwaggerConfig.java → ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.web.core.config; package com.ruoyi.web.core.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.tcctlo.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
@ -58,7 +58,7 @@ public class SwaggerConfig
// 扫描所有有注解的api，用这种方式更灵活 // 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解 // 扫描指定包中的swagger注解
// .apis(RequestHandlerSelectors.basePackage("com.tcctlo.project.tool.swagger")) // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
// 扫描所有 .apis(RequestHandlerSelectors.any()) // 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build() .build()

0
tcctlo-admin/src/main/resources/META-INF/spring-devtools.properties → ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties
View File

4
tcctlo-admin/src/main/resources/application-druid.yml → ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://117.72.45.219:23308/low-office-OA?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: root password: password
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

30
tcctlo-admin/src/main/resources/application.yml → ruoyi-admin/src/main/resources/application.yml
View File

@ -3,9 +3,9 @@ ruoyi:
# 名称 # 名称
name: RuoYi name: RuoYi
# 版本 # 版本
version: 3.8.9 version: 3.8.8
# 版权年份 # 版权年份
copyrightYear: 2025 copyrightYear: 2024
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath profile: D:/ruoyi/uploadPath
# 获取ip地址开关 # 获取ip地址开关
@ -34,7 +34,7 @@ server:
# 日志配置 # 日志配置
logging: logging:
level: level:
com.tcctlo: debug com.ruoyi: debug
org.springframework: warn org.springframework: warn
# 用户配置 # 用户配置
@ -68,13 +68,13 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 117.72.45.219 host: localhost
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: zsqCoCo0806 password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:
@ -100,7 +100,7 @@ token:
# MyBatis配置 # MyBatis配置
mybatis: mybatis:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.tcctlo.**.domain typeAliasesPackage: com.ruoyi.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件 # 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件
@ -127,21 +127,3 @@ xss:
excludes: /system/notice excludes: /system/notice
# 匹配链接 # 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*
# 文件上传
dromara:
x-file-storage: #文件存储配置
default-platform: aliyun-oss-1 #默认使用的存储平台
thumbnail-suffix: ".min.jpg" #缩略图后缀，例如【.min.jpg】【.png】
#对应平台的配置写在这里，注意缩进要对齐
aliyun-oss:
- platform: aliyun-oss-1 # 存储平台标识
enable-storage: true # 启用存储
access-key: LTAI5tL4rKPPR71Ki5CgEHme
secret-key: 8OFQDahu0XHj0ctxGrywA37c81PDiU
end-point: oss-cn-beijing.aliyuncs.com
bucket-name: low-office
domain: https://low-office.oss-cn-beijing.aliyuncs.com/ # 访问域名，注意“/”结尾，例如：https://abc.oss-cn-shanghai.aliyuncs.com/
base-path: low-office-images/ # 基础路径

0
tcctlo-admin/src/main/resources/banner.txt → ruoyi-admin/src/main/resources/banner.txt
View File

0
tcctlo-admin/src/main/resources/i18n/messages.properties → ruoyi-admin/src/main/resources/i18n/messages.properties
View File

2
tcctlo-admin/src/main/resources/logback.xml → ruoyi-admin/src/main/resources/logback.xml
View File

@ -72,7 +72,7 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.tcctlo" level="info" /> <logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />

0
tcctlo-admin/src/main/resources/mybatis/mybatis-config.xml → ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
View File

29
tcctlo-common/pom.xml → ruoyi-common/pom.xml
View File

@ -3,13 +3,13 @@
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>
<artifactId>tcctlo</artifactId> <artifactId>ruoyi</artifactId>
<groupId>com.tcctlo</groupId> <groupId>com.ruoyi</groupId>
<version>3.8.9</version> <version>3.8.8</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>tcctlo-common</artifactId> <artifactId>ruoyi-common</artifactId>
<description> <description>
common通用工具 common通用工具
@ -119,27 +119,6 @@
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
<!-- 阿里云OSS -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.17.4</version>
</dependency>
<!-- 文件上传 -->
<dependency>
<groupId>org.dromara.x-file-storage</groupId>
<artifactId>x-file-storage-spring</artifactId>
<version>2.2.1</version>
</dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
tcctlo-common/src/main/java/com/tcctlo/common/annotation/Anonymous.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

2
tcctlo-common/src/main/java/com/tcctlo/common/annotation/DataScope.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

4
tcctlo-common/src/main/java/com/tcctlo/common/annotation/DataSource.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
@ -6,7 +6,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import com.tcctlo.common.enums.DataSourceType; import com.ruoyi.common.enums.DataSourceType;
/** /**
* 自定义多数据源切换注解 * 自定义多数据源切换注解

4
tcctlo-common/src/main/java/com/tcctlo/common/annotation/Excel.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@ -7,7 +7,7 @@ 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.tcctlo.common.utils.poi.ExcelHandlerAdapter; import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
/** /**
* 自定义导出Excel数据注解 * 自定义导出Excel数据注解

2
tcctlo-common/src/main/java/com/tcctlo/common/annotation/Excels.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

6
tcctlo-common/src/main/java/com/tcctlo/common/annotation/Log.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
View File

@ -1,12 +1,12 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import com.tcctlo.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.tcctlo.common.enums.OperatorType; import com.ruoyi.common.enums.OperatorType;
/** /**
* 自定义操作日志记录注解 * 自定义操作日志记录注解

6
tcctlo-common/src/main/java/com/tcctlo/common/annotation/RateLimiter.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
View File

@ -1,12 +1,12 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import com.tcctlo.common.constant.CacheConstants; import com.ruoyi.common.constant.CacheConstants;
import com.tcctlo.common.enums.LimitType; import com.ruoyi.common.enums.LimitType;
/** /**
* 限流注解 * 限流注解

2
tcctlo-common/src/main/java/com/tcctlo/common/annotation/RepeatSubmit.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

6
tcctlo-common/src/main/java/com/tcctlo/common/annotation/Sensitive.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.tcctlo.common.config.serializer.SensitiveJsonSerializer; import com.ruoyi.common.config.serializer.SensitiveJsonSerializer;
import com.tcctlo.common.enums.DesensitizedType; import com.ruoyi.common.enums.DesensitizedType;
/** /**
* 数据脱敏注解 * 数据脱敏注解

2
tcctlo-common/src/main/java/com/tcctlo/common/config/RuoYiConfig.java → ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.config; package com.ruoyi.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

10
tcctlo-common/src/main/java/com/tcctlo/common/config/serializer/SensitiveJsonSerializer.java → ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.config.serializer; package com.ruoyi.common.config.serializer;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.ContextualSerializer; import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import com.tcctlo.common.annotation.Sensitive; import com.ruoyi.common.annotation.Sensitive;
import com.tcctlo.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.tcctlo.common.enums.DesensitizedType; import com.ruoyi.common.enums.DesensitizedType;
import com.tcctlo.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
/** /**
* 数据脱敏序列化过滤 * 数据脱敏序列化过滤

2
tcctlo-common/src/main/java/com/tcctlo/common/constant/CacheConstants.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.constant; package com.ruoyi.common.constant;
/** /**
* 缓存的key 常量 * 缓存的key 常量

8
tcctlo-common/src/main/java/com/tcctlo/common/constant/Constants.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.constant; package com.ruoyi.common.constant;
import java.util.Locale; import java.util.Locale;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
@ -158,16 +158,16 @@ public class Constants
/** /**
* 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
*/ */
public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.tcctlo" }; public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
/** /**
* 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
*/ */
public static final String[] JOB_WHITELIST_STR = { "com.tcctlo.quartz.task" }; public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.quartz.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.tcctlo.common.utils.file", "com.tcctlo.common.config", "com.tcctlo.generator" }; "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
} }

2
tcctlo-common/src/main/java/com/tcctlo/common/constant/GenConstants.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.constant; package com.ruoyi.common.constant;
/** /**
* 代码生成通用常量 * 代码生成通用常量

2
tcctlo-common/src/main/java/com/tcctlo/common/constant/HttpStatus.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.constant; package com.ruoyi.common.constant;
/** /**
* 返回状态码 * 返回状态码

2
tcctlo-common/src/main/java/com/tcctlo/common/constant/ScheduleConstants.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.constant; package com.ruoyi.common.constant;
/** /**
* 任务调度通用常量 * 任务调度通用常量

2
tcctlo-common/src/main/java/com/tcctlo/common/constant/UserConstants.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.constant; package com.ruoyi.common.constant;
/** /**
* 用户常量信息 * 用户常量信息

24
tcctlo-common/src/main/java/com/tcctlo/common/core/controller/BaseController.java → ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.controller; package com.ruoyi.common.core.controller;
import java.beans.PropertyEditorSupport; import java.beans.PropertyEditorSupport;
import java.util.Date; import java.util.Date;
@ -9,17 +9,17 @@ import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.InitBinder;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.tcctlo.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
import com.tcctlo.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.tcctlo.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.tcctlo.common.core.page.PageDomain; import com.ruoyi.common.core.page.PageDomain;
import com.tcctlo.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.tcctlo.common.core.page.TableSupport; import com.ruoyi.common.core.page.TableSupport;
import com.tcctlo.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.tcctlo.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.tcctlo.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.tcctlo.common.utils.sql.SqlUtil; import com.ruoyi.common.utils.sql.SqlUtil;
/** /**
* web层通用数据处理 * web层通用数据处理

6
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/AjaxResult.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
View File

@ -1,9 +1,9 @@
package com.tcctlo.common.core.domain; package com.ruoyi.common.core.domain;
import java.util.HashMap; import java.util.HashMap;
import java.util.Objects; import java.util.Objects;
import com.tcctlo.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* 操作消息提醒 * 操作消息提醒

2
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/BaseEntity.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain; package com.ruoyi.common.core.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

4
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/R.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
View File

@ -1,7 +1,7 @@
package com.tcctlo.common.core.domain; package com.ruoyi.common.core.domain;
import java.io.Serializable; import java.io.Serializable;
import com.tcctlo.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
/** /**
* 响应信息主体 * 响应信息主体

2
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/TreeEntity.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain; package com.ruoyi.common.core.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

10
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/TreeSelect.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
View File

@ -1,13 +1,13 @@
package com.tcctlo.common.core.domain; package com.ruoyi.common.core.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.tcctlo.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.tcctlo.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.tcctlo.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* Treeselect树结构实体类 * Treeselect树结构实体类

4
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/entity/SysDept.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -8,7 +8,7 @@ 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.tcctlo.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 部门表 sys_dept * 部门表 sys_dept

10
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/entity/SysDictData.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@ -1,13 +1,13 @@
package com.tcctlo.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
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.tcctlo.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.tcctlo.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.tcctlo.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.tcctlo.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 字典数据表 sys_dict_data * 字典数据表 sys_dict_data

8
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/entity/SysDictType.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View File

@ -1,13 +1,13 @@
package com.tcctlo.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
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.tcctlo.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.tcctlo.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.tcctlo.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 字典类型表 sys_dict_type * 字典类型表 sys_dict_type

4
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/entity/SysMenu.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -7,7 +7,7 @@ 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.tcctlo.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 菜单权限表 sys_menu * 菜单权限表 sys_menu

8
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/entity/SysRole.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.Set; import java.util.Set;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@ -6,9 +6,9 @@ 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.tcctlo.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.tcctlo.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.tcctlo.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 角色表 sys_role * 角色表 sys_role

14
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/entity/SysUser.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@ -1,16 +1,16 @@
package com.tcctlo.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
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.tcctlo.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.tcctlo.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.tcctlo.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excel.Type;
import com.tcctlo.common.annotation.Excels; import com.ruoyi.common.annotation.Excels;
import com.tcctlo.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import com.tcctlo.common.xss.Xss; import com.ruoyi.common.xss.Xss;
/** /**
* 用户对象 sys_user * 用户对象 sys_user

2
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/model/LoginBody.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain.model; package com.ruoyi.common.core.domain.model;
/** /**
* 用户登录对象 * 用户登录对象

4
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/model/LoginUser.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
View File

@ -1,7 +1,7 @@
package com.tcctlo.common.core.domain.model; package com.ruoyi.common.core.domain.model;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import com.tcctlo.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import java.util.Collection; import java.util.Collection;

2
tcctlo-common/src/main/java/com/tcctlo/common/core/domain/model/RegisterBody.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.domain.model; package com.ruoyi.common.core.domain.model;
/** /**
* 用户注册对象 * 用户注册对象

4
tcctlo-common/src/main/java/com/tcctlo/common/core/page/PageDomain.java → ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
View File

@ -1,6 +1,6 @@
package com.tcctlo.common.core.page; package com.ruoyi.common.core.page;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* 分页数据 * 分页数据

2
tcctlo-common/src/main/java/com/tcctlo/common/core/page/TableDataInfo.java → ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.page; package com.ruoyi.common.core.page;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;

6
tcctlo-common/src/main/java/com/tcctlo/common/core/page/TableSupport.java → ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
View File

@ -1,7 +1,7 @@
package com.tcctlo.common.core.page; package com.ruoyi.common.core.page;
import com.tcctlo.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.tcctlo.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
/** /**
* 表格数据处理 * 表格数据处理

2
tcctlo-common/src/main/java/com/tcctlo/common/core/redis/RedisCache.java → ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.redis; package com.ruoyi.common.core.redis;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;

4
tcctlo-common/src/main/java/com/tcctlo/common/core/text/CharsetKit.java → ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
View File

@ -1,8 +1,8 @@
package com.tcctlo.common.core.text; package com.ruoyi.common.core.text;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* 字符集工具类 * 字符集工具类

4
tcctlo-common/src/main/java/com/tcctlo/common/core/text/Convert.java → ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.core.text; package com.ruoyi.common.core.text;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.Set; import java.util.Set;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
/** /**

4
tcctlo-common/src/main/java/com/tcctlo/common/core/text/StrFormatter.java → ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
View File

@ -1,6 +1,6 @@
package com.tcctlo.common.core.text; package com.ruoyi.common.core.text;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* 字符串格式化 * 字符串格式化

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/BusinessStatus.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
/** /**
* 操作状态 * 操作状态

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/BusinessType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
/** /**
* 业务操作类型 * 业务操作类型

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/DataSourceType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
/** /**
* 数据源 * 数据源

4
tcctlo-common/src/main/java/com/tcctlo/common/enums/DesensitizedType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java
View File

@ -1,7 +1,7 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
import java.util.function.Function; import java.util.function.Function;
import com.tcctlo.common.utils.DesensitizedUtil; import com.ruoyi.common.utils.DesensitizedUtil;
/** /**
* 脱敏类型 * 脱敏类型

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/HttpMethod.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/LimitType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
/** /**
* 限流类型 * 限流类型

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/OperatorType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
/** /**
* 操作人类别 * 操作人类别

2
tcctlo-common/src/main/java/com/tcctlo/common/enums/UserStatus.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.enums; package com.ruoyi.common.enums;
/** /**
* 用户状态 * 用户状态

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/DemoModeException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception; package com.ruoyi.common.exception;
/** /**
* 演示模式异常 * 演示模式异常

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/GlobalException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception; package com.ruoyi.common.exception;
/** /**
* 全局异常 * 全局异常

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/ServiceException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception; package com.ruoyi.common.exception;
/** /**
* 业务异常 * 业务异常

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/UtilException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception; package com.ruoyi.common.exception;
/** /**
* 工具类异常 * 工具类异常

6
tcctlo-common/src/main/java/com/tcctlo/common/exception/base/BaseException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
View File

@ -1,7 +1,7 @@
package com.tcctlo.common.exception.base; package com.ruoyi.common.exception.base;
import com.tcctlo.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import com.tcctlo.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
/** /**
* 基础异常 * 基础异常

4
tcctlo-common/src/main/java/com/tcctlo/common/exception/file/FileException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
View File

@ -1,6 +1,6 @@
package com.tcctlo.common.exception.file; package com.ruoyi.common.exception.file;
import com.tcctlo.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
/** /**
* 文件信息异常类 * 文件信息异常类

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/file/FileNameLengthLimitExceededException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.file; package com.ruoyi.common.exception.file;
/** /**
* 文件名称超长限制异常类 * 文件名称超长限制异常类

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/file/FileSizeLimitExceededException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.file; package com.ruoyi.common.exception.file;
/** /**
* 文件名大小限制异常类 * 文件名大小限制异常类

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/file/FileUploadException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.file; package com.ruoyi.common.exception.file;
import java.io.PrintStream; import java.io.PrintStream;
import java.io.PrintWriter; import java.io.PrintWriter;

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/file/InvalidExtensionException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.file; package com.ruoyi.common.exception.file;
import java.util.Arrays; import java.util.Arrays;

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/job/TaskException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.job; package com.ruoyi.common.exception.job;
/** /**
* 计划策略异常 * 计划策略异常

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/user/BlackListException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.user; package com.ruoyi.common.exception.user;
/** /**
* 黑名单IP异常类 * 黑名单IP异常类

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/user/CaptchaException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.user; package com.ruoyi.common.exception.user;
/** /**
* 验证码错误异常类 * 验证码错误异常类

2
tcctlo-common/src/main/java/com/tcctlo/common/exception/user/CaptchaExpireException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
View File

@ -1,4 +1,4 @@
package com.tcctlo.common.exception.user; package com.ruoyi.common.exception.user;
/** /**
* 验证码失效异常类 * 验证码失效异常类

4
tcctlo-common/src/main/java/com/tcctlo/common/exception/user/UserException.java → ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
View File

@ -1,6 +1,6 @@
package com.tcctlo.common.exception.user; package com.ruoyi.common.exception.user;
import com.tcctlo.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
/** /**
* 用户信息异常类 * 用户信息异常类

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