Merge remote-tracking branch 'origin/main'

This commit is contained in:
2025-12-27 13:24:18 +08:00
11 changed files with 49 additions and 147 deletions

1
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1 @@
custom: http://doc.ruoyi.vip/zhyc-vue/other/donate.html

48
.gitignore vendored Normal file
View File

@@ -0,0 +1,48 @@
######################################################################
# Build Tools
.gradle
/build/
!gradle/wrapper/gradle-wrapper.jar
target/
!.mvn/wrapper/maven-wrapper.jar
######################################################################
# IDE
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### JRebel ###
rebel.xml
### NetBeans ###
nbproject/private/
build/*
nbbuild/
dist/
nbdist/
.nb-gradle/
######################################################################
# Others
*.log
*.xml.versionsBackup
*.swp
!*/build/*.java
!*/build/*.html
!*/build/*.xml
/zhyc-module/src/main/java/com/zhyc/module/group_management/service/impl/GroupServiceImpl.java

Binary file not shown.

8
.idea/.gitignore generated vendored
View File

@@ -1,8 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ApifoxUploaderProjectSetting">
<option name="apiAccessToken" value="APS-VFnCmsXBeq4ngwaMP2G7GZQicFTlrYpK" />
<option name="apiProjectIds">
<array>
<option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAF0AAR6aHljdAAHNjkzNDk4MHBwcHQABzYyOTUzNjN0AAticmFuY2gtbWFpbnQADOm7mOiupOaooeWdl3BwcHBwdAAAdAAJ5qC555uu5b2VdAABMHQABzcyMDg4NzR0AAzmmbrmhafnvorlnLpxAH4ACXEAfgAK&lt;/byte-array&gt;" />
</array>
</option>
<option name="treeNodes" value="&lt;byte-array&gt;rO0ABXNyABdqYXZhLnV0aWwuTGlua2VkSGFzaE1hcDTATlwQbMD7AgABWgALYWNjZXNzT3JkZXJ4cgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hvbGR4cD9AAAAAAAAMdwgAAAAQAAAAAXQABzIyODE3MThzcgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5UcmVlTm9kZQAAAAAAAAABAgAQTAAHYWxsUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO1sAFGJyYW5jaEFuZFZlcnNpb25JdGVtdABLW0xjb20vaXRhbmdjZW50L2lkZWEvcGx1Z2luL2RpYWxvZy9jb21wb25lbnQvYWNjb3VudC9BY2NvdW50UmlnaHRQYW5lbEl0ZW07TAAUYnJhbmNoSWRBbmRWZXJzaW9uSWRxAH4ABUwACGNoaWxkcmVudAAPTGphdmEvdXRpbC9NYXA7TAAKZm9sZGVyVHlwZXEAfgAFTAAIZnVsbFBhdGhxAH4ABUwAA2tleXEAfgAFWwAJbW9kZWxJdGVtcQB+AAZMAAhtb2R1bGVJZHEAfgAFTAAEbmFtZXEAfgAFTAAIcGFyZW50SWRxAH4ABUwACXByb2plY3RJZHEAfgAFTAALcHJvamVjdE5hbWVxAH4ABUwABnRlYW1JZHEAfgAFTAAIdGVhbU5hbWVxAH4ABUwABHR5cGV0ADBMY29tL2l0YW5nY2VudC9pZGVhL3BsdWdpbi9hcGkvYWNjb3VudC9Ob2RlVHlwZTt4cHQADOS4quS6uuepuumXtHBwc3EAfgAAP0AAAAAAAAx3CAAAABAAAAAFdAAHMzkzNzUyN3NxAH4ABHQAFuS4quS6uuepuumXtC9iaWdfZXZlbnRwcHNxAH4AAD9AAAAAAAAAdwgAAAAQAAAAAHgAcHBxAH4ADHBwdAATYmlnX2V2ZW50ICgzOTM3NTI3KXQABzIyODE3MThxAH4ADHQACWJpZ19ldmVudHEAfgARcH5yAC5jb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50Lk5vZGVUeXBlAAAAAAAAAAASAAB4cgAOamF2YS5sYW5nLkVudW0AAAAAAAAAABIAAHhwdAAHUFJPSkVDVHQABzQwMzQ4MTlzcQB+AAR0ABbkuKrkurrnqbrpl7Qv5b6u5ZWG5Z+OcHBzcQB+AAA/QAAAAAAAAHcIAAAAEAAAAAB4AHBwcQB+ABdwcHQAE+W+ruWVhuWfjiAoNDAzNDgxOSl0AAcyMjgxNzE4cQB+ABd0AAnlvq7llYbln45xAH4AHHBxAH4AFXQABzQ3MDExOTZzcQB+AAR0ABPkuKrkurrnqbrpl7Qv5a6e6K6tcHBzcQB+AAA/QAAAAAAAAHcIAAAAEAAAAAB4AHBwcQB+AB5wcHQAEOWunuiurSAoNDcwMTE5Nil0AAcyMjgxNzE4cQB+AB50AAblrp7orq1xAH4AI3BxAH4AFXQABzUyODYyNDVzcQB+AAR0ABnkuKrkurrnqbrpl7Qv6Ii56Ii25Yi26YCgcHBzcQB+AAA/QAAAAAAAAHcIAAAAEAAAAAB4AHBwcQB+ACVwcHQAFuiIueiItuWItumAoCAoNTI4NjI0NSl0AAcyMjgxNzE4cQB+ACV0AAzoiLnoiLbliLbpgKBxAH4AKnBxAH4AFXQABzYwMjc0OTVzcQB+AAR0ABnkuKrkurrnqbrpl7Qv5pm65oWn5Yac5LiacHBzcQB+AAA/QAAAAAAAAHcIAAAAEAAAAAB4AHBwcQB+ACxwcHQAFuaZuuaFp+WGnOS4miAoNjAyNzQ5NSl0AAcyMjgxNzE4cQB+ACx0AAzmmbrmhaflhpzkuJpxAH4AMXBxAH4AFXgAcHBxAH4AA3BwcQB+AApwcHBxAH4AA3EAfgAKfnEAfgATdAAEVEVBTXgA&lt;/byte-array&gt;" />
<option name="treeNodesJTree" value="&lt;byte-array&gt;rO0ABXNyACFqYXZheC5zd2luZy50cmVlLkRlZmF1bHRUcmVlTW9kZWynvpEmGsXl2QMAA1oAEmFza3NBbGxvd3NDaGlsZHJlbkwADGxpc3RlbmVyTGlzdHQAJUxqYXZheC9zd2luZy9ldmVudC9FdmVudExpc3RlbmVyTGlzdDtMAARyb290dAAbTGphdmF4L3N3aW5nL3RyZWUvVHJlZU5vZGU7eHAAc3IAI2phdmF4LnN3aW5nLmV2ZW50LkV2ZW50TGlzdGVuZXJMaXN0kUjMLXPfDt4DAAB4cHB4c3IAJ2phdmF4LnN3aW5nLnRyZWUuRGVmYXVsdE11dGFibGVUcmVlTm9kZcRYv/zyqHHgAwADWgAOYWxsb3dzQ2hpbGRyZW5MAAhjaGlsZHJlbnQAEkxqYXZhL3V0aWwvVmVjdG9yO0wABnBhcmVudHQAIkxqYXZheC9zd2luZy90cmVlL011dGFibGVUcmVlTm9kZTt4cAFzcgAQamF2YS51dGlsLlZlY3RvctmXfVuAO68BAwADSQARY2FwYWNpdHlJbmNyZW1lbnRJAAxlbGVtZW50Q291bnRbAAtlbGVtZW50RGF0YXQAE1tMamF2YS9sYW5nL09iamVjdDt4cAAAAAAAAAABdXIAE1tMamF2YS5sYW5nLk9iamVjdDuQzlifEHMpbAIAAHhwAAAACnNxAH4ABgFzcQB+AAoAAAAAAAAABnVxAH4ADQAAAApzcQB+AAYBcHEAfgAPdXEAfgANAAAAAnQACnVzZXJPYmplY3RzcgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5UcmVlTm9kZQAAAAAAAAABAgAQTAAHYWxsUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO1sAFGJyYW5jaEFuZFZlcnNpb25JdGVtdABLW0xjb20vaXRhbmdjZW50L2lkZWEvcGx1Z2luL2RpYWxvZy9jb21wb25lbnQvYWNjb3VudC9BY2NvdW50UmlnaHRQYW5lbEl0ZW07TAAUYnJhbmNoSWRBbmRWZXJzaW9uSWRxAH4AFkwACGNoaWxkcmVudAAPTGphdmEvdXRpbC9NYXA7TAAKZm9sZGVyVHlwZXEAfgAWTAAIZnVsbFBhdGhxAH4AFkwAA2tleXEAfgAWWwAJbW9kZWxJdGVt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&lt;/byte-array&gt;" />
</component>
</project>

20
.idea/compiler.xml generated
View File

@@ -1,20 +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="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="zhyc-system" />
<module name="zhyc-framework" />
<module name="zhyc-module" />
<module name="zhyc-generator" />
<module name="zhyc-common" />
<module name="zhyc-quartz" />
<module name="zhyc-admin" />
</profile>
</annotationProcessing>
</component>
</project>

42
.idea/dataSources.xml generated
View File

@@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="@146.56.214.124" uuid="04168e42-42cb-418f-9da6-7acc3b364610">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://146.56.214.124:3306</jdbc-url>
<jdbc-additional-properties>
<property name="com.intellij.clouds.kubernetes.db.host.port" />
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
<property name="com.intellij.clouds.kubernetes.db.container.port" />
</jdbc-additional-properties>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="@localhost" uuid="c8fa766a-70c1-40a7-8445-71230d89c2c8">
<driver-ref>mysql_aurora_aws</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>software.aws.rds.jdbc.mysql.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql:aws://localhost:3306</jdbc-url>
<jdbc-additional-properties>
<property name="com.intellij.clouds.kubernetes.db.host.port" />
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
<property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
<property name="com.intellij.clouds.kubernetes.db.container.port" />
</jdbc-additional-properties>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="@118.182.97.76" uuid="96bb419b-b006-48e8-b493-e92516f4d1aa">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://118.182.97.76:3306</jdbc-url>
<jdbc-additional-properties>
<property name="com.intellij.clouds.kubernetes.db.host.port" />
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
<property name="com.intellij.clouds.kubernetes.db.container.port" />
</jdbc-additional-properties>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

21
.idea/encodings.xml generated
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-admin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-framework/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-framework/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-generator/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-generator/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-module/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-module/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-quartz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-quartz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/zhyc-system/src/main/resources" charset="UTF-8" />
</component>
</project>

View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="public" />
<option name="name" value="aliyun nexus" />
<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="https://repo.maven.apache.org/maven2" />
</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>
</component>
</project>

12
.idea/misc.xml generated
View File

@@ -1,12 +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" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
</project>

6
.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>