Compare commits
40 Commits
e70fa733ef
...
liug
| Author | SHA1 | Date | |
|---|---|---|---|
|
8bae1cbd35 | ||
| ee7510f41e | |||
| 44279d9637 | |||
| 860afb9812 | |||
|
|
0ef88ce81d | ||
| 1b81782767 | |||
| 432feb11d2 | |||
| c4ea4650bf | |||
|
|
1173de364c | ||
| 79cb1297db | |||
|
|
7fb9543604 | ||
|
|
bac75778ad | ||
|
|
3dd11b9f37 | ||
| f940b2a911 | |||
|
|
0cc088c51b | ||
| 869ef2cd8b | |||
|
|
35d708612e | ||
| dcb15b1aa7 | |||
| 390172f426 | |||
| 0f61e5b8f2 | |||
|
|
909d9625cd | ||
|
|
cd7bb5ccc5 | ||
| bb986102f3 | |||
| 2cae542098 | |||
| 549da7ec80 | |||
| 8b9f4a5013 | |||
| 3de7be34b2 | |||
| e0dd2a59ec | |||
| da95ddf810 | |||
| c8b73763bb | |||
| 72331c5e1e | |||
| fa8c84f349 | |||
|
|
246591bb1c | ||
| c1a3e0f709 | |||
| 16a985e8cc | |||
| 55d050fbd7 | |||
| 861f082e66 | |||
|
|
8c97c0f934 | ||
|
|
b629c574f1 | ||
|
|
918ec6c498 |
@@ -17,16 +17,16 @@
|
||||
</modules>
|
||||
<properties>
|
||||
<lombok.version>1.18.30</lombok.version>
|
||||
<lidee.version>2.2.4</lidee.version>
|
||||
<java.version>1.8</java.version>
|
||||
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
||||
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<mapstruct.version>1.5.5.Final</mapstruct.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
|
||||
<spring.boot.version>2.7.17</spring.boot.version>
|
||||
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
|
||||
<java.version>1.8</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<mapstruct.version>1.5.5.Final</mapstruct.version>
|
||||
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<spring.boot.version>2.7.17</spring.boot.version>
|
||||
<lidee.version>2.2.4</lidee.version>
|
||||
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
||||
8
.idea/.gitignore
generated
vendored
8
.idea/.gitignore
generated
vendored
@@ -1,8 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
106
.idea/compiler.xml
generated
106
.idea/compiler.xml
generated
@@ -1,106 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile default="true" name="Default" enabled="true" />
|
||||
<profile name="Annotation profile for lideeYunJi" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<processorPath useClasspath="false">
|
||||
<entry name="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-processor/2.7.17/spring-boot-configuration-processor-2.7.17.jar" />
|
||||
<entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar" />
|
||||
<entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct-processor/1.5.5.Final/mapstruct-processor-1.5.5.Final.jar" />
|
||||
</processorPath>
|
||||
<module name="tool-spring-boot-starter-operatelog" />
|
||||
<module name="tool-spring-boot-starter-mybatis" />
|
||||
<module name="lidee-service-system-biz" />
|
||||
<module name="tool-spring-boot-starter-protection" />
|
||||
<module name="tool-spring-boot-starter-sql" />
|
||||
<module name="tool-spring-boot-starter-security" />
|
||||
<module name="tool-spring-boot-starter-websocket" />
|
||||
<module name="lidee-service-system-api" />
|
||||
<module name="tool-spring-boot-starter-web" />
|
||||
<module name="tool-spring-boot-starter-monitor" />
|
||||
<module name="tool-spring-boot-starter-dict" />
|
||||
<module name="tool-common" />
|
||||
<module name="tool-spring-boot-starter-file" />
|
||||
<module name="lidee-core" />
|
||||
<module name="tool-spring-boot-starter-tenant" />
|
||||
<module name="tool-spring-boot-starter-job" />
|
||||
<module name="lidee-module-api" />
|
||||
<module name="tool-spring-boot-starter-ai" />
|
||||
<module name="tool-spring-boot-starter-ip" />
|
||||
<module name="tool-spring-boot-starter-yunji" />
|
||||
<module name="lidee-module-biz" />
|
||||
<module name="tool-spring-boot-starter-permission" />
|
||||
<module name="tool-spring-boot-starter-redis" />
|
||||
<module name="tool-spring-boot-starter-captcha" />
|
||||
<module name="tool-spring-boot-starter-exception" />
|
||||
<module name="tool-spring-boot-starter-test" />
|
||||
<module name="lidee-service-infra-biz" />
|
||||
<module name="lidee-admin" />
|
||||
<module name="tool-spring-boot-starter-flowable" />
|
||||
<module name="tool-spring-boot-starter-excel" />
|
||||
<module name="lidee-service-infra-api" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="lideeyunji-admin" target="1.8" />
|
||||
<module name="lideeyunji-core" target="1.8" />
|
||||
<module name="lideeyunji-dependencies" target="17" />
|
||||
<module name="lideeyunji-module" target="17" />
|
||||
<module name="lideeyunji-module-api" target="1.8" />
|
||||
<module name="lideeyunji-module-biz" target="1.8" />
|
||||
<module name="lideeyunji-service" target="17" />
|
||||
<module name="lideeyunji-service-infra-api" target="1.8" />
|
||||
<module name="lideeyunji-service-infra-biz" target="1.8" />
|
||||
<module name="lideeyunji-service-system-api" target="1.8" />
|
||||
<module name="lideeyunji-service-system-biz" target="1.8" />
|
||||
<module name="lideeyunji-tool" target="17" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
<component name="JavacSettings">
|
||||
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
|
||||
<module name="lidee-admin" options="-parameters" />
|
||||
<module name="lidee-core" options="-parameters" />
|
||||
<module name="lidee-module-api" options="-parameters" />
|
||||
<module name="lidee-module-biz" options="-parameters" />
|
||||
<module name="lidee-service-infra-api" options="-parameters" />
|
||||
<module name="lidee-service-infra-biz" options="-parameters" />
|
||||
<module name="lidee-service-system-api" options="-parameters" />
|
||||
<module name="lidee-service-system-biz" options="-parameters" />
|
||||
<module name="lideeyunji-admin" options="-parameters" />
|
||||
<module name="lideeyunji-core" options="-parameters" />
|
||||
<module name="lideeyunji-module-api" options="-parameters" />
|
||||
<module name="lideeyunji-module-biz" options="-parameters" />
|
||||
<module name="lideeyunji-service-infra-api" options="-parameters" />
|
||||
<module name="lideeyunji-service-infra-biz" options="-parameters" />
|
||||
<module name="lideeyunji-service-system-api" options="-parameters" />
|
||||
<module name="lideeyunji-service-system-biz" options="-parameters" />
|
||||
<module name="tool-common" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-ai" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-captcha" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-dict" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-excel" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-exception" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-file" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-flowable" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-ip" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-job" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-monitor" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-mybatis" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-operatelog" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-permission" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-protection" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-redis" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-security" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-sql" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-tenant" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-test" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-web" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-websocket" options="-parameters" />
|
||||
<module name="tool-spring-boot-starter-yunji" options="-parameters" />
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
143
.idea/encodings.xml
generated
143
.idea/encodings.xml
generated
@@ -1,143 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/lidee-admin/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-admin/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-core/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-core/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-module/lidee-module-api/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-module/lidee-module-api/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-module/lidee-module-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-module/lidee-module-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-module/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-module/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-infra-api/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-infra-api/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-infra-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-infra-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-system-api/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-system-api/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-system-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/lidee-service-system-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-service/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-common/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-common/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-ai/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-ai/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-captcha/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-captcha/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-dict/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-dict/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-excel/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-excel/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-exception/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-exception/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-file/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-file/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-flowable/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-flowable/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-ip/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-ip/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-job/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-job/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-monitor/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-monitor/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-mybatis/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-mybatis/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-operatelog/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-operatelog/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-permission/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-permission/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-protection/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-protection/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-redis/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-redis/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-security/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-security/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-sql/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-sql/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-tenant/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-tenant/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-test/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-test/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-web/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-web/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-websocket/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-websocket/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-yunji/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-yunji/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-admin/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-admin/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-core/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-core/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-module/lideeyunji-module-api/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-module/lideeyunji-module-api/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-module/lideeyunji-module-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-module/lideeyunji-module-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-module/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-module/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-infra-api/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-infra-api/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-infra-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-infra-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-system-api/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-system-api/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-system-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/lideeyunji-service-system-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-service/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-common/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-common/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-ai/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-ai/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-captcha/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-captcha/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-dict/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-dict/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-excel/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-excel/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-exception/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-exception/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-file/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-file/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-flowable/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-flowable/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-ip/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-ip/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-job/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-job/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-monitor/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-monitor/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-mybatis/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-mybatis/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-operatelog/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-operatelog/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-permission/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-permission/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-protection/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-protection/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-redis/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-redis/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-security/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-security/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-sql/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-sql/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-tenant/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-tenant/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-test/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-test/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-web/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-web/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-websocket/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-websocket/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-yunji/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lideeyunji-tool/tool-spring-boot-starter-yunji/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
9
.idea/hngryy_report.iml
generated
9
.idea/hngryy_report.iml
generated
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
7
.idea/inspectionProfiles/Project_Default.xml
generated
7
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -1,7 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
</profile>
|
||||
</component>
|
||||
45
.idea/jarRepositories.xml
generated
45
.idea/jarRepositories.xml
generated
@@ -1,45 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="huaweicloud" />
|
||||
<option name="name" value="huawei" />
|
||||
<option name="url" value="https://maven.aliyun.com/repository/public" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="aliyunmaven" />
|
||||
<option name="name" value="aliyun" />
|
||||
<option name="url" value="https://maven.aliyun.com/repository/public" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="huaweicloud" />
|
||||
<option name="name" value="huawei" />
|
||||
<option name="url" value="https://mirrors.huaweicloud.com/repository/maven/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://maven.aliyun.com/repository/public" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
18
.idea/misc.xml
generated
18
.idea/misc.xml
generated
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="MavenProjectsManager">
|
||||
<option name="originalFiles">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lidee-service/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lidee-service/lidee-service-system-biz/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lidee-service/lidee-service-system-api/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lidee-service/lidee-service-infra-biz/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lidee-service/lidee-service-infra-api/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lidee-tool/tool-spring-boot-starter-yunji/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
6
.idea/vcs.xml
generated
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
36
doc/新增表和数据字段在此说明.txt
Normal file
36
doc/新增表和数据字段在此说明.txt
Normal file
@@ -0,0 +1,36 @@
|
||||
日期：2026-02-20（新增表）
|
||||
新增表：xxx_demo（附件表说明到doc内）
|
||||
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
日期：2026-02-21（新增字段）
|
||||
表名：xxx_demo
|
||||
字段 类型 长度
|
||||
xx_aa varchar 20
|
||||
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
日期：2026-02-11（新增字段）
|
||||
表名：yunji_report_field
|
||||
字段 类型 长度 字段说明
|
||||
is_dynamic_group varchar 60 是否动态分组 Y|N
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
日期：2026-02-12（修改字段长度）
|
||||
表名：yunji_report_field
|
||||
字段 类型 长度 字段说明
|
||||
is_hide_dimension varchar 255
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
日期：2026-02-13（新增字段）
|
||||
表名：yunji_report_field
|
||||
字段 类型 长度 字段说明
|
||||
width varchar 60 单元格宽度
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
日期：2026-02-24（新增字段）
|
||||
表名：yunji_report_field
|
||||
字段 类型 长度 字段说明
|
||||
search_default_value varchar 150 查询控件默认值
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
日期：2026-02-27（新增字段）
|
||||
表名：yunji_report_field
|
||||
字段 类型 长度 字段说明
|
||||
is_hide_search varchar 60 查询控件是否隐藏
|
||||
@@ -1 +0,0 @@
|
||||
yunji_report_field 新增is_amount字段
|
||||
@@ -9,25 +9,40 @@ spring:
|
||||
datasource:
|
||||
master:
|
||||
# MYSQL数据库 主库，业务库
|
||||
url: jdbc:mysql://10.9.0.16:3307/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
# url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
|
||||
url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
password: root
|
||||
lideeyunji: # 从库，框架库
|
||||
url: jdbc:mysql://10.9.0.16:3307/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
# url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
password: root
|
||||
slave: # 日志库单独
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jdbc:mysql://10.9.0.16:3307/dgr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
# url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
bidb: # 日志库单独
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jdbc:mysql://10.9.0.16:3307/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
password: root
|
||||
oracle_gryybi: # 报表平台 oracle
|
||||
url: jdbc:oracle:thin:@//192.168.1.247:1521/gryy?oracle.jdbc.defaultNChar=true&oracle.jdbc.convertNcharLiterals=true
|
||||
username: GRYYBI
|
||||
password: xxb147258367
|
||||
# driver-class-name: oracle.jdbc.OracleDriver
|
||||
driver-class-name: oracle.jdbc.driver.OracleDriver
|
||||
erp_bi_data: # 报表平台 mysql
|
||||
# url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
url: jdbc:mysql://192.168.126.128:33306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
password: root
|
||||
|
||||
# redis:
|
||||
# host: 127.0.0.1 # 地址
|
||||
# port: 6379 # 端口
|
||||
# database: 2 # 数据库索引
|
||||
# password: lidee@123 # 密码，建议生产环境开启
|
||||
redis:
|
||||
host: 10.9.0.116 # 地址
|
||||
host: 192.168.126.128 # 地址
|
||||
port: 6379 # 端口
|
||||
database: 2 # 数据库索引
|
||||
password: 123456 # 密码，建议生产环境开启
|
||||
|
||||
@@ -18,7 +18,7 @@ spring:
|
||||
password: gryy@8888
|
||||
slave: # 日志库单独
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jdbc:mysql://127.0.0.1:3306/dgr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: gryy@8888
|
||||
redis:
|
||||
|
||||
@@ -3,6 +3,7 @@ spring:
|
||||
name: lideeyunji-server
|
||||
profiles:
|
||||
active: local # 读取配置
|
||||
#active: prod # 读取配置
|
||||
main:
|
||||
allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
server:
|
||||
port: 48080
|
||||
|
||||
--- #################### 数据库相关配置 ####################
|
||||
spring:
|
||||
datasource:
|
||||
dynamic: # 多数据源配置
|
||||
primary: master
|
||||
datasource:
|
||||
master:
|
||||
# MYSQL数据库 主库，业务库
|
||||
url: jdbc:mysql://10.9.0.16:3307/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
lideeyunji: # 从库，框架库
|
||||
url: jdbc:mysql://10.9.0.16:3307/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
slave: # 日志库单独
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jdbc:mysql://10.9.0.16:3307/dgr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
bidb: # 日志库单独
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jdbc:mysql://10.9.0.16:3307/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: qihua
|
||||
redis:
|
||||
host: 10.9.0.116 # 地址
|
||||
port: 6379 # 端口
|
||||
database: 2 # 数据库索引
|
||||
password: 123456 # 密码，建议生产环境开启
|
||||
|
||||
--- #################### 地代码平台相关配置 ####################
|
||||
|
||||
# 云玑配置项，设置当前项目所有自定义的配置
|
||||
lideeyunji:
|
||||
captcha:
|
||||
enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试；
|
||||
demo: false # 关闭演示模式
|
||||
yunji: # 低代码平台
|
||||
debug: true #是否开启调试模式
|
||||
saveReqLog: false # 是否保存请求日志
|
||||
saveOpLog: false # 是否保存操作日志
|
||||
@@ -1,40 +0,0 @@
|
||||
server:
|
||||
port: 48080
|
||||
|
||||
--- #################### 数据库相关配置 ####################
|
||||
spring:
|
||||
datasource:
|
||||
dynamic: # 多数据源配置
|
||||
primary: master
|
||||
datasource:
|
||||
master:
|
||||
# MYSQL数据库 主库，业务库
|
||||
url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: gryy@8888
|
||||
lideeyunji: # 从库，框架库
|
||||
url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: gryy@8888
|
||||
slave: # 日志库单独
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jdbc:mysql://127.0.0.1:3306/dgr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: root
|
||||
password: gryy@8888
|
||||
redis:
|
||||
host: 127.0.0.1 # 地址
|
||||
port: 6379 # 端口
|
||||
database: 15 # 数据库索引
|
||||
password: gryy@8888 # 密码，建议生产环境开启
|
||||
|
||||
--- #################### 地代码平台相关配置 ####################
|
||||
|
||||
# 云玑配置项，设置当前项目所有自定义的配置
|
||||
lideeyunji:
|
||||
captcha:
|
||||
enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试；
|
||||
demo: false # 关闭演示模式
|
||||
yunji: # 低代码平台
|
||||
debug: false #是否开启调试模式
|
||||
saveReqLog: true # 是否保存请求日志
|
||||
saveOpLog: true # 是否保存操作日志
|
||||
@@ -1,330 +0,0 @@
|
||||
spring:
|
||||
application:
|
||||
name: lideeyunji-server
|
||||
profiles:
|
||||
active: local # 读取配置
|
||||
main:
|
||||
allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
|
||||
|
||||
# Servlet 配置
|
||||
servlet:
|
||||
# 文件上传相关配置项
|
||||
multipart:
|
||||
max-file-size: 16MB # 单个文件大小
|
||||
max-request-size: 32MB # 设置总上传的文件大小
|
||||
mvc:
|
||||
pathmatch:
|
||||
matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题，参见 SpringFoxHandlerProviderBeanPostProcessor 类
|
||||
|
||||
# Jackson 配置项
|
||||
jackson:
|
||||
serialization:
|
||||
write-dates-as-timestamps: true # 设置 Date 的格式，使用时间戳
|
||||
write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401
|
||||
write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳
|
||||
fail-on-empty-beans: false # 允许序列化无属性的 Bean
|
||||
|
||||
# Cache 配置项
|
||||
cache:
|
||||
type: REDIS
|
||||
redis:
|
||||
time-to-live: 1h # 设置过期时间为 1 小时
|
||||
|
||||
--- #################### 接口文档配置 ####################
|
||||
|
||||
springdoc:
|
||||
api-docs:
|
||||
enabled: true
|
||||
path: /v3/api-docs
|
||||
swagger-ui:
|
||||
enabled: true
|
||||
path: /swagger-ui
|
||||
default-flat-param-object: true
|
||||
|
||||
knife4j:
|
||||
enable: true
|
||||
setting:
|
||||
language: zh_cn
|
||||
|
||||
# 工作流 Flowable 配置
|
||||
flowable:
|
||||
# 1. false: 默认值，Flowable 启动时，对比数据库表中保存的版本，如果不匹配。将抛出异常
|
||||
# 2. true: 启动时会对数据库中所有表进行更新操作，如果表存在，不做处理，反之，自动创建表
|
||||
# 3. create_drop: 启动时自动创建表，关闭时自动删除表
|
||||
# 4. drop_create: 启动时，删除旧表，再创建新表
|
||||
database-schema-update: true # 设置为 false，可通过 https://github.com/flowable/flowable-sql 初始化
|
||||
db-history-used: true # flowable6 默认 true 生成信息表，无需手动设置
|
||||
check-process-definitions: false # 设置为 false，禁用 /resources/processes 自动部署 BPMN XML 流程
|
||||
history-level: full # full：保存历史数据的最高级别，可保存全部流程相关细节，包括流程流转各节点参数
|
||||
|
||||
# MyBatis Plus 的配置项
|
||||
mybatis-plus:
|
||||
configuration:
|
||||
map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
|
||||
jdbc-type-for-null: 'null'
|
||||
global-config:
|
||||
db-config:
|
||||
id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
|
||||
logic-delete-value: 1 # 逻辑已删除值(默认为 1)
|
||||
logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
|
||||
banner: false # 关闭控制台的 Banner 打印
|
||||
type-aliases-package: ${lideeyunji.info.base-package}.module.*.entity
|
||||
encryptor:
|
||||
password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成
|
||||
|
||||
mybatis-plus-join:
|
||||
banner: false # 是否打印 mybatis plus join banner，默认true
|
||||
sub-table-logic: true # 全局启用副表逻辑删除，默认true。关闭后关联查询不会加副表逻辑删除
|
||||
ms-cache: true # 拦截器MappedStatement缓存，默认 true
|
||||
table-alias: t # 表别名(默认 t)
|
||||
logic-del-type: on # 副表逻辑删除条件的位置，支持 WHERE、ON，默认 ON
|
||||
|
||||
# Spring Data Redis 配置
|
||||
spring:
|
||||
data:
|
||||
redis:
|
||||
repositories:
|
||||
enabled: false # 项目未使用到 Spring Data Redis 的 Repository，所以直接禁用，保证启动速度
|
||||
|
||||
--- #################### 数据库相关配置 ####################
|
||||
spring:
|
||||
mvc:
|
||||
servlet:
|
||||
load-on-startup: 10
|
||||
# 数据源配置项
|
||||
autoconfigure:
|
||||
exclude:
|
||||
# - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
|
||||
# - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置
|
||||
# - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
|
||||
# - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
|
||||
# - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
|
||||
datasource:
|
||||
druid: # Druid 【监控】相关的全局配置
|
||||
web-stat-filter:
|
||||
enabled: true
|
||||
stat-view-servlet:
|
||||
enabled: true
|
||||
allow: # 设置白名单，不填则允许所有访问
|
||||
url-pattern: /druid/*
|
||||
login-username: # 控制台管理用户名和密码
|
||||
login-password:
|
||||
filter:
|
||||
stat:
|
||||
enabled: true
|
||||
log-slow-sql: true # 慢 SQL 记录
|
||||
slow-sql-millis: 100
|
||||
merge-sql: true
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
dynamic: # 多数据源配置
|
||||
druid: # Druid 【连接池】相关的全局配置
|
||||
initial-size: 10 # 初始连接数
|
||||
min-idle: 20 # 最小连接池数量
|
||||
max-active: 100 # 最大连接池数量
|
||||
max-wait: 60000 # 配置获取连接等待超时的时间，单位：毫秒
|
||||
time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
|
||||
min-evictable-idle-time-millis: 7200000 # 配置一个连接在池中最小生存的时间，单位：毫秒
|
||||
max-evictable-idle-time-millis: 25200000 # 配置一个连接在池中最大生存的时间，单位：毫秒
|
||||
#validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
|
||||
test-while-idle: true
|
||||
test-on-borrow: false
|
||||
test-on-return: false
|
||||
socket-timeout: 60000 # socket超时时间，单位：毫秒
|
||||
connect-timeout: 60000 # 建立数据库连接超时时间，单位：毫秒
|
||||
|
||||
|
||||
|
||||
--- #################### 定时任务相关配置 ####################
|
||||
|
||||
# Quartz 配置项，对应 QuartzProperties 配置类
|
||||
spring:
|
||||
quartz:
|
||||
auto-startup: true # 本地开发环境，尽量不要开启 Job
|
||||
scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName
|
||||
job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存，可选 jdbc 使用数据库。
|
||||
wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时，是否等待定时任务执行完成。默认为 false ，建议设置为 true
|
||||
properties: # 添加 Quartz Scheduler 附加属性，更多可以看 http://www.quartz-scheduler.org/documentation/2.4.0-SNAPSHOT/configuration.html 文档
|
||||
org:
|
||||
quartz:
|
||||
# Scheduler 相关配置
|
||||
scheduler:
|
||||
instanceName: schedulerName
|
||||
instanceId: AUTO # 自动生成 instance ID
|
||||
# JobStore 相关配置
|
||||
jobStore:
|
||||
# JobStore 实现类。可见博客：https://blog.csdn.net/weixin_42458219/article/details/122247162
|
||||
class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
|
||||
isClustered: true # 是集群模式
|
||||
clusterCheckinInterval: 15000 # 集群检查频率，单位：毫秒。默认为 15000，即 15 秒
|
||||
misfireThreshold: 60000 # misfire 阀值，单位：毫秒。
|
||||
# 线程池相关配置
|
||||
threadPool:
|
||||
threadCount: 25 # 线程池大小。默认为 10 。
|
||||
threadPriority: 5 # 线程优先级
|
||||
class: org.quartz.simpl.SimpleThreadPool # 线程池类型
|
||||
jdbc: # 使用 JDBC 的 JobStore 的时候，JDBC 的配置
|
||||
initialize-schema: NEVER # 是否自动使用 SQL 初始化 Quartz 表结构。这里设置成 never ，我们手动创建表结构。
|
||||
|
||||
--- #################### 监控相关配置 ####################
|
||||
# Lock4j 配置项
|
||||
lock4j:
|
||||
acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
|
||||
expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
|
||||
|
||||
# Resilience4j 配置项
|
||||
resilience4j:
|
||||
ratelimiter:
|
||||
instances:
|
||||
backendA:
|
||||
limit-for-period: 1 # 每个周期内，允许的请求数。默认为 50
|
||||
limit-refresh-period: 60s # 每个周期的时长，单位：微秒。默认为 500
|
||||
timeout-duration: 1s # 被限流时，阻塞等待的时长，单位：微秒。默认为 5s
|
||||
register-health-indicator: true # 是否注册到健康监测
|
||||
|
||||
# Actuator 监控端点的配置项
|
||||
management:
|
||||
endpoints:
|
||||
web:
|
||||
base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
|
||||
exposure:
|
||||
include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
|
||||
|
||||
# Spring Boot Admin 配置项
|
||||
spring:
|
||||
boot:
|
||||
admin:
|
||||
# Spring Boot Admin Client 客户端的相关配置
|
||||
client:
|
||||
url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
|
||||
instance:
|
||||
service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
|
||||
# Spring Boot Admin Server 服务端的相关配置
|
||||
context-path: /admin # 配置 Spring
|
||||
|
||||
--- #################### 验证码相关配置 ####################
|
||||
|
||||
aj:
|
||||
captcha:
|
||||
jigsaw: classpath:images/jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径
|
||||
pic-click: classpath:images/pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径
|
||||
cache-type: redis # 缓存 local/redis...
|
||||
cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
|
||||
timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
|
||||
type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
|
||||
water-mark: LideeYunJi # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
|
||||
interference-options: 0 # 滑动干扰项(0/1/2)
|
||||
req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
|
||||
req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定
|
||||
req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔
|
||||
req-get-minute-limit: 30 # get 接口一分钟内请求数限制
|
||||
req-check-minute-limit: 60 # check 接口一分钟内请求数限制
|
||||
req-verify-minute-limit: 60 # verify 接口一分钟内请求数限制
|
||||
|
||||
|
||||
--- #################### 第三方授权登录 ####################
|
||||
justauth:
|
||||
enabled: true
|
||||
type:
|
||||
DINGTALK: # 钉钉
|
||||
client-id: 123**************
|
||||
client-secret: 123**************
|
||||
ignore-check-redirect-uri: true
|
||||
|
||||
--- #################### 框架相关配置 ####################
|
||||
|
||||
lideeyunji:
|
||||
info:
|
||||
version: 2.2.4
|
||||
base-package: com.lideeyunji
|
||||
web-url: lidee.vip
|
||||
security:
|
||||
permit-all_urls:
|
||||
- /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，不需要登录
|
||||
- /admin-api/lideeyunji/open/** # 低代码平台，不需要登
|
||||
- /admin-api/lideeyunji/demo/**
|
||||
- /admin-api/lideeyunji/dingding/open/**
|
||||
websocket:
|
||||
enable: true # websocket的开关
|
||||
path: /infra/ws # 路径
|
||||
sender-type: local # 消息发送的类型，可选值为 local
|
||||
swagger:
|
||||
title: LideeYunJi低代码开发平台
|
||||
description: 提供管理后台所有功能
|
||||
version: ${lideeyunji.info.version}
|
||||
url: ${lideeyunji.info.web-url}
|
||||
tenant: # 多租户相关配置项
|
||||
enable: false
|
||||
ignore-urls:
|
||||
- /admin-api/system/tenant/get-id-by-name # 基于名字获取租户，不许带租户编号
|
||||
- /admin-api/system/tenant/get-by-website # 基于域名获取租户，不许带租户编号
|
||||
- /admin-api/system/captcha/get # 获取图片验证码，和租户无关
|
||||
- /admin-api/system/captcha/check # 校验图片验证码，和租户无关
|
||||
- /admin-api/infra/file/*/get/** # 获取图片，和租户无关
|
||||
- /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号
|
||||
- /admin-api/lideeyunji/** # 低代码平台的全部放开，有自己的一套租户 规则
|
||||
ignore-tables:
|
||||
- DUAL
|
||||
- dual
|
||||
- ALL_TABLES
|
||||
- all_tables
|
||||
- ALL_INDEXES
|
||||
- all_indexes
|
||||
- system_tenant
|
||||
- system_tenant_package
|
||||
- system_dict_data
|
||||
- system_dict_type
|
||||
- system_error_code
|
||||
- system_menu
|
||||
- system_sms_channel
|
||||
- system_sms_template
|
||||
- system_sms_log
|
||||
- system_sensitive_word
|
||||
- system_oauth2_client
|
||||
- system_mail_account
|
||||
- system_mail_template
|
||||
- system_mail_log
|
||||
- system_notify_template
|
||||
- system_notify_message
|
||||
- infra_codegen_column
|
||||
- infra_codegen_table
|
||||
- infra_config
|
||||
- infra_file_config
|
||||
- infra_file
|
||||
- infra_file_content
|
||||
- infra_job
|
||||
- infra_job_log
|
||||
- infra_data_source_config
|
||||
- tmp_report_data_1
|
||||
- tmp_report_data_income
|
||||
- 'yunji_dbform*' #低代码开头的不要多租户
|
||||
- 'yunji_desform*' #低代码开头的不要多租户
|
||||
- 'yunji_tab*' #低代码开头的不要多租户
|
||||
- 'yunji_report*' #低代码开头的不要多租户
|
||||
- 'yunji_log_*' #低代码开头的不要多租户
|
||||
- '*_seq' #oracle自增主键等
|
||||
- information_schema
|
||||
sms-code: # 短信验证码相关的配置项
|
||||
expire-times: 10m
|
||||
send-frequency: 1m
|
||||
send-maximum-quantity-per-day: 10
|
||||
begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
|
||||
end-code: 9999 # 这里配置 9999 的原因是，测试方便。
|
||||
yunji: # 低代码平台相关配置项
|
||||
excludeTableNames: #不允许该类型的表开头
|
||||
- yunji_
|
||||
- qrtz_
|
||||
- system_
|
||||
- act_
|
||||
- bpm_
|
||||
- flw_
|
||||
- infra_
|
||||
#AES加解密 key 重新生成AesUtil.genAesKey()
|
||||
aesKey: O2BEeIv399qHQNhD6aGW8R8DEj4bqHXm
|
||||
ai:
|
||||
deepseek:
|
||||
apiKey: sk-b31fcf4e27bf45fbb65ace5bbc627d5d
|
||||
kimi:
|
||||
apiKey: sk-EE98wvDeTFvxRcBxDQmWhKQlewkGFIrfyCxvyNxDj8Vaf701
|
||||
debug: false
|
||||
Binary file not shown.
@@ -1,94 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="./logs" />
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
||||
|
||||
<!-- 控制台输出 -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!-- 系统日志输出 -->
|
||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/lideeyunji-info.log</file>
|
||||
<!-- 循环政策：基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/lideeyunji-info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>INFO</level>
|
||||
<!-- 匹配时的操作：接收（记录） -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/lideeyunji-error.log</file>
|
||||
<!-- 循环政策：基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/lideeyunji-error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>ERROR</level>
|
||||
<!-- 匹配时的操作：接收（记录） -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<root level="info">
|
||||
<appender-ref ref="console" />
|
||||
</root>
|
||||
|
||||
<!--系统操作日志-->
|
||||
<root level="info">
|
||||
<appender-ref ref="file_info" />
|
||||
<appender-ref ref="file_error" />
|
||||
</root>
|
||||
|
||||
|
||||
<!-- 特定包的日志级别配置 -->
|
||||
<logger name="com.lideeyunji" level="INFO" />
|
||||
<logger name="com.lideeyunji.core.framework.mapper" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.core.framework.service" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.core.flow.mapper" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.core.flow.service" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.service.bpm.mapper" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.service.bpm.service" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.service.infra.mapper" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.service.infra.service" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.service.system.mapper" level="DEBUG" />
|
||||
<logger name="com.lideeyunji.service.system.service" level="DEBUG" />
|
||||
|
||||
<!-- 设置特定类只记录ERROR级别日志 -->
|
||||
<logger name="com.lideeyunji.core.framework.mapper.LogApiMapper" level="ERROR" />
|
||||
<logger name="com.lideeyunji.core.framework.mapper.LogApiErrorMapper" level="ERROR" />
|
||||
<logger name="com.lideeyunji.service.system.mapper.OperateLogMapper" level="ERROR" />
|
||||
<logger name="org.springframework.context.support.PostProcessorRegistrationDelegate" level="ERROR" />
|
||||
<logger name="org.mybatis.spring.mapper.ClassPathMapperScanner" level="ERROR" />
|
||||
<logger name="de.codecentric" level="ERROR" />
|
||||
|
||||
|
||||
|
||||
</configuration>
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
artifactId=lidee-admin
|
||||
groupId=com.lideeyunji
|
||||
version=2.2.4
|
||||
@@ -1 +0,0 @@
|
||||
com\lideeyunji\server\lideeYunJiApplication.class
|
||||
@@ -1 +0,0 @@
|
||||
F:\java_project\hngryy_report\java\lidee-admin\src\main\java\com\lideeyunji\server\lideeYunJiApplication.java
|
||||
@@ -92,5 +92,10 @@
|
||||
<artifactId>lidee-service-infra-api</artifactId>
|
||||
<version>${lidee.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.oracle.database.nls</groupId>
|
||||
<artifactId>orai18n</artifactId>
|
||||
<version>21.1.0.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
@@ -45,8 +45,6 @@ public class FrameWorkAdapter implements IlideeYunjiAdapter {
|
||||
@Autowired
|
||||
private IFrameSqlService sqlService;
|
||||
|
||||
|
||||
|
||||
@Autowired
|
||||
private AdapterMapper adapterMapper;
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.lideeyunji.core.framework.config.job;
|
||||
|
||||
|
||||
import com.lideeyunji.core.framework.service.IGrBiSaSetdtlService;
|
||||
import com.lideeyunji.core.framework.service.ILideeYunJiService;
|
||||
import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler;
|
||||
import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 同步销售明细表
|
||||
* oracle gryybi GR_BI_SA_SETDTL --> mysql erp_bi_data GR_BI_SA_SETDTL
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
public class SaSetdtlSyncJob implements JobHandler {
|
||||
|
||||
@Autowired
|
||||
private ILideeYunJiService lideeYunJiService;
|
||||
|
||||
@Autowired
|
||||
private IGrBiSaSetdtlService grBiSaSetdtlService;
|
||||
|
||||
|
||||
@Override
|
||||
@TenantIgnore
|
||||
public String execute(String param) throws Exception {
|
||||
log.info("*********** 开始同步销售明细表 ************");
|
||||
// Integer cou = this.lideeYunJiService.saSetdtlSyncJob();
|
||||
Integer cou = this.grBiSaSetdtlService.saSetdtlSyncJob();
|
||||
String resultStr = "*********** 同步销售明细表，共保存了" + cou + "条数据 ************";
|
||||
log.info(resultStr);
|
||||
return resultStr;
|
||||
}
|
||||
}
|
||||
@@ -60,6 +60,9 @@ public class anyToGrBiSasetdtl implements JobHandler {
|
||||
while (rs.next()) {
|
||||
//写入到数据中台表
|
||||
|
||||
|
||||
|
||||
|
||||
System.out.println(rs.getString("SASETTLEDTLID"));
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
package com.lideeyunji.core.framework.controller;
|
||||
|
||||
import com.lideeyunji.core.framework.config.aspect.enhancereport.enums.RefreshPluginEnums;
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.lideeyunji.core.framework.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@TableName("GR_BI_SA_SETDTL")
|
||||
@Data
|
||||
@EqualsAndHashCode
|
||||
public class GrBiSaSetdtl implements Serializable {
|
||||
private final static long serialVersionUID = 1L;
|
||||
@TableId(value = "SASETTLEDTLID", type = IdType.INPUT)
|
||||
private Integer SASETTLEDTLID;
|
||||
@TableField(value = "SASETTLEID")
|
||||
private Integer SASETTLEID;
|
||||
@TableField(value = "USESTATUS")
|
||||
private Integer USESTATUS;
|
||||
@TableField(value = "UPDATE_TIME")
|
||||
private String UPDATETIME;
|
||||
@TableField(value = "USEDATE")
|
||||
private Date USEDATE;
|
||||
@TableField(value = "USEYEAR")
|
||||
private Integer USEYEAR;
|
||||
@TableField(value = "USEMONTH")
|
||||
private Integer USEMONTH;
|
||||
@TableField(value = "SALEZONEID")
|
||||
private Integer SALEZONEID;
|
||||
@TableField(value = "SALEZONENAME")
|
||||
private String SALEZONENAME;
|
||||
@TableField(value = "PROVINCEID")
|
||||
private Integer PROVINCEID;
|
||||
@TableField(value = "PROVINCENAME")
|
||||
private String PROVINCENAME;
|
||||
@TableField(value = "SALETYPE")
|
||||
private Integer SALETYPE;
|
||||
@TableField(value = "SALETYPENAME")
|
||||
private String SALETYPENAME;
|
||||
@TableField(value = "CUSTOMID")
|
||||
private Integer CUSTOMID;
|
||||
@TableField(value = "CUSTOMNAME")
|
||||
private String CUSTOMNAME;
|
||||
@TableField(value = "SALERID")
|
||||
private Integer SALERID;
|
||||
@TableField(value = "SALERNAME")
|
||||
private String SALERNAME;
|
||||
@TableField(value = "DOSAGEID")
|
||||
private Integer DOSAGEID;
|
||||
@TableField(value = "DOSAGENAME")
|
||||
private String DOSAGENAME;
|
||||
@TableField(value = "STDGOODSNAME")
|
||||
private String STDGOODSNAME;
|
||||
@TableField(value = "GOODSID")
|
||||
private Integer GOODSID;
|
||||
@TableField(value = "GOODSNAME")
|
||||
private String GOODSNAME;
|
||||
@TableField(value = "GOODSTYPE")
|
||||
private String GOODSTYPE;
|
||||
@TableField(value = "GOODSUNIT")
|
||||
private String GOODSUNIT;
|
||||
@TableField(value = "SAQTY")
|
||||
private Integer SAQTY;
|
||||
@TableField(value = "SAMONEY")
|
||||
private Integer SAMONEY;
|
||||
@TableField(value = "SAMONEYTX")
|
||||
private Integer SAMONEYTX;
|
||||
@TableField(value = "COST")
|
||||
private Integer COST;
|
||||
@TableField(value = "PROFIT")
|
||||
private Integer PROFIT;
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@@ -82,5 +83,41 @@ public class ReportFieldEntity extends BaseTenantEntity {
|
||||
*/
|
||||
private String isAmount;
|
||||
|
||||
//"是否支持维度；N=不支持 Y=支持"
|
||||
private String isDimension;
|
||||
|
||||
//是否包含子字段, 值 "Y"|"N"
|
||||
private String hasChildren;
|
||||
|
||||
// 父字段编码
|
||||
private String parentFieldCode;
|
||||
|
||||
//父字段名称
|
||||
private String parentFieldName;
|
||||
|
||||
//是否隐藏维度
|
||||
private String isHideDimension;
|
||||
|
||||
//是否是固定列 Y|N
|
||||
private String isFixedColumn;
|
||||
|
||||
//固定列的值
|
||||
private String fixedColumnValue;
|
||||
|
||||
//隐藏列的，表单不显示该字段
|
||||
private String isHideCol;
|
||||
|
||||
//是否动态分组 Y|N
|
||||
private String isDynamicGroup;
|
||||
|
||||
//单元格宽度
|
||||
private String width;
|
||||
|
||||
//查询控件默认值
|
||||
private String searchDefaultValue;
|
||||
|
||||
//查询控件隐藏
|
||||
private String isHideSearch;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.lideeyunji.core.framework.mapper;
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.lideeyunji.core.framework.entity.GrBiSaSetdtl;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public interface GrBiSaSetdtlMapper extends BaseMapper<GrBiSaSetdtl> {
|
||||
|
||||
@DS(value = "#dataSourceType")
|
||||
default GrBiSaSetdtl getLastUpdated(@Param("dataSourceType") String dataSourceType) {
|
||||
QueryWrapper<GrBiSaSetdtl> wrapper = new QueryWrapper<>();
|
||||
wrapper.orderByDesc("UPDATE_TIME");
|
||||
wrapper.last("limit 1");
|
||||
return this.selectOne(wrapper);
|
||||
}
|
||||
|
||||
@DS(value = "#dataSourceType")
|
||||
default List<GrBiSaSetdtl> getByUpdateTime(@Param("dataSourceType") String dataSourceType, String updateTime) {
|
||||
try {
|
||||
// 假设 updateTime 格式为 "yyyy-MM-dd HH:mm:ss"
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Date startTime = sdf.parse(updateTime);
|
||||
QueryWrapper<GrBiSaSetdtl> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.gt("UPDATE_TIME", startTime);
|
||||
return this.selectList(queryWrapper);
|
||||
} catch (Exception e) {
|
||||
// 处理异常
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
@DS(value = "#dataSourceType")
|
||||
default List<GrBiSaSetdtl> queryByIds(@Param("dataSourceType") String dataSourceType, Set<Integer> ids) {
|
||||
return this.selectBatchIds(ids);
|
||||
}
|
||||
|
||||
@DS(value = "#dataSourceType")
|
||||
default int save(@Param("dataSourceType") String dataSourceType, GrBiSaSetdtl grBiSaSetdtl) {
|
||||
return this.insert(grBiSaSetdtl);
|
||||
}
|
||||
|
||||
@DS(value = "#dataSourceType")
|
||||
default int update(@Param("dataSourceType") String dataSourceType, GrBiSaSetdtl grBiSaSetdtl) {
|
||||
return this.updateById(grBiSaSetdtl);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -50,5 +50,39 @@ public class ReportFieldVo extends ReportFieldIdVo {
|
||||
|
||||
@Schema(description = "是否支持维度；N=不支持 Y=支持")
|
||||
private String isDimension ;
|
||||
|
||||
//是否包含子字段, 值 "Y"|"N"
|
||||
private String hasChildren;
|
||||
|
||||
// 父字段编码
|
||||
private String parentFieldCode;
|
||||
|
||||
//父字段名称
|
||||
private String parentFieldName;
|
||||
|
||||
//是否隐藏维度
|
||||
private String isHideDimension;
|
||||
|
||||
//是否是固定列 Y|N
|
||||
private String isFixedColumn;
|
||||
|
||||
//固定列的值
|
||||
private String fixedColumnValue;
|
||||
|
||||
//隐藏列的，表单不显示该字段
|
||||
private String isHideCol;
|
||||
|
||||
//是否动态分组 Y|N
|
||||
private String isDynamicGroup;
|
||||
|
||||
//单元格宽度
|
||||
private String width;
|
||||
|
||||
//查询控件默认值
|
||||
private String searchDefaultValue;
|
||||
|
||||
//查询控件隐藏
|
||||
private String isHideSearch;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.lideeyunji.core.framework.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.lideeyunji.core.framework.entity.GrBiSaSetdtl;
|
||||
|
||||
public interface IGrBiSaSetdtlService extends IService<GrBiSaSetdtl> {
|
||||
|
||||
//同步销售明细表
|
||||
Integer saSetdtlSyncJob();
|
||||
|
||||
}
|
||||
@@ -42,6 +42,7 @@ import net.sf.jsqlparser.JSQLParserException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.lideeyunji.core.framework.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.lideeyunji.core.framework.entity.GrBiSaSetdtl;
|
||||
import com.lideeyunji.core.framework.mapper.GrBiSaSetdtlMapper;
|
||||
import com.lideeyunji.core.framework.service.IGrBiSaSetdtlService;
|
||||
import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
public class GrBiSaSetdtlServiceImpl extends ServiceImpl<GrBiSaSetdtlMapper, GrBiSaSetdtl> implements IGrBiSaSetdtlService {
|
||||
|
||||
/**
|
||||
* 同步销售明细表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Integer saSetdtlSyncJob() {
|
||||
//获取本地mysql数据库中表中UPDATE_TIME最新的数据
|
||||
GrBiSaSetdtl grBiSaSetdtl = this.baseMapper.getLastUpdated(lideeYunJiBaseConstant.DS_ERP_BI_DATA);
|
||||
|
||||
//本地不存在空的情况 之前会手动导入的情况
|
||||
//查询大于本地最大更新时间的oracle里的数据
|
||||
List<GrBiSaSetdtl> grBiSaSetdtlList = this.baseMapper.getByUpdateTime(lideeYunJiBaseConstant.DS_ORACLE_GRYYBI, grBiSaSetdtl.getUPDATETIME());
|
||||
|
||||
if (CollUtil.isEmpty(grBiSaSetdtlList)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
//保存数据
|
||||
return this.saveSyncData(grBiSaSetdtlList);
|
||||
}
|
||||
|
||||
|
||||
//保存同步数据到本地
|
||||
@Transactional
|
||||
public Integer saveSyncData(List<GrBiSaSetdtl> grBiSaSetdtlList) {
|
||||
|
||||
//需要新增的数据
|
||||
List<GrBiSaSetdtl> needSaveList = grBiSaSetdtlList;
|
||||
List<GrBiSaSetdtl> needUpdateList = null;
|
||||
//校验哪些数据已经存在需要更新
|
||||
List<GrBiSaSetdtl> existList = this.baseMapper.queryByIds(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grBiSaSetdtlList.stream().map(GrBiSaSetdtl::getSASETTLEDTLID).collect(Collectors.toSet()));
|
||||
if (CollUtil.isNotEmpty(existList)) {
|
||||
Set<Integer> needUpdateIdSet = existList.stream().map(GrBiSaSetdtl::getSASETTLEDTLID).collect(Collectors.toSet());
|
||||
needSaveList = grBiSaSetdtlList
|
||||
.stream()
|
||||
.filter(grBiSaSetdtl -> {
|
||||
return !needUpdateIdSet.contains(grBiSaSetdtl.getSASETTLEDTLID());
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
needUpdateList = grBiSaSetdtlList
|
||||
.stream()
|
||||
.filter(grBiSaSetdtl -> {
|
||||
return needUpdateIdSet.contains(grBiSaSetdtl.getSASETTLEDTLID());
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
//将orcale数据集合分割成100条一组、
|
||||
Integer result = 0;
|
||||
if (CollUtil.isNotEmpty(needSaveList)) {
|
||||
result += this.saveBatch(needSaveList);
|
||||
}
|
||||
if (CollUtil.isNotEmpty(needUpdateList)) {
|
||||
result += this.updateBatch(needUpdateList);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
//批量新增
|
||||
@Transactional
|
||||
public Integer saveBatch(List<GrBiSaSetdtl> grBiSaSetdtlList) {
|
||||
Integer result = 0;
|
||||
for (GrBiSaSetdtl grBiSaSetdtl : grBiSaSetdtlList) {
|
||||
int re = this.baseMapper.save(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grBiSaSetdtl);
|
||||
if (re < 1) {
|
||||
throw new RuntimeException("批量新增异常");
|
||||
}
|
||||
result += re;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
//批量更新
|
||||
@Transactional
|
||||
public Integer updateBatch(List<GrBiSaSetdtl> grBiSaSetdtlList) {
|
||||
Integer result = 0;
|
||||
for (GrBiSaSetdtl grBiSaSetdtl : grBiSaSetdtlList) {
|
||||
int re = this.baseMapper.update(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grBiSaSetdtl);
|
||||
if (re < 1) {
|
||||
throw new RuntimeException("批量新增异常");
|
||||
}
|
||||
result += re;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -377,7 +377,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
|
||||
entity.setDictCode(vo.getDictCode());
|
||||
entity.setIsExport(vo.getIsExport());
|
||||
entity.setIsShowSort(vo.getIsShowSort());
|
||||
entity.setIsShowSort(vo.getIsDimension());
|
||||
entity.setIsDimension(vo.getIsDimension());
|
||||
entity.setIsHideDimension(vo.getIsHideDimension());
|
||||
entity.setIsFixedColumn(vo.getIsFixedColumn()); //2026-02-10 新增
|
||||
entity.setFixedColumnValue(vo.getFixedColumnValue()); //2026-02-10 新增
|
||||
entity.setIsHideCol(vo.getIsHideCol()); //2026.2.10 新增
|
||||
entity.setSearchDefaultValue(vo.getSearchDefaultValue());
|
||||
entity.setIsHideSearch(vo.getIsHideSearch());
|
||||
entity.setWidth(vo.getWidth());
|
||||
entity.setIsDynamicGroup(vo.getIsDynamicGroup());
|
||||
entity.setHasChildren(vo.getHasChildren());
|
||||
entity.setParentFieldCode(vo.getParentFieldCode());
|
||||
entity.setParentFieldName(vo.getParentFieldName());
|
||||
entity.setIsAmount(vo.getIsAmount());
|
||||
entity.setLabelI18n(vo.getLabelI18n());
|
||||
if (FuncBase.isEmpty(vo.getId())) {//新增
|
||||
|
||||
@@ -70,13 +70,14 @@
|
||||
WHERE
|
||||
report.is_deleted = 0
|
||||
AND field.is_deleted = 0
|
||||
AND field.query_is_db = 'Y'
|
||||
-- AND field.query_is_db = 'Y'
|
||||
AND report.id = #{reportId}
|
||||
ORDER BY
|
||||
field.sort_num ASC,
|
||||
field.id ASC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getExcelExportFieldList" resultType="map">
|
||||
SELECT
|
||||
df.field_code as "field_code",
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user