From 086fa9189a71b6c960e46a4887303254c4fda3da Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 19 Aug 2025 14:09:49 +0800 Subject: [PATCH] 2 --- .../src/main/resources/application-prod.yml | 86 +++++------ .../src/main/resources/application.yml | 5 +- .../java/org/dromara/test/AssertUnitTest.java | 90 +++++------ .../java/org/dromara/test/DemoUnitTest.java | 140 ++++++++--------- .../java/org/dromara/test/ParamUnitTest.java | 144 +++++++++--------- .../java/org/dromara/test/TagUnitTest.java | 108 ++++++------- .../controller/ProjectInfoController.java | 2 +- .../demo/domain/vo/AllGoatAchieve.java | 15 ++ 8 files changed, 303 insertions(+), 287 deletions(-) create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/AllGoatAchieve.java diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index d261118..24e9820 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -1,10 +1,7 @@ ---- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp - --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: true + enabled: false url: http://localhost:9090/admin instance: service-host-type: IP @@ -16,7 +13,7 @@ spring.boot.admin.client: --- # snail-job 配置 snail-job: - enabled: true + enabled: false # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 group: "ruoyi_group" # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 @@ -38,7 +35,7 @@ spring: # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false + p6spy: true # 设置默认的数据源或者数据源组,默认值即为 master primary: master # 严格模式 匹配不到数据源则报错 @@ -48,37 +45,37 @@ spring: master: type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 environment # 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://10.1.21.250:3306/environment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: root + password: HXj-6nR|D8xy*h#!I&:( # 从库数据源 - slave: - lazy: true - type: ${spring.datasource.type} - 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 - username: - password: -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root + # slave: + # lazy: true + # type: ${spring.datasource.type} + # 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 + # username: + # password: + # oracle: + # type: ${spring.datasource.type} + # driverClassName: oracle.jdbc.OracleDriver + # url: jdbc:oracle:thin:@//localhost:1521/XE + # username: ROOT + # password: root + # postgres: + # type: ${spring.datasource.type} + # driverClassName: org.postgresql.Driver + # url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + # username: root + # password: root + # sqlserver: + # type: ${spring.datasource.type} + # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true + # username: SA + # password: root hikari: # 最大连接池数量 maxPoolSize: 20 @@ -99,13 +96,15 @@ spring: spring.data: redis: # 地址 - host: localhost + host: 10.1.21.250 # 端口，默认为6379 - port: 6379 + port: 6382 # 数据库索引 - database: 0 + database: 11 # redis 密码必须配置 - password: ruoyi123 + # password: ruoyi123 + # 服务器连接密码（默认为空） + password: F*Nx=BZli+ZCCI-Fil+3 # 连接超时时间 timeout: 10s # 是否开启ssl @@ -116,17 +115,17 @@ redisson: # redis key前缀 keyPrefix: # 线程池数量 - threads: 16 + threads: 4 # Netty线程池数量 - nettyThreads: 32 + nettyThreads: 8 # 单节点配置 singleServerConfig: # 客户端名称 clientName: ${ruoyi.name} # 最小空闲连接数 - connectionMinimumIdleSize: 32 + connectionMinimumIdleSize: 8 # 连接池大小 - connectionPoolSize: 64 + connectionPoolSize: 32 # 连接空闲超时，单位：毫秒 idleConnectionTimeout: 10000 # 命令等待超时，单位：毫秒 @@ -188,6 +187,7 @@ sms: signature: 您的短信签名 sdk-app-id: 您的sdkAppId + --- # 三方授权 justauth: # 前端外网访问地址 @@ -206,7 +206,7 @@ justauth: client-id: 449c4*********937************759 client-secret: ac7***********1e0************28d redirect-uri: ${justauth.address}/social-callback?source=topiam - scopes: [ openid, email, phone, profile ] + scopes: [openid, email, phone, profile] qq: client-id: 10**********6 client-secret: 1f7d08**********5b7**********29e diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5faf669..ee0a5ca 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -21,9 +21,9 @@ captcha: # 开发环境配置 server: - # 服务器的HTTP端口，默认为8080 远程dev:8084 + # 服务器的HTTP端口，默认为8080 远程prod:8085 # cd /guoYanXinXi/data/software/app/shuihuanjing - port: 8084 + port: 8080 servlet: # 应用的访问路径 context-path: / @@ -71,6 +71,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: + # 开发 dev 远程测试 prod active: dev # 文件上传 servlet: diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java index dba2323..e9dff53 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java @@ -1,45 +1,45 @@ -package org.dromara.test; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -/** - * 断言单元测试案例 - * - * @author Lion Li - */ -@DisplayName("断言单元测试案例") -public class AssertUnitTest { - - @DisplayName("测试 assertEquals 方法") - @Test - public void testAssertEquals() { - Assertions.assertEquals("666", new String("666")); - Assertions.assertNotEquals("666", new String("666")); - } - - @DisplayName("测试 assertSame 方法") - @Test - public void testAssertSame() { - Object obj = new Object(); - Object obj1 = obj; - Assertions.assertSame(obj, obj1); - Assertions.assertNotSame(obj, obj1); - } - - @DisplayName("测试 assertTrue 方法") - @Test - public void testAssertTrue() { - Assertions.assertTrue(true); - Assertions.assertFalse(true); - } - - @DisplayName("测试 assertNull 方法") - @Test - public void testAssertNull() { - Assertions.assertNull(null); - Assertions.assertNotNull(null); - } - -} +//package org.dromara.test; +// +//import org.junit.jupiter.api.Assertions; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +// +///** +// * 断言单元测试案例 +// * +// * @author Lion Li +// */ +//@DisplayName("断言单元测试案例") +//public class AssertUnitTest { +// +// @DisplayName("测试 assertEquals 方法") +// @Test +// public void testAssertEquals() { +// Assertions.assertEquals("666", new String("666")); +// Assertions.assertNotEquals("666", new String("666")); +// } +// +// @DisplayName("测试 assertSame 方法") +// @Test +// public void testAssertSame() { +// Object obj = new Object(); +// Object obj1 = obj; +// Assertions.assertSame(obj, obj1); +// Assertions.assertNotSame(obj, obj1); +// } +// +// @DisplayName("测试 assertTrue 方法") +// @Test +// public void testAssertTrue() { +// Assertions.assertTrue(true); +// Assertions.assertFalse(true); +// } +// +// @DisplayName("测试 assertNull 方法") +// @Test +// public void testAssertNull() { +// Assertions.assertNull(null); +// Assertions.assertNotNull(null); +// } +// +//} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java index 5b3dfdc..49dc961 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java @@ -1,70 +1,70 @@ -package org.dromara.test; - -import org.dromara.common.core.config.RuoYiConfig; -import org.junit.jupiter.api.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.concurrent.TimeUnit; - -/** - * 单元测试案例 - * - * @author Lion Li - */ -@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件 -@DisplayName("单元测试案例") -public class DemoUnitTest { - - @Autowired - private RuoYiConfig ruoYiConfig; - - @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") - @Test - public void testTest() { - System.out.println(ruoYiConfig); - } - - @Disabled - @DisplayName("测试 @Disabled 注解") - @Test - public void testDisabled() { - System.out.println(ruoYiConfig); - } - - @Timeout(value = 2L, unit = TimeUnit.SECONDS) - @DisplayName("测试 @Timeout 注解") - @Test - public void testTimeout() throws InterruptedException { - Thread.sleep(3000); - System.out.println(ruoYiConfig); - } - - - @DisplayName("测试 @RepeatedTest 注解") - @RepeatedTest(3) - public void testRepeatedTest() { - System.out.println(666); - } - - @BeforeAll - public static void testBeforeAll() { - System.out.println("@BeforeAll =================="); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - @AfterAll - public static void testAfterAll() { - System.out.println("@AfterAll =================="); - } - -} +//package org.dromara.test; +// +//import org.dromara.common.core.config.RuoYiConfig; +//import org.junit.jupiter.api.*; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import java.util.concurrent.TimeUnit; +// +///** +// * 单元测试案例 +// * +// * @author Lion Li +// */ +//@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件 +//@DisplayName("单元测试案例") +//public class DemoUnitTest { +// +// @Autowired +// private RuoYiConfig ruoYiConfig; +// +// @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") +// @Test +// public void testTest() { +// System.out.println(ruoYiConfig); +// } +// +// @Disabled +// @DisplayName("测试 @Disabled 注解") +// @Test +// public void testDisabled() { +// System.out.println(ruoYiConfig); +// } +// +// @Timeout(value = 2L, unit = TimeUnit.SECONDS) +// @DisplayName("测试 @Timeout 注解") +// @Test +// public void testTimeout() throws InterruptedException { +// Thread.sleep(3000); +// System.out.println(ruoYiConfig); +// } +// +// +// @DisplayName("测试 @RepeatedTest 注解") +// @RepeatedTest(3) +// public void testRepeatedTest() { +// System.out.println(666); +// } +// +// @BeforeAll +// public static void testBeforeAll() { +// System.out.println("@BeforeAll =================="); +// } +// +// @BeforeEach +// public void testBeforeEach() { +// System.out.println("@BeforeEach =================="); +// } +// +// @AfterEach +// public void testAfterEach() { +// System.out.println("@AfterEach =================="); +// } +// +// @AfterAll +// public static void testAfterAll() { +// System.out.println("@AfterAll =================="); +// } +// +//} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java index 1db51df..297b345 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java @@ -1,72 +1,72 @@ -package org.dromara.test; - -import org.dromara.common.core.enums.UserType; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; -import org.junit.jupiter.params.provider.MethodSource; -import org.junit.jupiter.params.provider.NullSource; -import org.junit.jupiter.params.provider.ValueSource; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; - -/** - * 带参数单元测试案例 - * - * @author Lion Li - */ -@DisplayName("带参数单元测试案例") -public class ParamUnitTest { - - @DisplayName("测试 @ValueSource 注解") - @ParameterizedTest - @ValueSource(strings = {"t1", "t2", "t3"}) - public void testValueSource(String str) { - System.out.println(str); - } - - @DisplayName("测试 @NullSource 注解") - @ParameterizedTest - @NullSource - public void testNullSource(String str) { - System.out.println(str); - } - - @DisplayName("测试 @EnumSource 注解") - @ParameterizedTest - @EnumSource(UserType.class) - public void testEnumSource(UserType type) { - System.out.println(type.getUserType()); - } - - @DisplayName("测试 @MethodSource 注解") - @ParameterizedTest - @MethodSource("getParam") - public void testMethodSource(String str) { - System.out.println(str); - } - - public static Stream getParam() { - List list = new ArrayList<>(); - list.add("t1"); - list.add("t2"); - list.add("t3"); - return list.stream(); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - -} +//package org.dromara.test; +// +//import org.dromara.common.core.enums.UserType; +//import org.junit.jupiter.api.AfterEach; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.params.ParameterizedTest; +//import org.junit.jupiter.params.provider.EnumSource; +//import org.junit.jupiter.params.provider.MethodSource; +//import org.junit.jupiter.params.provider.NullSource; +//import org.junit.jupiter.params.provider.ValueSource; +// +//import java.util.ArrayList; +//import java.util.List; +//import java.util.stream.Stream; +// +///** +// * 带参数单元测试案例 +// * +// * @author Lion Li +// */ +//@DisplayName("带参数单元测试案例") +//public class ParamUnitTest { +// +// @DisplayName("测试 @ValueSource 注解") +// @ParameterizedTest +// @ValueSource(strings = {"t1", "t2", "t3"}) +// public void testValueSource(String str) { +// System.out.println(str); +// } +// +// @DisplayName("测试 @NullSource 注解") +// @ParameterizedTest +// @NullSource +// public void testNullSource(String str) { +// System.out.println(str); +// } +// +// @DisplayName("测试 @EnumSource 注解") +// @ParameterizedTest +// @EnumSource(UserType.class) +// public void testEnumSource(UserType type) { +// System.out.println(type.getUserType()); +// } +// +// @DisplayName("测试 @MethodSource 注解") +// @ParameterizedTest +// @MethodSource("getParam") +// public void testMethodSource(String str) { +// System.out.println(str); +// } +// +// public static Stream getParam() { +// List list = new ArrayList<>(); +// list.add("t1"); +// list.add("t2"); +// list.add("t3"); +// return list.stream(); +// } +// +// @BeforeEach +// public void testBeforeEach() { +// System.out.println("@BeforeEach =================="); +// } +// +// @AfterEach +// public void testAfterEach() { +// System.out.println("@AfterEach =================="); +// } +// +// +//} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java index b50afa6..fc2e31c 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java @@ -1,54 +1,54 @@ -package org.dromara.test; - -import org.junit.jupiter.api.*; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * 标签单元测试案例 - * - * @author Lion Li - */ -@SpringBootTest -@DisplayName("标签单元测试案例") -public class TagUnitTest { - - @Tag("dev") - @DisplayName("测试 @Tag dev") - @Test - public void testTagDev() { - System.out.println("dev"); - } - - @Tag("prod") - @DisplayName("测试 @Tag prod") - @Test - public void testTagProd() { - System.out.println("prod"); - } - - @Tag("local") - @DisplayName("测试 @Tag local") - @Test - public void testTagLocal() { - System.out.println("local"); - } - - @Tag("exclude") - @DisplayName("测试 @Tag exclude") - @Test - public void testTagExclude() { - System.out.println("exclude"); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - -} +//package org.dromara.test; +// +//import org.junit.jupiter.api.*; +//import org.springframework.boot.test.context.SpringBootTest; +// +///** +// * 标签单元测试案例 +// * +// * @author Lion Li +// */ +//@SpringBootTest +//@DisplayName("标签单元测试案例") +//public class TagUnitTest { +// +// @Tag("dev") +// @DisplayName("测试 @Tag dev") +// @Test +// public void testTagDev() { +// System.out.println("dev"); +// } +// +// @Tag("prod") +// @DisplayName("测试 @Tag prod") +// @Test +// public void testTagProd() { +// System.out.println("prod"); +// } +// +// @Tag("local") +// @DisplayName("测试 @Tag local") +// @Test +// public void testTagLocal() { +// System.out.println("local"); +// } +// +// @Tag("exclude") +// @DisplayName("测试 @Tag exclude") +// @Test +// public void testTagExclude() { +// System.out.println("exclude"); +// } +// +// @BeforeEach +// public void testBeforeEach() { +// System.out.println("@BeforeEach =================="); +// } +// +// @AfterEach +// public void testAfterEach() { +// System.out.println("@AfterEach =================="); +// } +// +// +//} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/ProjectInfoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/ProjectInfoController.java index 74ec4f2..90437e1 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/ProjectInfoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/ProjectInfoController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/project") +@RequestMapping("evr/project") public class ProjectInfoController extends BaseController { private final IProjectInfoService projectInfoService; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/AllGoatAchieve.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/AllGoatAchieve.java new file mode 100644 index 0000000..e56c0e4 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/AllGoatAchieve.java @@ -0,0 +1,15 @@ +package org.dromara.demo.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AllGoatAchieve { + private String date; + private String planInvest; + private String actualInvest; + private String investPercent; +}