Merge remote-tracking branch 'base-version/main' into dev

# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
#	zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
This commit is contained in:
chenbowen
2025-12-01 10:21:34 +08:00
438 changed files with 859 additions and 1650219 deletions

View File

@@ -29,7 +29,7 @@ public class DesensitizeTest {
public void test() {
// 准备参数
DesensitizeDemo desensitizeDemo = new DesensitizeDemo();
desensitizeDemo.setNickname("芋道源码");
desensitizeDemo.setNickname("ZT源码");
desensitizeDemo.setBankCard("9988002866797031");
desensitizeDemo.setCarLicense("粤A66666");
desensitizeDemo.setFixedPhone("01086551122");
@@ -40,9 +40,9 @@ public class DesensitizeTest {
desensitizeDemo.setSlider2("ABCDEFG");
desensitizeDemo.setSlider3("ABCDEFG");
desensitizeDemo.setEmail("1@email.com");
desensitizeDemo.setRegex("你好,我是芋道源码");
desensitizeDemo.setRegex("你好,我是ZT源码");
desensitizeDemo.setAddress("北京市海淀区上地十街10号");
desensitizeDemo.setOrigin("芋道源码");
desensitizeDemo.setOrigin("ZT源码");
// 调用
DesensitizeDemo d = JsonUtils.parseObject(JsonUtils.toJsonString(desensitizeDemo), DesensitizeDemo.class);
@@ -61,7 +61,7 @@ public class DesensitizeTest {
assertEquals("1****@email.com", d.getEmail());
assertEquals("你好,我是*", d.getRegex());
assertEquals("北京市海淀区上地十街10号*", d.getAddress());
assertEquals("芋道源码", d.getOrigin());
assertEquals("ZT源码", d.getOrigin());
}
@Data
@@ -89,7 +89,7 @@ public class DesensitizeTest {
private String slider3;
@EmailDesensitize
private String email;
@RegexDesensitize(regex = "芋道源码", replacer = "*")
@RegexDesensitize(regex = "ZT源码", replacer = "*")
private String regex;
@Address
private String address;

View File

@@ -1 +0,0 @@
<http://www.iocoder.cn/Spring-Boot/Swagger/?zt>

View File

@@ -1 +0,0 @@
<http://www.iocoder.cn/Spring-Boot/SpringMVC/?zt>