admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20260204'

Browse Source 
# Conflicts:
#	.idea/compiler.xml
#	.idea/vcs.xml
#	lidee-admin/src/main/resources/application-local.yaml
#	lidee-admin/target/classes/application-local.yaml
#	lidee-admin/target/lidee-admin.jar
#	lidee-admin/target/lidee-admin.jar.original
#	lidee-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java
#	lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java
#	lidee-core/target/classes/com/lideeyunji/core/framework/entity/ReportFieldEntity.class
#	lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.class
#	lidee-core/target/lidee-core-2.2.4.jar
#	lidee-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-module/lidee-module-api/target/lidee-module-api-2.2.4.jar
#	lidee-module/lidee-module-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-module/lidee-module-biz/target/lidee-module-biz-2.2.4.jar
#	lidee-module/lidee-module-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-service/lidee-service-infra-api/target/lidee-service-infra-api-2.2.4.jar
#	lidee-service/lidee-service-infra-biz/target/lidee-service-infra-biz-2.2.4.jar
#	lidee-service/lidee-service-system-api/target/lidee-service-system-api-2.2.4.jar
#	lidee-service/lidee-service-system-biz/target/lidee-service-system-biz-2.2.4.jar
#	lidee-tool/tool-common/target/tool-common-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-ai/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-ai/target/tool-spring-boot-starter-ai-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-captcha/target/tool-spring-boot-starter-captcha-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-dict/target/tool-spring-boot-starter-dict-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-excel/target/tool-spring-boot-starter-excel-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-exception/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-exception/target/tool-spring-boot-starter-exception-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-file/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-file/target/tool-spring-boot-starter-file-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-flowable/target/tool-spring-boot-starter-flowable-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-ip/target/tool-spring-boot-starter-ip-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-job/target/tool-spring-boot-starter-job-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-monitor/target/tool-spring-boot-starter-monitor-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-mybatis/target/tool-spring-boot-starter-mybatis-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-operatelog/target/tool-spring-boot-starter-operatelog-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-permission/target/tool-spring-boot-starter-permission-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-protection/target/tool-spring-boot-starter-protection-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-redis/target/tool-spring-boot-starter-redis-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-security/target/tool-spring-boot-starter-security-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-sql/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-sql/target/tool-spring-boot-starter-sql-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-tenant/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-tenant/target/tool-spring-boot-starter-tenant-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-test/target/tool-spring-boot-starter-test-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-web/target/tool-spring-boot-starter-web-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-websocket/target/tool-spring-boot-starter-websocket-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-yunji/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-yunji/target/tool-spring-boot-starter-yunji-2.2.4.jar
#	logs/lideeyunji-error.log
#	logs/lideeyunji-info.log
This commit is contained in:
chy
2026-02-09 23:30:06 +08:00
parent 81bc9757eb 246591bb1c
commit fa8c84f349
1718 changed files with 66 additions and 116884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lidee-tool/tool-spring-boot-starter-websocket/target/classes/META-INF/spring-configuration-metadata.json
View File

@@ -1,26 +0,0 @@
{
"groups": [
{
"name": "lideeyunji.websocket",
"type": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties",
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties"
}
],
"properties": [
{
"name": "lideeyunji.websocket.path",
"type": "java.lang.String",
"description": "WebSocket 的连接路径",
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties",
"defaultValue": "\/ws"
},
{
"name": "lideeyunji.websocket.sender-type",
"type": "java.lang.String",
"description": "消息发送器的类型 可选值：local、redis、rocketmq、kafka、rabbitmq",
"sourceType": "com.lideeyunji.tool.framework.websocket.config.WebSocketProperties",
"defaultValue": "local"
}
],
"hints": []
}