Compare commits

...

2 Commits

  1. 26
      ruoyi-admin/src/main/resources/application-dev.yml
  2. 4
      ruoyi-admin/src/main/resources/application.yml
  3. 33
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestController.java
  4. 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java
  5. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/MailController.java
  6. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisCacheController.java
  7. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisLockController.java
  8. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisPubSubController.java
  9. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisRateLimiterController.java
  10. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/SmsController.java
  11. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/Swagger3DemoController.java
  12. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestBatchController.java
  13. 3
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestDemoController.java
  14. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestEncryptController.java
  15. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestExcelController.java
  16. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestI18nController.java
  17. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestSensitiveController.java
  18. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestTreeController.java
  19. 2
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/WeSocketController.java
  20. 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/package-info.java

26
ruoyi-admin/src/main/resources/application-dev.yml

@ -1,7 +1,7 @@
--- # 监控中心配置 --- # 监控中心配置
spring.boot.admin.client: spring.boot.admin.client:
# 增加客户端开关 # 增加客户端开关
enabled: true enabled: false
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
service-host-type: IP service-host-type: IP
@ -13,7 +13,7 @@ spring.boot.admin.client:
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:
enabled: true enabled: false
# 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
group: "ruoyi_group" group: "ruoyi_group"
# SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表
@ -47,17 +47,17 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true url: jdbc:mysql://localhost:3306/environment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root username: root
password: root password: 1234
# 从库数据源 # 从库数据源
slave: # slave:
lazy: true # lazy: true
type: ${spring.datasource.type} # type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver # driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: # username:
password: # password:
# oracle: # oracle:
# type: ${spring.datasource.type} # type: ${spring.datasource.type}
# driverClassName: oracle.jdbc.OracleDriver # driverClassName: oracle.jdbc.OracleDriver
@ -100,9 +100,9 @@ spring.data:
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 11
# redis 密码必须配置 # redis 密码必须配置
password: ruoyi123 # password: ruoyi123
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
# 是否开启ssl # 是否开启ssl

4
ruoyi-admin/src/main/resources/application.yml

@ -21,7 +21,7 @@ captcha:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口,默认为8080 # 服务器的HTTP端口,默认为8080 远程dev:8083
port: 8080 port: 8080
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
@ -70,7 +70,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: @profiles.active@ active: dev
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:

33
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestController.java

@ -0,0 +1,33 @@
package org.dromara.demo.controller;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
/**
* @Author gejunhao
* @Date 2025/1/10 14:11
* @Description: 测试接口
*/
@Slf4j
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/test")
public class TestController {
@GetMapping("/hello")
public void test(HttpServletResponse response) throws IOException {
log.info("hello word!");
response.setContentType("text/html;charset=utf8");
response.getWriter().println("GJH-调用接口成功!");
}
}

1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java

@ -1 +0,0 @@
package org.dromara.demo.controller;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/MailController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.mail.utils.MailUtils; import org.dromara.common.mail.utils.MailUtils;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisCacheController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisLockController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockInfo;
import com.baomidou.lock.LockTemplate; import com.baomidou.lock.LockTemplate;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisPubSubController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/RedisRateLimiterController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.ratelimiter.annotation.RateLimiter; import org.dromara.common.ratelimiter.annotation.RateLimiter;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/SmsController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/Swagger3DemoController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestBatchController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;

3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestDemoController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
@ -30,6 +30,7 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestEncryptController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.demo.domain.TestDemoEncrypt; import org.dromara.demo.domain.TestDemoEncrypt;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestExcelController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestI18nController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MessageUtils; import org.dromara.common.core.utils.MessageUtils;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestSensitiveController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/TestTreeController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/WeSocketController.java

@ -1,4 +1,4 @@
package org.dromara.demo.controller; package org.dromara.demo.controller.test;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.websocket.dto.WebSocketMessageDto; import org.dromara.common.websocket.dto.WebSocketMessageDto;

1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/test/package-info.java

@ -0,0 +1 @@
package org.dromara.demo.controller.test;
Loading…
Cancel
Save