refactor(core): rename Cs prefix to Kit for base classes and utilities
- Renamed CsArgs to KitArgs and updated internal references - Renamed CsBaseCreateTimeTb to KitBaseCreateTimeTb and extended KitObject - Renamed CsBaseTimeTb to KitBaseTimeTb and extended KitObject - Renamed CsBaseUpdateTimeTb to KitBaseUpdateTimeTb and extended KitObject - Renamed CsBaseUserCreateTimeTb to KitBaseUserCreateTimeTb and extended KitObject - Renamed CsBaseUserTimeLogicTb to KitBaseUserTimeLogicTb and extended KitObject - Renamed CsBaseUserTimeTb to KitBaseUserTimeTb and extended KitObject - Renamed CsObject to KitObject as base serializable class - Renamed CsPageArgs to KitPageArgs and kept same generic structure - Renamed CsPageResult to KitPageResult and updated factory methods - Renamed CsSelectOptionVo to KitSelectOptionVo and extended KitObject - Updated BootApplication to use KitSpringBeanHolder instead of CsSpringBeanHolder - Renamed CsRequestHolder to KitRequestHolder and kept same functionality - Renamed CsScriptHelper to KitScriptHelper and maintained component behavior - Renamed CsSpringBeanHolder to KitSpringBeanHolder and updated internal usage - Updated SwaggerConfig to import KitAnonTagUtil instead of CsAnonTagUtil - Renamed CsHealthCheckPointService to KitHealthCheckPointService in controller and service layers - Renamed CsMpQTypeEnum to KitMpQTypeEnum for dynamic query types - Renamed CsMpQuery annotation to KitMpQuery and updated default type reference - Renamed CsMpMapper to KitMpMapper and updated imports for page utilities - Renamed CsMpService to KitMpService and updated page result references - Renamed CsMpServiceImpl to KitMpServiceImpl and updated query utility usage - Renamed CsMpAnyQUtil to KitMpAnyQUtil and updated internal query builder calls - Renamed CsMpCmdGenUtil to KitMpCmdGenUtil and updated superclass reference - Renamed CsMpQUtil to KitMpQUtil and updated annotation and handler references - Updated model classes (CaptchaModel, ContentRsaEncodeSettingModel, JwtAuthSettingModel, OSSConfigModel) to extend KitObject instead of CsObject
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
|
||||
package cn.odboy;
|
||||
|
||||
import cn.odboy.framework.mybatisplus.core.CsMpCmdGenUtil;
|
||||
import cn.odboy.framework.mybatisplus.core.KitMpCmdGenUtil;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GenCode {
|
||||
private static final String URL = String.format("jdbc:mysql://%s:%s/%s", ADDR, PORT, DATABASE_NAME);
|
||||
|
||||
public static void main(String[] args) {
|
||||
CsMpCmdGenUtil generator = new CsMpCmdGenUtil();
|
||||
KitMpCmdGenUtil generator = new KitMpCmdGenUtil();
|
||||
generator.setDatabaseUrl(URL);
|
||||
generator.setDriverClassName("com.mysql.cj.jdbc.Driver");
|
||||
generator.setDatabaseUsername(DATABASE_USER);
|
||||
@@ -40,7 +40,7 @@ public class GenCode {
|
||||
genTaskCode(generator);
|
||||
}
|
||||
|
||||
private static void genTaskCode(CsMpCmdGenUtil generator) {
|
||||
private static void genTaskCode(KitMpCmdGenUtil generator) {
|
||||
generator.gen("task", "", List.of("task_instance_info", "task_instance_detail", "task_template_info", "task_instance_step_detail"));
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -16,14 +16,14 @@
|
||||
|
||||
package cn.odboy;
|
||||
|
||||
import cn.odboy.framework.monitor.service.CsHealthCheckPointService;
|
||||
import cn.odboy.framework.monitor.service.KitHealthCheckPointService;
|
||||
import cn.odboy.system.service.SystemDictService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class HealthCheckPointer implements CsHealthCheckPointService {
|
||||
public class HealthCheckPointer implements KitHealthCheckPointService {
|
||||
@Autowired
|
||||
private SystemDictService systemDictService;
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ app:
|
||||
private-key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
|
||||
# 鉴权
|
||||
jwt:
|
||||
# 必须使用最少88位的Base64对该令牌进行编码 cn.odboy.util.CsBase64SecretUtil
|
||||
# 必须使用最少88位的Base64对该令牌进行编码 cn.odboy.util.KitBase64SecretUtil
|
||||
base64-secret: YzE5ZWNjMjlkMGY4NDc4MDlmYzE0Y2I0MTk4YTQ4YjY5NTU0OGQxODNjNjQ0MmU1YjBmZTYwYjljYzI0M2M4MTJkZjk3Y2ZlYjg3ZTQxMjM4MjEwY2ZiYzE4YmFiYmZlZDVhM2M1YmI3M2FmNDFmNWJmM2MyMTM1ZDNhMmRmYzY=
|
||||
# 令牌过期时间 此处单位/毫秒 ,默认4小时,可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
|
||||
token-validity-in-seconds: 14400000
|
||||
|
||||
@@ -161,7 +161,7 @@ app:
|
||||
private-key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
|
||||
# 鉴权
|
||||
jwt:
|
||||
# 必须使用最少88位的Base64对该令牌进行编码 cn.odboy.util.CsBase64SecretUtil
|
||||
# 必须使用最少88位的Base64对该令牌进行编码 cn.odboy.util.KitBase64SecretUtil
|
||||
base64-secret: YzE5ZWNjMjlkMGY4NDc4MDlmYzE0Y2I0MTk4YTQ4YjY5NTU0OGQxODNjNjQ0MmU1YjBmZTYwYjljYzI0M2M4MTJkZjk3Y2ZlYjg3ZTQxMjM4MjEwY2ZiYzE4YmFiYmZlZDVhM2M1YmI3M2FmNDFmNWJmM2MyMTM1ZDNhMmRmYzY=
|
||||
# 令牌过期时间 此处单位/毫秒 ,默认4小时,可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
|
||||
token-validity-in-seconds: 14400000
|
||||
|
||||
+3
-3
@@ -19,11 +19,11 @@ package cn.odboy.util;
|
||||
import lombok.SneakyThrows;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static cn.odboy.util.CsDesEncryptUtil.desDecrypt;
|
||||
import static cn.odboy.util.CsDesEncryptUtil.desEncrypt;
|
||||
import static cn.odboy.util.KitDesEncryptUtil.desDecrypt;
|
||||
import static cn.odboy.util.KitDesEncryptUtil.desEncrypt;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
public class CsDesEncryptUtilTest {
|
||||
public class KitDesEncryptUtilTest {
|
||||
|
||||
@SneakyThrows
|
||||
public static void main(String[] args) {
|
||||
+2
-2
@@ -19,10 +19,10 @@ package cn.odboy.util;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.mock.web.MockMultipartFile;
|
||||
|
||||
import static cn.odboy.util.CsFileUtil.*;
|
||||
import static cn.odboy.util.KitFileUtil.*;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
public class CsFileUtilTest {
|
||||
public class KitFileUtilTest {
|
||||
|
||||
@Test
|
||||
public void testToFile() {
|
||||
+5
-5
@@ -23,11 +23,11 @@ import org.springframework.mock.web.MockHttpServletRequest;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
import static cn.odboy.util.CsStringUtil.*;
|
||||
import static cn.odboy.util.KitStringUtil.*;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
public class CsStringUtilTest {
|
||||
public class KitStringUtilTest {
|
||||
|
||||
@Test
|
||||
public void testToCamelCase() {
|
||||
@@ -36,13 +36,13 @@ public class CsStringUtilTest {
|
||||
|
||||
@Test
|
||||
public void testToCapitalizeCamelCase() {
|
||||
assertNull(CsStringUtil.toCapitalizeCamelCase(null));
|
||||
assertNull(KitStringUtil.toCapitalizeCamelCase(null));
|
||||
assertEquals("HelloWorld", toCapitalizeCamelCase("hello_world"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testToUnderScoreCase() {
|
||||
assertNull(CsStringUtil.toUnderScoreCase(null));
|
||||
assertNull(KitStringUtil.toUnderScoreCase(null));
|
||||
assertEquals("hello_world", toUnderScoreCase("helloWorld"));
|
||||
assertEquals("\u0000\u0000", toUnderScoreCase("\u0000\u0000"));
|
||||
assertEquals("\u0000_a", toUnderScoreCase("\u0000A"));
|
||||
@@ -56,6 +56,6 @@ public class CsStringUtilTest {
|
||||
|
||||
@Test
|
||||
public void testGetIP() {
|
||||
Assertions.assertEquals("127.0.0.1", CsBrowserUtil.getIp(new MockHttpServletRequest()));
|
||||
Assertions.assertEquals("127.0.0.1", KitBrowserUtil.getIp(new MockHttpServletRequest()));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user