diff --git a/Doc/错误日志.txt b/Doc/错误日志.txt
index b540279d..56c62a02 100644
--- a/Doc/错误日志.txt
+++ b/Doc/错误日志.txt
@@ -1,4 +1,4 @@
-D:\JDK21\bin\java.exe "-javaagent:D:\Program Files\JetBrains\IntelliJ IDEA 2025.1\lib\idea_rt.jar=1786" -Dfile.encoding=UTF-8 -Dsun.stdout.encoding=UTF-8 -Dsun.stderr.encoding=UTF-8 -classpath D:\dsWork\YunNanDsBase\target\classes;D:\apache-maven\MavenRepository\com\jfinal\jfinal\5.2.3\jfinal-5.2.3.jar;D:\apache-maven\MavenRepository\com\jfinal\jfinal-undertow\3.6\jfinal-undertow-3.6.jar;D:\apache-maven\MavenRepository\io\undertow\undertow-core\2.2.33.Final\undertow-core-2.2.33.Final.jar;D:\apache-maven\MavenRepository\org\jboss\logging\jboss-logging\3.4.1.Final\jboss-logging-3.4.1.Final.jar;D:\apache-maven\MavenRepository\org\jboss\xnio\xnio-api\3.8.16.Final\xnio-api-3.8.16.Final.jar;D:\apache-maven\MavenRepository\org\wildfly\common\wildfly-common\1.5.4.Final\wildfly-common-1.5.4.Final.jar;D:\apache-maven\MavenRepository\org\wildfly\client\wildfly-client-config\1.0.1.Final\wildfly-client-config-1.0.1.Final.jar;D:\apache-maven\MavenRepository\org\jboss\xnio\xnio-nio\3.8.16.Final\xnio-nio-3.8.16.Final.jar;D:\apache-maven\MavenRepository\org\jboss\threads\jboss-threads\3.1.0.Final\jboss-threads-3.1.0.Final.jar;D:\apache-maven\MavenRepository\io\undertow\undertow-servlet\2.2.33.Final\undertow-servlet-2.2.33.Final.jar;D:\apache-maven\MavenRepository\javax\servlet\javax.servlet-api\4.0.1\javax.servlet-api-4.0.1.jar;D:\apache-maven\MavenRepository\com\jfinal\cos\2022.2\cos-2022.2.jar;D:\apache-maven\MavenRepository\cn\idev\excel\fastexcel\1.1.0\fastexcel-1.1.0.jar;D:\apache-maven\MavenRepository\cn\idev\excel\fastexcel-core\1.1.0\fastexcel-core-1.1.0.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-csv\1.11.0\commons-csv-1.11.0.jar;D:\apache-maven\MavenRepository\org\ehcache\ehcache\3.9.11\ehcache-3.9.11.jar;D:\apache-maven\MavenRepository\cn\idev\excel\fastexcel-support\0.0.1\fastexcel-support-0.0.1.jar;D:\apache-maven\MavenRepository\com\alibaba\dashscope-sdk-java\2.16.9\dashscope-sdk-java-2.16.9.jar;D:\apache-maven\MavenRepository\io\reactivex\rxjava2\rxjava\2.2.21\rxjava-2.2.21.jar;D:\apache-maven\MavenRepository\org\reactivestreams\reactive-streams\1.0.3\reactive-streams-1.0.3.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib-jdk8\1.8.21\kotlin-stdlib-jdk8-1.8.21.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib-jdk7\1.8.21\kotlin-stdlib-jdk7-1.8.21.jar;D:\apache-maven\MavenRepository\com\squareup\okio\okio\3.6.0\okio-3.6.0.jar;D:\apache-maven\MavenRepository\com\squareup\okhttp3\logging-interceptor\4.12.0\logging-interceptor-4.12.0.jar;D:\apache-maven\MavenRepository\com\squareup\okhttp3\okhttp-sse\4.12.0\okhttp-sse-4.12.0.jar;D:\apache-maven\MavenRepository\com\github\victools\jsonschema-generator\4.31.1\jsonschema-generator-4.31.1.jar;D:\apache-maven\MavenRepository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;D:\apache-maven\MavenRepository\com\squareup\okhttp3\okhttp\4.10.0\okhttp-4.10.0.jar;D:\apache-maven\MavenRepository\com\squareup\okio\okio-jvm\3.0.0\okio-jvm-3.0.0.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib-common\1.5.31\kotlin-stdlib-common-1.5.31.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib\1.6.20\kotlin-stdlib-1.6.20.jar;D:\apache-maven\MavenRepository\org\jetbrains\annotations\13.0\annotations-13.0.jar;D:\apache-maven\MavenRepository\cn\smallbun\screw\screw-core\1.0.5\screw-core-1.0.5.jar;D:\apache-maven\MavenRepository\commons-lang\commons-lang\2.6\commons-lang-2.6.jar;D:\apache-maven\MavenRepository\org\freemarker\freemarker\2.3.30\freemarker-2.3.30.jar;D:\apache-maven\MavenRepository\mysql\mysql-connector-java\8.0.28\mysql-connector-java-8.0.28.jar;D:\apache-maven\MavenRepository\com\google\protobuf\protobuf-java\3.11.4\protobuf-java-3.11.4.jar;D:\apache-maven\MavenRepository\io\minio\minio\8.5.12\minio-8.5.12.jar;D:\apache-maven\MavenRepository\com\carrotsearch\thirdparty\simple-xml-safe\2.7.1\simple-xml-safe-2.7.1.jar;D:\apache-maven\MavenRepository\com\google\guava\guava\33.0.0-jre\guava-33.0.0-jre.jar;D:\apache-maven\MavenRepository\com\google\guava\failureaccess\1.0.2\failureaccess-1.0.2.jar;D:\apache-maven\MavenRepository\com\google\guava\listenablefuture\9999.0-empty-to-avoid-conflict-with-guava\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;D:\apache-maven\MavenRepository\com\google\code\findbugs\jsr305\3.0.2\jsr305-3.0.2.jar;D:\apache-maven\MavenRepository\org\checkerframework\checker-qual\3.41.0\checker-qual-3.41.0.jar;D:\apache-maven\MavenRepository\com\google\errorprone\error_prone_annotations\2.23.0\error_prone_annotations-2.23.0.jar;D:\apache-maven\MavenRepository\com\google\j2objc\j2objc-annotations\2.8\j2objc-annotations-2.8.jar;D:\apache-maven\MavenRepository\com\fasterxml\jackson\core\jackson-annotations\2.16.1\jackson-annotations-2.16.1.jar;D:\apache-maven\MavenRepository\org\bouncycastle\bcprov-jdk18on\1.78\bcprov-jdk18on-1.78.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-compress\1.26.0\commons-compress-1.26.0.jar;D:\apache-maven\MavenRepository\commons-codec\commons-codec\1.16.1\commons-codec-1.16.1.jar;D:\apache-maven\MavenRepository\org\xerial\snappy\snappy-java\1.1.10.5\snappy-java-1.1.10.5.jar;D:\apache-maven\MavenRepository\io\github\yedaxia\japidocs\1.4.4\japidocs-1.4.4.jar;D:\apache-maven\MavenRepository\com\github\javaparser\javaparser-core\3.6.16\javaparser-core-3.6.16.jar;D:\apache-maven\MavenRepository\javax\xml\bind\jaxb-api\2.3.1\jaxb-api-2.3.1.jar;D:\apache-maven\MavenRepository\javax\activation\javax.activation-api\1.2.0\javax.activation-api-1.2.0.jar;D:\apache-maven\MavenRepository\javax\activation\activation\1.1.1\activation-1.1.1.jar;D:\apache-maven\MavenRepository\org\glassfish\jaxb\jaxb-runtime\2.3.3\jaxb-runtime-2.3.3.jar;D:\apache-maven\MavenRepository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;D:\apache-maven\MavenRepository\org\glassfish\jaxb\txw2\2.3.3\txw2-2.3.3.jar;D:\apache-maven\MavenRepository\com\sun\istack\istack-commons-runtime\3.0.11\istack-commons-runtime-3.0.11.jar;D:\apache-maven\MavenRepository\com\sun\activation\jakarta.activation\1.2.2\jakarta.activation-1.2.2.jar;D:\apache-maven\MavenRepository\org\xerial\sqlite-jdbc\3.43.2.0\sqlite-jdbc-3.43.2.0.jar;D:\apache-maven\MavenRepository\org\slf4j\slf4j-api\2.0.16\slf4j-api-2.0.16.jar;D:\apache-maven\MavenRepository\net\sf\json-lib\json-lib\2.4\json-lib-2.4-jdk15.jar;D:\apache-maven\MavenRepository\commons-beanutils\commons-beanutils\1.8.0\commons-beanutils-1.8.0.jar;D:\apache-maven\MavenRepository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;D:\apache-maven\MavenRepository\net\sf\ezmorph\ezmorph\1.0.6\ezmorph-1.0.6.jar;D:\apache-maven\MavenRepository\commons-logging\commons-logging\1.2\commons-logging-1.2.jar;D:\apache-maven\MavenRepository\log4j\log4j\1.2.17\log4j-1.2.17.jar;D:\apache-maven\MavenRepository\org\slf4j\slf4j-log4j12\1.7.25\slf4j-log4j12-1.7.25.jar;D:\apache-maven\MavenRepository\ch\qos\logback\logback-classic\1.5.6\logback-classic-1.5.6.jar;D:\apache-maven\MavenRepository\ch\qos\logback\logback-core\1.5.6\logback-core-1.5.6.jar;D:\apache-maven\MavenRepository\cn\hutool\hutool-all\5.8.29\hutool-all-5.8.29.jar;D:\apache-maven\MavenRepository\com\alibaba\fastjson\2.0.52\fastjson-2.0.52.jar;D:\apache-maven\MavenRepository\com\alibaba\fastjson2\fastjson2-extension\2.0.52\fastjson2-extension-2.0.52.jar;D:\apache-maven\MavenRepository\com\alibaba\fastjson2\fastjson2\2.0.52\fastjson2-2.0.52.jar;D:\apache-maven\MavenRepository\org\jsoup\jsoup\1.17.2\jsoup-1.17.2.jar;D:\apache-maven\MavenRepository\com\google\code\gson\gson\2.10.1\gson-2.10.1.jar;D:\apache-maven\MavenRepository\commons-io\commons-io\2.14.0\commons-io-2.14.0.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-email\1.5\commons-email-1.5.jar;D:\apache-maven\MavenRepository\com\sun\mail\javax.mail\1.5.6\javax.mail-1.5.6.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar;D:\apache-maven\MavenRepository\org\dom4j\dom4j\2.1.4\dom4j-2.1.4.jar;D:\apache-maven\MavenRepository\jaxen\jaxen\1.1.6\jaxen-1.1.6.jar;D:\apache-maven\MavenRepository\redis\clients\jedis\5.1.0\jedis-5.1.0.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-pool2\2.12.0\commons-pool2-2.12.0.jar;D:\apache-maven\MavenRepository\org\json\json\20231013\json-20231013.jar;D:\apache-maven\MavenRepository\org\apache\httpcomponents\httpmime\4.5.14\httpmime-4.5.14.jar;D:\apache-maven\MavenRepository\org\apache\httpcomponents\httpclient\4.5.14\httpclient-4.5.14.jar;D:\apache-maven\MavenRepository\org\apache\httpcomponents\httpcore\4.4.16\httpcore-4.4.16.jar;D:\apache-maven\MavenRepository\org\apache\logging\log4j\log4j-core\2.20.0\log4j-core-2.20.0.jar;D:\apache-maven\MavenRepository\org\apache\logging\log4j\log4j-api\2.20.0\log4j-api-2.20.0.jar;D:\apache-maven\MavenRepository\com\fasterxml\jackson\core\jackson-core\2.17.2\jackson-core-2.17.2.jar;D:\apache-maven\MavenRepository\com\fasterxml\jackson\core\jackson-databind\2.17.2\jackson-databind-2.17.2.jar;D:\apache-maven\MavenRepository\com\github\mwiede\jsch\0.2.19\jsch-0.2.19.jar;D:\apache-maven\MavenRepository\com\zaxxer\HikariCP\5.1.0\HikariCP-5.1.0.jar;D:\apache-maven\MavenRepository\com\alibaba\druid\1.2.23\druid-1.2.23.jar;D:\apache-maven\MavenRepository\org\yaml\snakeyaml\2.3\snakeyaml-2.3.jar;D:\apache-maven\MavenRepository\io\jsonwebtoken\jjwt\0.7.0\jjwt-0.7.0.jar;D:\apache-maven\MavenRepository\com\zendesk\mysql-binlog-connector-java\0.30.1\mysql-binlog-connector-java-0.30.1.jar;D:\apache-maven\MavenRepository\com\github\luben\zstd-jni\1.5.0-2\zstd-jni-1.5.0-2.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi\5.2.5\poi-5.2.5.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-math3\3.6.1\commons-math3-3.6.1.jar;D:\apache-maven\MavenRepository\com\zaxxer\SparseBitSet\1.3\SparseBitSet-1.3.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi-ooxml\5.2.5\poi-ooxml-5.2.5.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi-ooxml-lite\5.2.5\poi-ooxml-lite-5.2.5.jar;D:\apache-maven\MavenRepository\org\apache\xmlbeans\xmlbeans\5.2.0\xmlbeans-5.2.0.jar;D:\apache-maven\MavenRepository\com\github\virtuald\curvesapi\1.08\curvesapi-1.08.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi-scratchpad\5.2.5\poi-scratchpad-5.2.5.jar com.dsideal.base.Tools.AiGenerate
+D:\JDK21\bin\java.exe "-javaagent:D:\Program Files\JetBrains\IntelliJ IDEA 2025.1\lib\idea_rt.jar=1786" -Dfile.encoding=UTF-8 -Dsun.stdout.encoding=UTF-8 -Dsun.stderr.encoding=UTF-8 -classpath D:\dsWork\YunNanDsBase\target\classes;D:\apache-maven\MavenRepository\com\jfinal\jfinal\5.2.3\jfinal-5.2.3.jar;D:\apache-maven\MavenRepository\com\jfinal\jfinal-undertow\3.6\jfinal-undertow-3.6.jar;D:\apache-maven\MavenRepository\io\undertow\undertow-core\2.2.33.Final\undertow-core-2.2.33.Final.jar;D:\apache-maven\MavenRepository\org\jboss\logging\jboss-logging\3.4.1.Final\jboss-logging-3.4.1.Final.jar;D:\apache-maven\MavenRepository\org\jboss\xnio\xnio-api\3.8.16.Final\xnio-api-3.8.16.Final.jar;D:\apache-maven\MavenRepository\org\wildfly\common\wildfly-common\1.5.4.Final\wildfly-common-1.5.4.Final.jar;D:\apache-maven\MavenRepository\org\wildfly\client\wildfly-client-config\1.0.1.Final\wildfly-client-config-1.0.1.Final.jar;D:\apache-maven\MavenRepository\org\jboss\xnio\xnio-nio\3.8.16.Final\xnio-nio-3.8.16.Final.jar;D:\apache-maven\MavenRepository\org\jboss\threads\jboss-threads\3.1.0.Final\jboss-threads-3.1.0.Final.jar;D:\apache-maven\MavenRepository\io\undertow\undertow-servlet\2.2.33.Final\undertow-servlet-2.2.33.Final.jar;D:\apache-maven\MavenRepository\javax\servlet\javax.servlet-api\4.0.1\javax.servlet-api-4.0.1.jar;D:\apache-maven\MavenRepository\com\jfinal\cos\2022.2\cos-2022.2.jar;D:\apache-maven\MavenRepository\cn\idev\excel\fastexcel\1.1.0\fastexcel-1.1.0.jar;D:\apache-maven\MavenRepository\cn\idev\excel\fastexcel-core\1.1.0\fastexcel-core-1.1.0.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-csv\1.11.0\commons-csv-1.11.0.jar;D:\apache-maven\MavenRepository\org\ehcache\ehcache\3.9.11\ehcache-3.9.11.jar;D:\apache-maven\MavenRepository\cn\idev\excel\fastexcel-support\0.0.1\fastexcel-support-0.0.1.jar;D:\apache-maven\MavenRepository\com\alibaba\dashscope-sdk-java\2.16.9\dashscope-sdk-java-2.16.9.jar;D:\apache-maven\MavenRepository\io\reactivex\rxjava2\rxjava\2.2.21\rxjava-2.2.21.jar;D:\apache-maven\MavenRepository\org\reactivestreams\reactive-streams\1.0.3\reactive-streams-1.0.3.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib-jdk8\1.8.21\kotlin-stdlib-jdk8-1.8.21.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib-jdk7\1.8.21\kotlin-stdlib-jdk7-1.8.21.jar;D:\apache-maven\MavenRepository\com\squareup\okio\okio\3.6.0\okio-3.6.0.jar;D:\apache-maven\MavenRepository\com\squareup\okhttp3\logging-interceptor\4.12.0\logging-interceptor-4.12.0.jar;D:\apache-maven\MavenRepository\com\squareup\okhttp3\okhttp-sse\4.12.0\okhttp-sse-4.12.0.jar;D:\apache-maven\MavenRepository\com\github\victools\jsonschema-generator\4.31.1\jsonschema-generator-4.31.1.jar;D:\apache-maven\MavenRepository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;D:\apache-maven\MavenRepository\com\squareup\okhttp3\okhttp\4.10.0\okhttp-4.10.0.jar;D:\apache-maven\MavenRepository\com\squareup\okio\okio-jvm\3.0.0\okio-jvm-3.0.0.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib-common\1.5.31\kotlin-stdlib-common-1.5.31.jar;D:\apache-maven\MavenRepository\org\jetbrains\kotlin\kotlin-stdlib\1.6.20\kotlin-stdlib-1.6.20.jar;D:\apache-maven\MavenRepository\org\jetbrains\annotations\13.0\annotations-13.0.jar;D:\apache-maven\MavenRepository\cn\smallbun\screw\screw-core\1.0.5\screw-core-1.0.5.jar;D:\apache-maven\MavenRepository\commons-lang\commons-lang\2.6\commons-lang-2.6.jar;D:\apache-maven\MavenRepository\org\freemarker\freemarker\2.3.30\freemarker-2.3.30.jar;D:\apache-maven\MavenRepository\mysql\mysql-connector-java\8.0.28\mysql-connector-java-8.0.28.jar;D:\apache-maven\MavenRepository\com\google\protobuf\protobuf-java\3.11.4\protobuf-java-3.11.4.jar;D:\apache-maven\MavenRepository\io\minio\minio\8.5.12\minio-8.5.12.jar;D:\apache-maven\MavenRepository\com\carrotsearch\thirdparty\simple-xml-safe\2.7.1\simple-xml-safe-2.7.1.jar;D:\apache-maven\MavenRepository\com\google\guava\guava\33.0.0-jre\guava-33.0.0-jre.jar;D:\apache-maven\MavenRepository\com\google\guava\failureaccess\1.0.2\failureaccess-1.0.2.jar;D:\apache-maven\MavenRepository\com\google\guava\listenablefuture\9999.0-empty-to-avoid-conflict-with-guava\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;D:\apache-maven\MavenRepository\com\google\code\findbugs\jsr305\3.0.2\jsr305-3.0.2.jar;D:\apache-maven\MavenRepository\org\checkerframework\checker-qual\3.41.0\checker-qual-3.41.0.jar;D:\apache-maven\MavenRepository\com\google\errorprone\error_prone_annotations\2.23.0\error_prone_annotations-2.23.0.jar;D:\apache-maven\MavenRepository\com\google\j2objc\j2objc-annotations\2.8\j2objc-annotations-2.8.jar;D:\apache-maven\MavenRepository\com\fasterxml\jackson\core\jackson-annotations\2.16.1\jackson-annotations-2.16.1.jar;D:\apache-maven\MavenRepository\org\bouncycastle\bcprov-jdk18on\1.78\bcprov-jdk18on-1.78.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-compress\1.26.0\commons-compress-1.26.0.jar;D:\apache-maven\MavenRepository\commons-codec\commons-codec\1.16.1\commons-codec-1.16.1.jar;D:\apache-maven\MavenRepository\org\xerial\snappy\snappy-java\1.1.10.5\snappy-java-1.1.10.5.jar;D:\apache-maven\MavenRepository\io\github\yedaxia\japidocs\1.4.4\japidocs-1.4.4.jar;D:\apache-maven\MavenRepository\com\github\javaparser\javaparser-core\3.6.16\javaparser-core-3.6.16.jar;D:\apache-maven\MavenRepository\javax\xml\bind\jaxb-api\2.3.1\jaxb-api-2.3.1.jar;D:\apache-maven\MavenRepository\javax\activation\javax.activation-api\1.2.0\javax.activation-api-1.2.0.jar;D:\apache-maven\MavenRepository\javax\activation\activation\1.1.1\activation-1.1.1.jar;D:\apache-maven\MavenRepository\org\glassfish\jaxb\jaxb-runtime\2.3.3\jaxb-runtime-2.3.3.jar;D:\apache-maven\MavenRepository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;D:\apache-maven\MavenRepository\org\glassfish\jaxb\txw2\2.3.3\txw2-2.3.3.jar;D:\apache-maven\MavenRepository\com\sun\istack\istack-commons-runtime\3.0.11\istack-commons-runtime-3.0.11.jar;D:\apache-maven\MavenRepository\com\sun\activation\jakarta.activation\1.2.2\jakarta.activation-1.2.2.jar;D:\apache-maven\MavenRepository\org\xerial\sqlite-jdbc\3.43.2.0\sqlite-jdbc-3.43.2.0.jar;D:\apache-maven\MavenRepository\org\slf4j\slf4j-api\2.0.16\slf4j-api-2.0.16.jar;D:\apache-maven\MavenRepository\net\sf\json-lib\json-lib\2.4\json-lib-2.4-jdk15.jar;D:\apache-maven\MavenRepository\commons-beanutils\commons-beanutils\1.8.0\commons-beanutils-1.8.0.jar;D:\apache-maven\MavenRepository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;D:\apache-maven\MavenRepository\net\sf\ezmorph\ezmorph\1.0.6\ezmorph-1.0.6.jar;D:\apache-maven\MavenRepository\commons-logging\commons-logging\1.2\commons-logging-1.2.jar;D:\apache-maven\MavenRepository\log4j\log4j\1.2.17\log4j-1.2.17.jar;D:\apache-maven\MavenRepository\org\slf4j\slf4j-log4j12\1.7.25\slf4j-log4j12-1.7.25.jar;D:\apache-maven\MavenRepository\ch\qos\logback\logback-classic\1.5.6\logback-classic-1.5.6.jar;D:\apache-maven\MavenRepository\ch\qos\logback\logback-core\1.5.6\logback-core-1.5.6.jar;D:\apache-maven\MavenRepository\cn\hutool\hutool-all\5.8.29\hutool-all-5.8.29.jar;D:\apache-maven\MavenRepository\com\alibaba\fastjson\2.0.52\fastjson-2.0.52.jar;D:\apache-maven\MavenRepository\com\alibaba\fastjson2\fastjson2-extension\2.0.52\fastjson2-extension-2.0.52.jar;D:\apache-maven\MavenRepository\com\alibaba\fastjson2\fastjson2\2.0.52\fastjson2-2.0.52.jar;D:\apache-maven\MavenRepository\org\jsoup\jsoup\1.17.2\jsoup-1.17.2.jar;D:\apache-maven\MavenRepository\com\google\code\gson\gson\2.10.1\gson-2.10.1.jar;D:\apache-maven\MavenRepository\commons-io\commons-io\2.14.0\commons-io-2.14.0.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-email\1.5\commons-email-1.5.jar;D:\apache-maven\MavenRepository\com\sun\mail\javax.mail\1.5.6\javax.mail-1.5.6.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar;D:\apache-maven\MavenRepository\org\dom4j\dom4j\2.1.4\dom4j-2.1.4.jar;D:\apache-maven\MavenRepository\jaxen\jaxen\1.1.6\jaxen-1.1.6.jar;D:\apache-maven\MavenRepository\redis\clients\jedis\5.1.0\jedis-5.1.0.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-pool2\2.12.0\commons-pool2-2.12.0.jar;D:\apache-maven\MavenRepository\org\json\json\20231013\json-20231013.jar;D:\apache-maven\MavenRepository\org\apache\httpcomponents\httpmime\4.5.14\httpmime-4.5.14.jar;D:\apache-maven\MavenRepository\org\apache\httpcomponents\httpclient\4.5.14\httpclient-4.5.14.jar;D:\apache-maven\MavenRepository\org\apache\httpcomponents\httpcore\4.4.16\httpcore-4.4.16.jar;D:\apache-maven\MavenRepository\org\apache\logging\log4j\log4j-core\2.20.0\log4j-core-2.20.0.jar;D:\apache-maven\MavenRepository\org\apache\logging\log4j\log4j-api\2.20.0\log4j-api-2.20.0.jar;D:\apache-maven\MavenRepository\com\fasterxml\jackson\core\jackson-core\2.17.2\jackson-core-2.17.2.jar;D:\apache-maven\MavenRepository\com\fasterxml\jackson\core\jackson-databind\2.17.2\jackson-databind-2.17.2.jar;D:\apache-maven\MavenRepository\com\github\mwiede\jsch\0.2.19\jsch-0.2.19.jar;D:\apache-maven\MavenRepository\com\zaxxer\HikariCP\5.1.0\HikariCP-5.1.0.jar;D:\apache-maven\MavenRepository\com\alibaba\druid\1.2.23\druid-1.2.23.jar;D:\apache-maven\MavenRepository\org\yaml\snakeyaml\2.3\snakeyaml-2.3.jar;D:\apache-maven\MavenRepository\io\jsonwebtoken\jjwt\0.7.0\jjwt-0.7.0.jar;D:\apache-maven\MavenRepository\com\zendesk\mysql-binlog-connector-java\0.30.1\mysql-binlog-connector-java-0.30.1.jar;D:\apache-maven\MavenRepository\com\github\luben\zstd-jni\1.5.0-2\zstd-jni-1.5.0-2.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi\5.2.5\poi-5.2.5.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;D:\apache-maven\MavenRepository\org\apache\commons\commons-math3\3.6.1\commons-math3-3.6.1.jar;D:\apache-maven\MavenRepository\com\zaxxer\SparseBitSet\1.3\SparseBitSet-1.3.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi-ooxml\5.2.5\poi-ooxml-5.2.5.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi-ooxml-lite\5.2.5\poi-ooxml-lite-5.2.5.jar;D:\apache-maven\MavenRepository\org\apache\xmlbeans\xmlbeans\5.2.0\xmlbeans-5.2.0.jar;D:\apache-maven\MavenRepository\com\github\virtuald\curvesapi\1.08\curvesapi-1.08.jar;D:\apache-maven\MavenRepository\org\apache\poi\poi-scratchpad\5.2.5\poi-scratchpad-5.2.5.jar com.dsideal.base.AI.AiGenerate
19:16:34,395 |-INFO in ch.qos.logback.classic.LoggerContext[default] - This is logback-classic version 1.5.6
19:16:34,397 |-INFO in ch.qos.logback.classic.util.ContextInitializer@3c3d9b6b - No custom configurators were discovered as a service.
19:16:34,397 |-INFO in ch.qos.logback.classic.util.ContextInitializer@3c3d9b6b - Trying to configure with ch.qos.logback.classic.joran.SerializedModelConfigurator
diff --git a/WebRoot/upload/文山州与楚雄州_教育分析报告_20250613_214454.html b/WebRoot/upload/文山州与楚雄州_教育分析报告_20250613_214454.html
new file mode 100644
index 00000000..f3931d0b
--- /dev/null
+++ b/WebRoot/upload/文山州与楚雄州_教育分析报告_20250613_214454.html
@@ -0,0 +1,509 @@
+
+
+
+
+
+ 文山州与楚雄州人口变化趋势对基础教育的影响分析报告
+
+
+
+
+
+
+
+
+ 1. 执行摘要
+
+
文山州和楚雄州作为云南省的两个重要州市,在教育资源配置方面呈现出不同的特点和发展趋势。文山州总人口持续下降,年均增长率为-0.93%,而楚雄州人口下降速度更快,年均下降约2.54万人。两州的城乡人口结构均呈现城镇人口缓慢增长、乡村人口显著减少的趋势。
+
在教育资源方面,两州的教职工和学校占地面积需求均呈下降趋势,但文山州的需求下降更为缓慢。两州均面临教职工区域性、结构性、学科性短缺的长期挑战。楚雄州在学前教育、小学、初中和高中的教职工和占地面积需求下降幅度更为明显。两州的在校生和招生人数均呈下降趋势,但文山州的下降幅度更大。
+
+
+
+
+ 2. 数据概览
+
+
+
+
+
两州人口变化趋势(2020-2035)
+
+
+
+
+
+
+
+
+
+ 指标 |
+ 文山州 |
+ 楚雄州 |
+
+
+
+
+ 2022-2035年均人口增长率 |
+ -0.93% |
+ -0.98% |
+
+
+ 2035年预计人口(万人) |
+ 303.5 |
+ 241.2 |
+
+
+ 城镇人口变化趋势 |
+ 缓慢增长 |
+ 先降后升 |
+
+
+ 乡村人口变化趋势 |
+ 显著减少 |
+ 显著减少 |
+
+
+
+
+
+
+ 3. 教育资源配置对比分析
+
+
+
+
基础教育教职工需求变化(2020-2035)
+
+
+
+
+
+
+
+ 教育资源占地面积需求变化(2020-2035)
+
+
+
+ 教育阶段 |
+ 文山州变化(万平方米) |
+ 楚雄州变化(万平方米) |
+
+
+
+
+ 学前教育 |
+ -5.2 |
+ -7.9 |
+
+
+ 小学 |
+ -12.4 |
+ -19.9 |
+
+
+ 初中 |
+ -8.7 |
+ -13.2 |
+
+
+ 高中 |
+ -15.3 |
+ -24.4 |
+
+
+
+
+ 详细对比分析
+ 教育资源配置水平对比:文山州教职工和占地面积需求下降缓慢,基本满足需求;楚雄州需求下降更为明显,但具体数值显示资源调整压力较大。
+ 发展趋势分析:两州均面临人口下降和城乡人口结构调整的挑战,文山州人口下降速度较慢,楚雄州下降速度更快且波动较大。
+ 优势与不足分析:文山州教育资源总量需求相对稳定,但区域性短缺问题突出;楚雄州资源调整幅度大,需重点关注乡村教育资源整合。
+
+
+
+ 4. 问题识别与建议
+
+ 主要问题
+
+ - 两州均存在教职工结构性短缺
+ - 乡村教育资源利用率下降
+ - 楚雄州人口下降速度过快导致资源调整压力大
+ - 文山州城镇教育资源面临扩容压力
+ - 城乡教育资源分布不均
+ - 学科教师结构性短缺
+ - 楚雄州高中教育资源需求下降显著
+
+
+
+
对策建议
+
文山州:
+
+ - 重点加强城镇教育资源建设,应对人口集中趋势
+ - 优化教职工结构,解决学科性短缺问题
+
+
+
楚雄州:
+
+ - 建立弹性资源调整机制,应对快速人口变化
+ - 重点整合乡村教育资源,提高利用效率
+
+
+
共同建议:
+
+ - 建立教师流动机制,解决结构性短缺
+ - 加强城乡教育资源统筹规划
+ - 建立资源动态监测系统
+
+
+
+
+
+ 5. 结论
+
+
总体来看,文山州教育资源需求相对稳定,但需加强结构性调整;楚雄州面临更大的资源调整压力。未来发展方向应聚焦:
+
+ - 优化城乡教育资源布局
+ - 提高资源使用效率
+ - 建立弹性调整机制
+ - 加强教师队伍建设
+
+
两州应根据各自人口变化特点,制定差异化的教育资源优化策略。
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebRoot/upload/文山州与楚雄州教育资源对比分析报告_20250613_214816.pptx b/WebRoot/upload/文山州与楚雄州教育资源对比分析报告_20250613_214816.pptx
new file mode 100644
index 00000000..999e0656
Binary files /dev/null and b/WebRoot/upload/文山州与楚雄州教育资源对比分析报告_20250613_214816.pptx differ
diff --git a/src/main/java/com/dsideal/base/Tools/AiGenerate.java b/src/main/java/com/dsideal/base/AI/AiGenerate.java
similarity index 92%
rename from src/main/java/com/dsideal/base/Tools/AiGenerate.java
rename to src/main/java/com/dsideal/base/AI/AiGenerate.java
index 8f3a7f51..30097d76 100644
--- a/src/main/java/com/dsideal/base/Tools/AiGenerate.java
+++ b/src/main/java/com/dsideal/base/AI/AiGenerate.java
@@ -1,11 +1,12 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.AI;
import com.dsideal.base.BaseApplication;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Plugin.YamlProp;
-import com.dsideal.base.Tools.Util.CallDeepSeek;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Tools.Util.PptAIKit;
+import com.dsideal.base.Tools.DataCollector;
+import com.dsideal.base.Util.CallDeepSeek;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.PptAIKit;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/src/main/java/com/dsideal/base/Tools/HtmlGenerator.java b/src/main/java/com/dsideal/base/AI/HtmlGenerator.java
similarity index 94%
rename from src/main/java/com/dsideal/base/Tools/HtmlGenerator.java
rename to src/main/java/com/dsideal/base/AI/HtmlGenerator.java
index 288eee4a..b1c05b56 100644
--- a/src/main/java/com/dsideal/base/Tools/HtmlGenerator.java
+++ b/src/main/java/com/dsideal/base/AI/HtmlGenerator.java
@@ -1,11 +1,9 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.AI;
-import com.dsideal.base.Tools.Util.CallDeepSeek;
+import com.dsideal.base.Util.CallDeepSeek;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
public class HtmlGenerator {
diff --git a/src/main/java/com/dsideal/base/Tools/PptGenerator.java b/src/main/java/com/dsideal/base/AI/PptGenerator.java
similarity index 97%
rename from src/main/java/com/dsideal/base/Tools/PptGenerator.java
rename to src/main/java/com/dsideal/base/AI/PptGenerator.java
index d93b6e24..4366e9c6 100644
--- a/src/main/java/com/dsideal/base/Tools/PptGenerator.java
+++ b/src/main/java/com/dsideal/base/AI/PptGenerator.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.AI;
import com.alibaba.fastjson.JSONObject;
import java.io.BufferedReader;
diff --git a/src/main/java/com/dsideal/base/Tools/WordGenerator.java b/src/main/java/com/dsideal/base/AI/WordGenerator.java
similarity index 96%
rename from src/main/java/com/dsideal/base/Tools/WordGenerator.java
rename to src/main/java/com/dsideal/base/AI/WordGenerator.java
index 02b0944d..311c1255 100644
--- a/src/main/java/com/dsideal/base/Tools/WordGenerator.java
+++ b/src/main/java/com/dsideal/base/AI/WordGenerator.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.AI;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
diff --git a/src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java
index 67da9c2b..0758f23a 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/Step1_DeleteBigScreen.java
@@ -1,6 +1,6 @@
package com.dsideal.base.DataEase.Util;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import static com.dsideal.base.DataEase.Util.Step3_CopyBigScreen.clearScreen;
diff --git a/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java b/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
index 40034a3b..7ac97d4f 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
@@ -1,11 +1,8 @@
package com.dsideal.base.DataEase.Util;
-import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Util.CommonUtil;
-import com.dsideal.base.Util.FileUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.Kv;
import com.jfinal.kit.PathKit;
import com.jfinal.plugin.activerecord.Db;
diff --git a/src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java b/src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java
index d13cbbf9..9a18deee 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java
+++ b/src/main/java/com/dsideal/base/DataEase/Util/Step3_CopyBigScreen.java
@@ -3,7 +3,7 @@ package com.dsideal.base.DataEase.Util;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.dsideal.base.Util.CommonUtil;
import com.dsideal.base.Util.FileUtil;
import com.jfinal.kit.PathKit;
diff --git a/src/main/java/com/dsideal/base/Test/ChangeCity.java b/src/main/java/com/dsideal/base/Test/ChangeCity.java
index e2f9fad5..9332f831 100644
--- a/src/main/java/com/dsideal/base/Test/ChangeCity.java
+++ b/src/main/java/com/dsideal/base/Test/ChangeCity.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Test;
import com.dsideal.base.BaseApplication;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Plugin.YamlProp;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
public class ChangeCity {
public static DataEaseModel dm = new DataEaseModel();
diff --git a/src/main/java/com/dsideal/base/Test/FixErrorFill.java b/src/main/java/com/dsideal/base/Test/FixErrorFill.java
index 48ec2337..b7957bef 100644
--- a/src/main/java/com/dsideal/base/Test/FixErrorFill.java
+++ b/src/main/java/com/dsideal/base/Test/FixErrorFill.java
@@ -1,6 +1,6 @@
package com.dsideal.base.Test;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
diff --git a/src/main/java/com/dsideal/base/Test/ReadWordTOC.java b/src/main/java/com/dsideal/base/Test/ReadWordTOC.java
index 2fb58bc3..510ef93f 100644
--- a/src/main/java/com/dsideal/base/Test/ReadWordTOC.java
+++ b/src/main/java/com/dsideal/base/Test/ReadWordTOC.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import static com.dsideal.base.Tools.FillData.DataEaseKit.DsKit.DocxUnzipDirectory;
diff --git a/src/main/java/com/dsideal/base/Test/ReadWordTOCWenZi.java b/src/main/java/com/dsideal/base/Test/ReadWordTOCWenZi.java
index 7650472f..7b1c7cc8 100644
--- a/src/main/java/com/dsideal/base/Test/ReadWordTOCWenZi.java
+++ b/src/main/java/com/dsideal/base/Test/ReadWordTOCWenZi.java
@@ -1,27 +1,11 @@
package com.dsideal.base.Test;
-import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.jfinal.kit.StrKit;
-import org.apache.commons.io.FileUtils;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import static com.dsideal.base.Tools.FillData.DataEaseKit.DsKit.DocxUnzipDirectory;
public class ReadWordTOCWenZi {
static String filePath = "D:\\dsWork\\YunNanDsBase\\Doc\\县区研究报告\\保山市\\昌宁县人口变化及其对教育的影响.docx";
diff --git a/src/main/java/com/dsideal/base/Tools/ChangeCityMap.java b/src/main/java/com/dsideal/base/Tools/ChangeCityMap.java
index c3b3abda..7d1bc81d 100644
--- a/src/main/java/com/dsideal/base/Tools/ChangeCityMap.java
+++ b/src/main/java/com/dsideal/base/Tools/ChangeCityMap.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.dsideal.base.BaseApplication;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Plugin.YamlProp;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
diff --git a/src/main/java/com/dsideal/base/Tools/DeleteNotUnique.java b/src/main/java/com/dsideal/base/Tools/DeleteNotUnique.java
index 177d937d..5a07c622 100644
--- a/src/main/java/com/dsideal/base/Tools/DeleteNotUnique.java
+++ b/src/main/java/com/dsideal/base/Tools/DeleteNotUnique.java
@@ -1,6 +1,5 @@
package com.dsideal.base.Tools;
-import java.sql.SQLOutput;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
@@ -8,7 +7,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.stream.Collectors;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Record;
import com.jfinal.plugin.activerecord.Db;
diff --git a/src/main/java/com/dsideal/base/Tools/ExportExcel.java b/src/main/java/com/dsideal/base/Tools/ExportExcel.java
index ffdcf64e..c04dc47a 100644
--- a/src/main/java/com/dsideal/base/Tools/ExportExcel.java
+++ b/src/main/java/com/dsideal/base/Tools/ExportExcel.java
@@ -1,6 +1,6 @@
package com.dsideal.base.Tools;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
import com.jfinal.plugin.activerecord.SqlPara;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
index 3e5e894e..fe163fd2 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
index 7e26e1f6..d5b5dd4e 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java
index dd3f0b7b..c73c62bc 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java
@@ -1,7 +1,7 @@
package com.dsideal.base.Tools.FillData.Area;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.SqlPara;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
index b4ae07ed..8dfa7d6d 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java
index 800cea29..173df939 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java
@@ -12,9 +12,8 @@ import com.alibaba.dashscope.exception.NoApiKeyException;
import com.alibaba.dashscope.utils.Constants;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
-import org.apache.commons.io.FileUtils;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -28,14 +27,10 @@ import org.dom4j.io.SAXReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
import static com.dsideal.base.Tools.FillData.DataEaseKit.DsKit.DocxUnzipDirectory;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java
index 7d335161..fbcad98f 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java
@@ -5,7 +5,7 @@ import com.alibaba.dashscope.exception.InputRequiredException;
import com.alibaba.dashscope.exception.NoApiKeyException;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
index c692104a..958cb642 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
index f18642ae..44a91792 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
index 1a86a766..f1ed2a0a 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
index 2e1a3cb7..1b9212f8 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
index 13b3872d..d227ff27 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
index a8b3e671..6e11d64b 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
index 02c3aaa1..35c777e9 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
index be6e4869..8618f47c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.Area;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
index b8922815..a99774ea 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
index 5466dbc5..73b74ed5 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
index 396cf4e1..e3843cfb 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
index 8c744673..613850c9 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
index 398e4f31..6874611e 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import lombok.Getter;
import lombok.Setter;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
index e0bbb6ef..d0e37b51 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import lombok.Getter;
import lombok.Setter;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
index 56f7a6db..55f2825d 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
index c047f24b..8bd98c62 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
index 93363c1c..31803dd3 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
index fb1ceef8..d3dd635c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
index ef655b54..b348a767 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A1.java
index 4d4100f8..9d46eecf 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A1.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A10.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A10.java
index f627a097..8096fa34 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A10.java
@@ -3,8 +3,7 @@ package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.jfinal.kit.StrKit;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A11.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A11.java
index f470221a..1d34286f 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A11.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A11.java
@@ -1,7 +1,7 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
import com.jfinal.plugin.activerecord.SqlPara;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A12.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A12.java
index 2b1989d4..b66f7815 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A12.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A12.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A13.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A13.java
index 55e97c50..77e0ea4a 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A13.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A13.java
@@ -12,7 +12,7 @@ import com.alibaba.dashscope.exception.NoApiKeyException;
import com.alibaba.dashscope.utils.Constants;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A15.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A15.java
index af6afdc3..51f95a6f 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A15.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A15.java
@@ -3,9 +3,8 @@ package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
import com.alibaba.dashscope.exception.InputRequiredException;
import com.alibaba.dashscope.exception.NoApiKeyException;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A2.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A2.java
index 20aa749d..2a01c93c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A2.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A2.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A3.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A3.java
index ffc8a40d..b30362db 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A3.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A4.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A4.java
index f5c9aa81..c222fc6d 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A4.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A4.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A5.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A5.java
index 3d946fe7..14c06525 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A5.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A5.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A6.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A6.java
index e995f375..7feec22e 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A6.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A6.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A7.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A7.java
index d748926f..eb7dd803 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A7.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A8.java
index a332e6be..9468f482 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A8.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A9.java b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A9.java
index a5d609fd..bd7887ab 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/KaiFaArea/A9.java
@@ -1,9 +1,8 @@
package com.dsideal.base.Tools.FillData.KaiFaArea;
import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java b/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java
index 3be54839..eeec42b4 100644
--- a/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java
+++ b/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java
@@ -1,14 +1,11 @@
package com.dsideal.base.Tools;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.dsideal.base.Util.CommonUtil;
import com.dsideal.base.Util.PkUtil;
-import com.dsideal.base.Plugin.YamlProp;
import com.jfinal.kit.Prop;
-import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.hikaricp.HikariCpPlugin;
import com.jfinal.plugin.redis.RedisPlugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountConfig.java b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountConfig.java
index cf5b2199..d0b58138 100644
--- a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountConfig.java
+++ b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountConfig.java
@@ -5,7 +5,7 @@ import cn.idev.excel.FastExcel;
import cn.idev.excel.read.builder.ExcelReaderBuilder;
import cn.idev.excel.read.metadata.ReadSheet;
import com.dsideal.base.Tools.JkyNewData.Util.CloseLogUtil;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
diff --git a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
index 00dbb44f..e90bc059 100644
--- a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
+++ b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
@@ -1,17 +1,13 @@
package com.dsideal.base.Tools.JkyNewData;
import cn.idev.excel.*;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileReader;
import com.dsideal.base.Tools.JkyNewData.Util.CloseLogUtil;
import com.dsideal.base.Tools.JkyNewData.Util.ColumnConfig;
import com.dsideal.base.Tools.JkyNewData.Util.ExcelUtil;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
diff --git a/src/main/java/com/dsideal/base/Tools/Step1_DataSetInit.java b/src/main/java/com/dsideal/base/Tools/Step1_DataSetInit.java
index e93259d2..d091f0ab 100644
--- a/src/main/java/com/dsideal/base/Tools/Step1_DataSetInit.java
+++ b/src/main/java/com/dsideal/base/Tools/Step1_DataSetInit.java
@@ -1,7 +1,7 @@
package com.dsideal.base.Tools;
import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import java.io.IOException;
diff --git a/src/main/java/com/dsideal/base/Tools/Step2_DataSetAddXzqh.java b/src/main/java/com/dsideal/base/Tools/Step2_DataSetAddXzqh.java
index 8caf9b3c..e05a7fb4 100644
--- a/src/main/java/com/dsideal/base/Tools/Step2_DataSetAddXzqh.java
+++ b/src/main/java/com/dsideal/base/Tools/Step2_DataSetAddXzqh.java
@@ -1,7 +1,7 @@
package com.dsideal.base.Tools;
import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jcraft.jsch.JSchException;
import com.jfinal.plugin.activerecord.Record;
diff --git a/src/main/java/com/dsideal/base/Tools/Test/A12.java b/src/main/java/com/dsideal/base/Tools/Test/A12.java
index 6426169f..05b608b9 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/A12.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/A12.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.Test;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/Test/A8.java b/src/main/java/com/dsideal/base/Tools/Test/A8.java
index e40223f1..1158d1e6 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/A8.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/A8.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.Test;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/Test/A9.java b/src/main/java/com/dsideal/base/Tools/Test/A9.java
index 0905948f..98ba9dad 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/A9.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Tools.Test;
import cn.hutool.core.io.FileUtil;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.jfinal.kit.StrKit;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Row;
diff --git a/src/main/java/com/dsideal/base/Tools/Test/C11.java b/src/main/java/com/dsideal/base/Tools/Test/C11.java
index 9252337c..37d04f74 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/C11.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/C11.java
@@ -1,7 +1,7 @@
package com.dsideal.base.Tools.Test;
import com.dsideal.base.Tools.FillData.DataEaseKit.DsKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.dom4j.DocumentException;
diff --git a/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java b/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java
index 50a3811e..9728d71f 100644
--- a/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java
+++ b/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiaoFillData.java
@@ -1,6 +1,6 @@
package com.dsideal.base.Tools.YunXiao;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
public class YunXiaoFillData {
public static void main(String[] args) {
diff --git a/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiao_DataSetInit.java b/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiao_DataSetInit.java
index 025e3838..f746c272 100644
--- a/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiao_DataSetInit.java
+++ b/src/main/java/com/dsideal/base/Tools/YunXiao/YunXiao_DataSetInit.java
@@ -1,6 +1,6 @@
package com.dsideal.base.Tools.YunXiao;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Util.LocalMysqlConnectUtil;
import com.dsideal.base.YunXiao.Model.YunXiaoModel;
import java.io.IOException;
diff --git a/src/main/java/com/dsideal/base/Tools/Util/CallDeepSeek.java b/src/main/java/com/dsideal/base/Util/CallDeepSeek.java
similarity index 96%
rename from src/main/java/com/dsideal/base/Tools/Util/CallDeepSeek.java
rename to src/main/java/com/dsideal/base/Util/CallDeepSeek.java
index 66a956fb..e442e230 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/CallDeepSeek.java
+++ b/src/main/java/com/dsideal/base/Util/CallDeepSeek.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools.Util;
+package com.dsideal.base.Util;
import cn.hutool.core.io.FileUtil;
import cn.hutool.json.JSONObject;
diff --git a/src/main/java/com/dsideal/base/Tools/Util/HttpUtils.java b/src/main/java/com/dsideal/base/Util/HttpUtils.java
similarity index 99%
rename from src/main/java/com/dsideal/base/Tools/Util/HttpUtils.java
rename to src/main/java/com/dsideal/base/Util/HttpUtils.java
index a162eeea..038ffaae 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/HttpUtils.java
+++ b/src/main/java/com/dsideal/base/Util/HttpUtils.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools.Util;
+package com.dsideal.base.Util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
diff --git a/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java b/src/main/java/com/dsideal/base/Util/LocalMysqlConnectUtil.java
similarity index 93%
rename from src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java
rename to src/main/java/com/dsideal/base/Util/LocalMysqlConnectUtil.java
index 00c08771..de2a6b00 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java
+++ b/src/main/java/com/dsideal/base/Util/LocalMysqlConnectUtil.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools.Util;
+package com.dsideal.base.Util;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Plugin.YamlProp;
@@ -7,7 +7,6 @@ import com.jfinal.kit.Prop;
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
import com.jfinal.plugin.druid.DruidPlugin;
-import com.jfinal.plugin.hikaricp.HikariCpPlugin;
import java.io.File;
diff --git a/src/main/java/com/dsideal/base/Tools/Util/PptAIKit.java b/src/main/java/com/dsideal/base/Util/PptAIKit.java
similarity index 99%
rename from src/main/java/com/dsideal/base/Tools/Util/PptAIKit.java
rename to src/main/java/com/dsideal/base/Util/PptAIKit.java
index 5b2ce019..64e8e120 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/PptAIKit.java
+++ b/src/main/java/com/dsideal/base/Util/PptAIKit.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools.Util;
+package com.dsideal.base.Util;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
diff --git a/src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java b/src/main/java/com/dsideal/base/Util/SshMysqlConnectUtil.java
similarity index 94%
rename from src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java
rename to src/main/java/com/dsideal/base/Util/SshMysqlConnectUtil.java
index f4b3b474..29032946 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java
+++ b/src/main/java/com/dsideal/base/Util/SshMysqlConnectUtil.java
@@ -1,8 +1,7 @@
-package com.dsideal.base.Tools.Util;
+package com.dsideal.base.Util;
import com.dsideal.base.DataEase.Model.DataEaseModel;
import com.dsideal.base.Tools.Step1_DataSetInit;
-import com.dsideal.base.Util.SSHConnector;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;