Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改系统

Browse Source
This commit is contained in:
huangdeliang 2020-11-25 21:36:44 +08:00
commit e6b6ff145b
570 changed files with 47911 additions and 47241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
.gitignore vendored
View File

@ -42,4 +42,6 @@ nbdist/
!*/build/*.java
!*/build/*.html
!*/build/*.xml
running/*
running/file/*
running/logs/*
running/uploadPath/*

14
.vscode/launch.json vendored
View File

@ -1,14 +0,0 @@
{
"configurations": [
{
"type": "java",
"name": "Spring Boot-RuoYiApplication<ruoyi-admin>",
"request": "launch",
"cwd": "${workspaceFolder}",
"console": "internalConsole",
"mainClass": "com.ruoyi.RuoYiApplication",
"projectName": "ruoyi-admin",
"args": ""
}
]
}

3
.vscode/settings.json vendored
View File

@ -1,3 +0,0 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}

7
bin/build-server.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/sh
cd /home/workspace/ShengTangManage
git pull origin master
mvn clean package -Dmaven.test.skip=true -P prod
rm -f /home/api/manage.shengtangdiet.com/st-manage.jar
cp -f ./stdiet-admin/target/stdiet-admin.jar /home/api/manage.shengtangdiet.com/st-manage.jar
nohup java -jar /home/api/manage.shengtangdiet.com/st-manage.jar

7
bin/build-test-server.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/sh
cd /home/workspace/ShengTangManage
git pull origin master
mvn clean package -Dmaven.test.skip=true -P dev
rm -f /home/api/manage.shengtangdiet.com/test/st-manage.jar
cp -f ./ruoyi-admin/target/stdiet-admin.jar /home/api/manage.shengtangdiet.com/test/st-manage.jar
nohup java -jar /home/api/manage.shengtangdiet.co/test/st-manage.jar

7
bin/build-test-web.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/sh
cd /home/workspace/ShengTangManage/stdiet-ui
git pull origin master
yarn
yarn build:stage
rm -rf /home/web/test.stdiet/dist
cp -rf ./dist /home/web/test.stdiet/

7
bin/build-web.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/sh
cd /home/workspace/ShengTangManage/stdiet-ui
git pull origin master
yarn
yarn build:prod
rm -rf /home/web/manage.shengtangdiet.com/dist
cp -rf ./dist /home/web/manage.shengtangdiet.com/

BIN
doc/.DS_Store vendored Normal file
View File

Binary file not shown.

95
pom.xml
View File

@ -3,16 +3,16 @@
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>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<groupId>com.stdiet</groupId>
<artifactId>stdiet</artifactId>
<version>3.1.0</version>
<name>ruoyi</name>
<name>stdiet</name>
<!-- <url>http://www.ruoyi.vip</url> -->
<description>管理系统</description>
<properties>
<ruoyi.version>3.1.0</ruoyi.version>
<stdiet.version>3.1.0</stdiet.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@ -148,50 +148,50 @@
<!-- 定时任务-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-quartz</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-generator</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-framework</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-system</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-common</artifactId>
<version>${stdiet.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-custom</module>
<module>stdiet-admin</module>
<module>stdiet-framework</module>
<module>stdiet-system</module>
<module>stdiet-quartz</module>
<module>stdiet-generator</module>
<module>stdiet-common</module>
<module>stdiet-custom</module>
</modules>
<packaging>pom</packaging>
@ -207,7 +207,25 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<!-- 资源文件处理插件，必须配置 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
<resources>
<!-- 所有公共资源文件 -->
<resource>
<directory>src/main/resources</directory>
</resource>
<!-- 不同环境的资源文件 -->
<resource>
<directory>src/main/filters/${profileActive}</directory>
</resource>
</resources>
</build>
<repositories>
@ -235,4 +253,29 @@
</pluginRepository>
</pluginRepositories>
<profiles>
<!-- dev开发环境配置,release为生产环境配置 -->
<profile>
<id>dev</id>
<properties>
<profileActive>dev</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>local</id>
<properties>
<profileActive>local</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>prod</profileActive>
</properties>
</profile>
</profiles>
</project>

BIN
running/.DS_Store vendored
View File

Binary file not shown.

BIN
running/file/1603673251084.pdf
View File

Binary file not shown.

BIN
running/file/1603933440270.pdf
View File

Binary file not shown.

61
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -1,61 +0,0 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# password: wonderdb
# url: jdbc:mysql://47.115.23.82:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
password: Ttj4fAHU
username: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

2
ry.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
AppName=ruoyi-admin.jar
AppName=stdiet-admin.jar
#JVM参数
JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"

41
ruoyi-admin/pom.xml → stdiet-admin/pom.xml
View File

@ -2,13 +2,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<artifactId>stdiet</artifactId>
<groupId>com.stdiet</groupId>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>ruoyi-admin</artifactId>
<packaging>jar</packaging>
<artifactId>stdiet-admin</artifactId>
<description>
web服务入口
@ -56,20 +56,20 @@
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-framework</artifactId>
</dependency>
<!-- 定时任务-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-quartz</artifactId>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-generator</artifactId>
</dependency>
<!-- Java 6 = JAX-B Version 2.0 -->
@ -96,29 +96,12 @@
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-custom</artifactId>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-custom</artifactId>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
<!-- 多模块排除内置tomcat -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

69
ruoyi-admin/src/main/resources/application.yml → stdiet-admin/src/main/filters/dev/application.yml
View File

@ -1,7 +1,7 @@
# 项目相关配置
ruoyi:
stdiet:
# 名称
name: Ruoyi
name: Stdiet
# 版本
version: 3.1.0
# 版权年份
@ -9,8 +9,7 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
# profile: /Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/uploadPath
profile: /home/api/manage.shengtangdiet.com/uploadPath
profile: /home/api/manage.shengtangdiet.com/test/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
@ -19,7 +18,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8090
port: 8091
servlet:
# 应用的访问路径
context-path: /
@ -34,7 +33,7 @@ server:
# 日志配置
logging:
level:
com.ruoyi: debug
com.stdiet: debug
org.springframework: warn
# Spring配置
@ -77,20 +76,74 @@ spring:
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
password: Ttj4fAHU
username: root
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
secret: shengtangdiet
# 令牌有效期（默认30分钟）
expireTime: 30
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain
typeAliasesPackage: com.stdiet.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件

93
stdiet-admin/src/main/filters/dev/logback.xml Normal file
View File

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/home/api/manage.shengtangdiet.com/test/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 用户访问日志输出 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-user.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 按天回滚 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.stdiet" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
<!--系统用户操作日志-->
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
</configuration>

173
stdiet-admin/src/main/filters/local/application.yml Normal file
View File

@ -0,0 +1,173 @@
# 项目相关配置
stdiet:
# 名称
name: Stdiet
# 版本
version: 3.1.0
# 版权年份
copyrightYear: 2020
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /Users/wonder/Documents/Workspaces/java/ShengtangManage/running/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8090
servlet:
# 应用的访问路径
context-path: /
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.stdiet: debug
org.springframework: warn
# Spring配置
spring:
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 密码
password:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
password: wonderdb
username: root
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: shengtangdiet
# 令牌有效期（默认30分钟）
expireTime: 30
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.stdiet.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
# PageHelper分页插件
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countSql
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /dev-api
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*

93
stdiet-admin/src/main/filters/local/logback.xml Normal file
View File

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/Users/wonder/Documents/Workspaces/node/ShengtangMange/running/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 用户访问日志输出 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-user.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 按天回滚 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.stdiet" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
<!--系统用户操作日志-->
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
</configuration>

173
stdiet-admin/src/main/filters/prod/application.yml Normal file
View File

@ -0,0 +1,173 @@
# 项目相关配置
stdiet:
# 名称
name: Stdiet
# 版本
version: 3.1.0
# 版权年份
copyrightYear: 2020
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /home/api/manage.shengtangdiet.com/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8091
servlet:
# 应用的访问路径
context-path: /
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.stdiet: debug
org.springframework: warn
# Spring配置
spring:
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 密码
password:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
password: Ttj4fAHU
username: root
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: shengtangdiet
# 令牌有效期（默认30分钟）
expireTime: 30
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.stdiet.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
# PageHelper分页插件
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countSql
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /dev-api
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*

3
ruoyi-admin/src/main/resources/logback.xml → stdiet-admin/src/main/filters/prod/logback.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<!-- <property name="log.path" value="/Users/wonder/Documents/Workspaces/node/RuoYi-Vue/running/logs" />-->
<property name="log.path" value="/home/api/manage.shengtangdiet.com/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@ -73,7 +72,7 @@
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<logger name="com.stdiet" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />

6
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java → stdiet-admin/src/main/java/com/stdiet/StdietApplication.java
View File

@ -1,4 +1,4 @@
package com.ruoyi;
package com.stdiet;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -10,12 +10,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author ruoyi
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
public class StdietApplication
{
public static void main(String[] args)
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
SpringApplication.run(StdietApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +

6
ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → stdiet-admin/src/main/java/com/stdiet/StdietServletInitializer.java
View File

@ -1,4 +1,4 @@
package com.ruoyi;
package com.stdiet;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
*
* @author ruoyi
*/
public class RuoYiServletInitializer extends SpringBootServletInitializer
public class StdietServletInitializer extends SpringBootServletInitializer
{
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
{
return application.sources(RuoYiApplication.class);
return application.sources(StdietApplication.class);
}
}

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.common;
package com.stdiet.web.controller.common;
import java.awt.image.BufferedImage;
import java.io.IOException;
@ -12,11 +12,11 @@ import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.sign.Base64;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.stdiet.common.constant.Constants;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.redis.RedisCache;
import com.stdiet.common.utils.sign.Base64;
import com.stdiet.common.utils.uuid.IdUtils;
/**
* 验证码操作处理
@ -36,7 +36,7 @@ public class CaptchaController
private RedisCache redisCache;
// 验证码类型
@Value("${ruoyi.captchaType}")
@Value("${stdiet.captchaType}")
private String captchaType;
/**

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

@ -1,12 +1,12 @@
package com.ruoyi.web.controller.common;
package com.stdiet.web.controller.common;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
import com.stdiet.common.config.RuoYiConfig;
import com.stdiet.common.constant.Constants;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.file.FileUploadUtils;
import com.stdiet.common.utils.file.FileUtils;
import com.stdiet.framework.config.ServerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/CusUserPostController.java → stdiet-admin/src/main/java/com/stdiet/web/controller/custom/CusUserPostController.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.web.controller.custom;
package com.stdiet.web.controller.custom;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.custom.domain.CusUserPost;
import com.ruoyi.custom.service.ICusUserPostService;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.custom.domain.CusUserPost;
import com.stdiet.custom.service.ICusUserPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

21
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/CusWxController.java Normal file
View File

@ -0,0 +1,21 @@
package com.stdiet.web.controller.custom;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.custom.domain.WxPush;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/wx")
public class CusWxController extends BaseController {
// @GetMapping("/push")
// public String msgPushTest(@PathVariable("echostr") String echostr) {
// return echostr;
// }
//
// @PostMapping("/push")
// public void msgPush(@RequestBody WxPush pushMsg) {
//
// }
}

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java → stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.web.controller.custom;
package com.stdiet.web.controller.custom;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.framework.web.domain.server.Sys;
import com.ruoyi.system.domain.CusSalesman;
import com.ruoyi.system.service.ISysUserService;
import com.stdiet.framework.web.domain.server.Sys;
import com.stdiet.system.domain.CusSalesman;
import com.stdiet.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -16,14 +16,14 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.custom.domain.SysCommision;
import com.ruoyi.custom.service.ISysCommisionService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.custom.domain.SysCommision;
import com.stdiet.custom.service.ISysCommisionService;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.common.core.page.TableDataInfo;
/**
* 业务提成比例Controller

26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java → stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysContractController.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.web.controller.custom;
package com.stdiet.web.controller.custom;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.custom.domain.SysContract;
import com.ruoyi.custom.page.PdfProcessInfo;
import com.ruoyi.custom.service.ISysContractService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.domain.SysContract;
import com.stdiet.custom.page.PdfProcessInfo;
import com.stdiet.custom.service.ISysContractService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -38,9 +38,12 @@ public class SysContractController extends BaseController {
startPage();
List<SysContract> list = sysContractService.selectSysContractList(sysContract);
for (SysContract contract : list) {
if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().equals(contract.getSignName())) {
if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().trim().equals(contract.getSignName())) {
contract.setName(contract.getName() + "（" + contract.getSignName() + "）");
}
if(contract.getPhone() != null && !contract.getPhone().equals("")) {
contract.setPhone(contract.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}
}
return getDataTable(list);
}
@ -110,6 +113,7 @@ public class SysContractController extends BaseController {
data.put("serveTime", contract.getServeTime() + "");
data.put("tutor", contract.getTutor());
data.put("servePromise", contract.getServePromise());
data.put("remark", contract.getRemark());
ajax.put("data", data);
}
return ajax;

35
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java → stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.web.controller.custom;
package com.stdiet.web.controller.custom;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.custom.controller.OrderBaseController;
import com.ruoyi.custom.page.OrderTableDataInfo;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysUserService;
import com.stdiet.common.core.domain.entity.SysDictData;
import com.stdiet.common.core.domain.entity.SysUser;
import com.stdiet.custom.controller.OrderBaseController;
import com.stdiet.custom.page.OrderTableDataInfo;
import com.stdiet.system.service.ISysDictDataService;
import com.stdiet.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.custom.domain.SysOrder;
import com.ruoyi.custom.service.ISysOrderService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.custom.domain.SysOrder;
import com.stdiet.custom.service.ISysOrderService;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.common.core.page.TableDataInfo;
/**
* 销售订单Controller
@ -80,8 +80,11 @@ public class SysOrderController extends OrderBaseController {
order.setOperatorAssis(user.getNickName());
}
}
if(order.getPhone() != null && !order.getPhone().equals("")) {
order.setPhone(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}
}
return getOrderDataTable(list, totalAmount.longValue());
return getOrderDataTable(list, totalAmount);
}

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

@ -1,17 +1,17 @@
package com.ruoyi.web.controller.monitor;
package com.stdiet.web.controller.monitor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.domain.Server;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.framework.web.domain.Server;
/**
* 服务器监控
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/monitor/server")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.stdiet.web.controller.monitor;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.system.domain.SysLogininfor;
import com.stdiet.system.service.ISysLogininforService;
/**
* 系统访问记录
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/monitor/logininfor")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.stdiet.web.controller.monitor;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.system.domain.SysOperLog;
import com.stdiet.system.service.ISysOperLogService;
/**
* 操作日志记录
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/monitor/operlog")

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

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

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,22 +12,22 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.annotation.RepeatSubmit;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.system.domain.SysConfig;
import com.stdiet.system.service.ISysConfigService;
/**
* 参数配置 信息操作处理
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/config")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.Iterator;
import java.util.List;
@ -14,20 +14,20 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysDept;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.system.service.ISysDeptService;
/**
* 部门信息
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/dept")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysDictData;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.system.service.ISysDictDataService;
import com.stdiet.system.service.ISysDictTypeService;
/**
* 数据字典信息
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/dict/data")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysDictType;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.system.service.ISysDictTypeService;
/**
* 数据字典信息
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/dict/type")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import java.util.Set;
@ -7,22 +7,22 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
import com.stdiet.common.constant.Constants;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysMenu;
import com.stdiet.common.core.domain.entity.SysUser;
import com.stdiet.common.core.domain.model.LoginBody;
import com.stdiet.common.core.domain.model.LoginUser;
import com.stdiet.common.utils.ServletUtils;
import com.stdiet.framework.web.service.SysLoginService;
import com.stdiet.framework.web.service.SysPermissionService;
import com.stdiet.framework.web.service.TokenService;
import com.stdiet.system.service.ISysMenuService;
/**
* 登录验证
*
* @author ruoyi
* @author stdiet
*/
@RestController
public class SysLoginController

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,24 +12,24 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.Constants;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysMenu;
import com.stdiet.common.core.domain.model.LoginUser;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.ServletUtils;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.framework.web.service.TokenService;
import com.stdiet.system.service.ISysMenuService;
/**
* 菜单信息
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/menu")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.system.domain.SysNotice;
import com.stdiet.system.service.ISysNoticeService;
/**
* 公告 信息操作处理

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.system.domain.SysPost;
import com.stdiet.system.service.ISysPostService;
/**
* 岗位信息操作处理
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/post")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.io.IOException;
import org.springframework.beans.factory.annotation.Autowired;
@ -10,23 +10,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysUserService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.config.RuoYiConfig;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysUser;
import com.stdiet.common.core.domain.model.LoginUser;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.ServletUtils;
import com.stdiet.common.utils.file.FileUploadUtils;
import com.stdiet.framework.web.service.TokenService;
import com.stdiet.system.service.ISysUserService;
/**
* 个人信息 业务处理
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/user/profile")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,27 +12,27 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysRole;
import com.stdiet.common.core.domain.model.LoginUser;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.ServletUtils;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.framework.web.service.SysPermissionService;
import com.stdiet.framework.web.service.TokenService;
import com.stdiet.system.service.ISysRoleService;
import com.stdiet.system.service.ISysUserService;
/**
* 角色信息
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/role")

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.stdiet.web.controller.system;
import java.util.List;
import java.util.stream.Collectors;
@ -14,28 +14,28 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysRole;
import com.stdiet.common.core.domain.entity.SysUser;
import com.stdiet.common.core.domain.model.LoginUser;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.ServletUtils;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.framework.web.service.TokenService;
import com.stdiet.system.service.ISysPostService;
import com.stdiet.system.service.ISysRoleService;
import com.stdiet.system.service.ISysUserService;
/**
* 用户信息
*
* @author ruoyi
* @author stdiet
*/
@RestController
@RequestMapping("/system/user")

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java → stdiet-admin/src/main/java/com/stdiet/web/controller/tool/SwaggerController.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.tool;
package com.stdiet.web.controller.tool;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController;
import com.stdiet.common.core.controller.BaseController;
/**
* swagger 接口

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

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.tool;
package com.stdiet.web.controller.tool;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel;

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

@ -1,4 +1,4 @@
package com.ruoyi.web.core.config;
package com.stdiet.web.core.config;
import java.util.ArrayList;
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.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
import com.stdiet.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;

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

2
ruoyi-admin/src/main/resources/banner.txt → stdiet-admin/src/main/resources/banner.txt
View File

@ -1,4 +1,4 @@
Application Version: ${ruoyi.version}
Application Version: ${stdiet.version}
Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
// _ooOoo_ //

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

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

6
ruoyi-common/pom.xml → stdiet-common/pom.xml
View File

@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<artifactId>stdiet</artifactId>
<groupId>com.stdiet</groupId>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common</artifactId>
<artifactId>stdiet-common</artifactId>
<description>
common通用工具

4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java → stdiet-common/src/main/java/com/stdiet/common/annotation/DataScope.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation;
package com.stdiet.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -9,7 +9,7 @@ import java.lang.annotation.Target;
/**
* 数据权限过滤注解
*
* @author ruoyi
* @author stdiet
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)

6
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java → stdiet-common/src/main/java/com/stdiet/common/annotation/DataSource.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation;
package com.stdiet.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -6,14 +6,14 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ruoyi.common.enums.DataSourceType;
import com.stdiet.common.enums.DataSourceType;
/**
* 自定义多数据源切换注解
*
* 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
*
* @author ruoyi
* @author stdiet
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)

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

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation;
package com.stdiet.common.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -9,7 +9,7 @@ import java.math.BigDecimal;
/**
* 自定义导出Excel数据注解
*
* @author ruoyi
* @author stdiet
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)

4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java → stdiet-common/src/main/java/com/stdiet/common/annotation/Excels.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation;
package com.stdiet.common.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* Excel注解集
*
* @author ruoyi
* @author stdiet
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)

8
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java → stdiet-common/src/main/java/com/stdiet/common/annotation/Log.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.common.annotation;
package com.stdiet.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OperatorType;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.enums.OperatorType;
/**
* 自定义操作日志记录注解
*
* @author ruoyi
* @author stdiet
*
*/
@Target({ ElementType.PARAMETER, ElementType.METHOD })

4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java → stdiet-common/src/main/java/com/stdiet/common/annotation/RepeatSubmit.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation;
package com.stdiet.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -10,7 +10,7 @@ import java.lang.annotation.Target;
/**
* 自定义注解防止表单重复提交
*
* @author ruoyi
* @author stdiet
*
*/
@Inherited

6
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java → stdiet-common/src/main/java/com/stdiet/common/config/RuoYiConfig.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.config;
package com.stdiet.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@ -6,10 +6,10 @@ import org.springframework.stereotype.Component;
/**
* 读取项目相关配置
*
* @author ruoyi
* @author stdiet
*/
@Component
@ConfigurationProperties(prefix = "ruoyi")
@ConfigurationProperties(prefix = "stdiet")
public class RuoYiConfig
{
/** 项目名称 */

4
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java → stdiet-common/src/main/java/com/stdiet/common/constant/Constants.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant;
package com.stdiet.common.constant;
/**
* 通用常量信息
*
* @author ruoyi
* @author stdiet
*/
public class Constants
{

4
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java → stdiet-common/src/main/java/com/stdiet/common/constant/GenConstants.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant;
package com.stdiet.common.constant;
/**
* 代码生成通用常量
*
* @author ruoyi
* @author stdiet
*/
public class GenConstants
{

4
ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java → stdiet-common/src/main/java/com/stdiet/common/constant/HttpStatus.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant;
package com.stdiet.common.constant;
/**
* 返回状态码
*
* @author ruoyi
* @author stdiet
*/
public class HttpStatus
{

4
ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java → stdiet-common/src/main/java/com/stdiet/common/constant/ScheduleConstants.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant;
package com.stdiet.common.constant;
/**
* 任务调度通用常量
*
* @author ruoyi
* @author stdiet
*/
public class ScheduleConstants
{

4
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java → stdiet-common/src/main/java/com/stdiet/common/constant/UserConstants.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant;
package com.stdiet.common.constant;
/**
* 用户常量信息
*
* @author ruoyi
* @author stdiet
*/
public class UserConstants
{

20
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java → stdiet-common/src/main/java/com/stdiet/common/core/controller/BaseController.java
View File

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

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java → stdiet-common/src/main/java/com/stdiet/common/core/domain/AjaxResult.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.common.core.domain;
package com.stdiet.common.core.domain;
import java.util.HashMap;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.constant.HttpStatus;
import com.stdiet.common.utils.StringUtils;
/**
* 操作消息提醒
*
* @author ruoyi
* @author stdiet
*/
public class AjaxResult extends HashMap<String, Object>
{

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java → stdiet-common/src/main/java/com/stdiet/common/core/domain/BaseEntity.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain;
package com.stdiet.common.core.domain;
import java.io.Serializable;
import java.util.Date;
@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* Entity基类
*
* @author ruoyi
* @author stdiet
*/
public class BaseEntity implements Serializable
{

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java → stdiet-common/src/main/java/com/stdiet/common/core/domain/TreeEntity.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain;
package com.stdiet.common.core.domain;
import java.util.ArrayList;
import java.util.List;
@ -6,7 +6,7 @@ import java.util.List;
/**
* Tree基类
*
* @author ruoyi
* @author stdiet
*/
public class TreeEntity extends BaseEntity
{

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java → stdiet-common/src/main/java/com/stdiet/common/core/domain/TreeSelect.java
View File

@ -1,16 +1,16 @@
package com.ruoyi.common.core.domain;
package com.stdiet.common.core.domain;
import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.stdiet.common.core.domain.entity.SysDept;
import com.stdiet.common.core.domain.entity.SysMenu;
/**
* Treeselect树结构实体类
*
* @author ruoyi
* @author stdiet
*/
public class TreeSelect implements Serializable
{

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

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.stdiet.common.core.domain.entity;
import java.util.ArrayList;
import java.util.List;
@ -7,12 +7,12 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 部门表 sys_dept
*
* @author ruoyi
* @author stdiet
*/
public class SysDept extends BaseEntity
{

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

@ -1,18 +1,18 @@
package com.ruoyi.common.core.domain.entity;
package com.stdiet.common.core.domain.entity;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.annotation.Excel.ColumnType;
import com.stdiet.common.constant.UserConstants;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 字典数据表 sys_dict_data
*
* @author ruoyi
* @author stdiet
*/
public class SysDictData extends BaseEntity
{

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

@ -1,12 +1,12 @@
package com.ruoyi.common.core.domain.entity;
package com.stdiet.common.core.domain.entity;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.annotation.Excel.ColumnType;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 字典类型表 sys_dict_type

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

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.stdiet.common.core.domain.entity;
import java.util.ArrayList;
import java.util.List;
@ -6,12 +6,12 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 菜单权限表 sys_menu
*
* @author ruoyi
* @author stdiet
*/
public class SysMenu extends BaseEntity
{

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

@ -1,17 +1,17 @@
package com.ruoyi.common.core.domain.entity;
package com.stdiet.common.core.domain.entity;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.annotation.Excel.ColumnType;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 角色表 sys_role
*
* @author ruoyi
* @author stdiet
*/
public class SysRole extends BaseEntity
{

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

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.stdiet.common.core.domain.entity;
import java.util.Date;
import java.util.List;
@ -10,16 +10,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.annotation.Excel.ColumnType;
import com.stdiet.common.annotation.Excel.Type;
import com.stdiet.common.annotation.Excels;
import com.stdiet.common.core.domain.BaseEntity;
/**
* 用户对象 sys_user
*
* @author ruoyi
* @author stdiet
*/
public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L;

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

@ -1,9 +1,9 @@
package com.ruoyi.common.core.domain.model;
package com.stdiet.common.core.domain.model;
/**
* 用户登录对象
*
* @author ruoyi
* @author stdiet
*/
public class LoginBody
{

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

@ -1,16 +1,16 @@
package com.ruoyi.common.core.domain.model;
package com.stdiet.common.core.domain.model;
import java.util.Collection;
import java.util.Set;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.stdiet.common.core.domain.entity.SysUser;
/**
* 登录用户身份权限
*
* @author ruoyi
* @author stdiet
*/
public class LoginUser implements UserDetails
{

6
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java → stdiet-common/src/main/java/com/stdiet/common/core/page/PageDomain.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.page;
package com.stdiet.common.core.page;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.utils.StringUtils;
/**
* 分页数据
*
* @author ruoyi
* @author stdiet
*/
public class PageDomain
{

4
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java → stdiet-common/src/main/java/com/stdiet/common/core/page/TableDataInfo.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.page;
package com.stdiet.common.core.page;
import java.io.Serializable;
import java.util.List;
@ -6,7 +6,7 @@ import java.util.List;
/**
* 表格分页数据对象
*
* @author ruoyi
* @author stdiet
*/
public class TableDataInfo implements Serializable
{

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

@ -1,11 +1,11 @@
package com.ruoyi.common.core.page;
package com.stdiet.common.core.page;
import com.ruoyi.common.utils.ServletUtils;
import com.stdiet.common.utils.ServletUtils;
/**
* 表格数据处理
*
* @author ruoyi
* @author stdiet
*/
public class TableSupport
{

4
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java → stdiet-common/src/main/java/com/stdiet/common/core/redis/RedisCache.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.redis;
package com.stdiet.common.core.redis;
import java.util.Collection;
import java.util.List;
@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
/**
* spring redis 工具类
*
* @author ruoyi
* @author stdiet
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component

6
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → stdiet-common/src/main/java/com/stdiet/common/core/text/CharsetKit.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.common.core.text;
package com.stdiet.common.core.text;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.utils.StringUtils;
/**
* 字符集工具类
*
* @author ruoyi
* @author stdiet
*/
public class CharsetKit
{

6
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java → stdiet-common/src/main/java/com/stdiet/common/core/text/Convert.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.text;
package com.stdiet.common.core.text;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -6,12 +6,12 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
import java.util.Set;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.utils.StringUtils;
/**
* 类型转换器
*
* @author ruoyi
* @author stdiet
*/
public class Convert
{

6
ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → stdiet-common/src/main/java/com/stdiet/common/core/text/StrFormatter.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.text;
package com.stdiet.common.core.text;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.utils.StringUtils;
/**
* 字符串格式化
*
* @author ruoyi
* @author stdiet
*/
public class StrFormatter
{

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

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

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

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

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

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

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

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

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

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

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

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

8
ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java → stdiet-common/src/main/java/com/stdiet/common/exception/BaseException.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.common.exception;
package com.stdiet.common.exception;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.stdiet.common.utils.MessageUtils;
import com.stdiet.common.utils.StringUtils;
/**
* 基础异常
*
* @author ruoyi
* @author stdiet
*/
public class BaseException extends RuntimeException
{

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java → stdiet-common/src/main/java/com/stdiet/common/exception/CustomException.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.exception;
package com.stdiet.common.exception;
/**
* 自定义异常
*
* @author ruoyi
* @author stdiet
*/
public class CustomException extends RuntimeException
{

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java → stdiet-common/src/main/java/com/stdiet/common/exception/DemoModeException.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.exception;
package com.stdiet.common.exception;
/**
* 演示模式异常
*
* @author ruoyi
* @author stdiet
*/
public class DemoModeException extends RuntimeException
{

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java → stdiet-common/src/main/java/com/stdiet/common/exception/UtilException.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.exception;
package com.stdiet.common.exception;
/**
* 工具类异常
*
* @author ruoyi
* @author stdiet
*/
public class UtilException extends RuntimeException
{

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java → stdiet-common/src/main/java/com/stdiet/common/exception/file/FileException.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.exception.file;
package com.stdiet.common.exception.file;
import com.ruoyi.common.exception.BaseException;
import com.stdiet.common.exception.BaseException;
/**
* 文件信息异常类
*
* @author ruoyi
* @author stdiet
*/
public class FileException extends BaseException
{

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java → stdiet-common/src/main/java/com/stdiet/common/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.exception.file;
package com.stdiet.common.exception.file;
/**
* 文件名称超长限制异常类
*
* @author ruoyi
* @author stdiet
*/
public class FileNameLengthLimitExceededException extends FileException
{

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java → stdiet-common/src/main/java/com/stdiet/common/exception/file/FileSizeLimitExceededException.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.exception.file;
package com.stdiet.common.exception.file;
/**
* 文件名大小限制异常类
*
* @author ruoyi
* @author stdiet
*/
public class FileSizeLimitExceededException extends FileException
{

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java → stdiet-common/src/main/java/com/stdiet/common/exception/file/InvalidExtensionException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.file;
package com.stdiet.common.exception.file;
import java.util.Arrays;
import org.apache.commons.fileupload.FileUploadException;
@ -6,7 +6,7 @@ import org.apache.commons.fileupload.FileUploadException;
/**
* 文件上传 误异常类
*
* @author ruoyi
* @author stdiet
*/
public class InvalidExtensionException extends FileUploadException
{

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