diff --git a/.gitignore b/.gitignore index 74c76d12..e0e4d0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,12 @@ -/.idea/ *.log *.class -/ds-base/target/ -/ds-base/lib/ -/ds-build/target/ -/ds-build/lib/ -/ds-base/.idea/ -/ds-build/.idea/ -/备份/ +/dsBase/target/ +/dsBase/lib/ +/dsBuild/target/ +/dsBuild/lib/ +/dsRes/target/ +/dsRes/lib/ +/dsGw/target/ +/dsGw/lib/ +/.idea/ + diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index a7cdac76..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index b31d502c..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 7de6a403..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index abd73389..00000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 6a1411f7..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 6d50cd4d..00000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index f245aa7c..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ds-base/dsBase.iml b/ds-base/dsBase.iml deleted file mode 100644 index 69dd4625..00000000 --- a/ds-base/dsBase.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/dsBase/.idea/.gitignore b/dsBase/.idea/.gitignore deleted file mode 100644 index a7cdac76..00000000 --- a/dsBase/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/dsBase/.idea/compiler.xml b/dsBase/.idea/compiler.xml deleted file mode 100644 index 85d41958..00000000 --- a/dsBase/.idea/compiler.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dsBase/.idea/encodings.xml b/dsBase/.idea/encodings.xml deleted file mode 100644 index 5e37df20..00000000 --- a/dsBase/.idea/encodings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/dsBase/.idea/jarRepositories.xml b/dsBase/.idea/jarRepositories.xml deleted file mode 100644 index 42a3207f..00000000 --- a/dsBase/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/dsBase/.idea/misc.xml b/dsBase/.idea/misc.xml deleted file mode 100644 index 4f362949..00000000 --- a/dsBase/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/dsBase/.idea/modules.xml b/dsBase/.idea/modules.xml deleted file mode 100644 index a3fb1726..00000000 --- a/dsBase/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/dsBase/.idea/vcs.xml b/dsBase/.idea/vcs.xml deleted file mode 100644 index 2e3f6920..00000000 --- a/dsBase/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/dsBase/Dockerfile b/dsBase/Dockerfile index c54e50c2..72152675 100644 --- a/dsBase/Dockerfile +++ b/dsBase/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 +FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:21 # WORKDIR指令用于设置容器内部的工作目录,即后续指令执行时的当前目录。当Docker容器启动并执行命令时,这些命令将在WORKDIR指定的目录中执行。 WORKDIR /root @@ -6,6 +6,9 @@ WORKDIR /root # ENV TZ这样的用法通常是用来设置时区环境变量,TZ代表Time Zone ENV TZ=Asia/Shanghai +# 让容器内部正常显示中文 +ENV LANG C.UTF-8 + # 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下 COPY ./lib /root/lib COPY ./target /root/target diff --git a/dsBase/lib/HikariCP-5.1.0.jar b/dsBase/lib/HikariCP-5.1.0.jar deleted file mode 100644 index 0aa1c9fb..00000000 Binary files a/dsBase/lib/HikariCP-5.1.0.jar and /dev/null differ diff --git a/dsBase/lib/SparseBitSet-1.3.jar b/dsBase/lib/SparseBitSet-1.3.jar deleted file mode 100644 index 5a435441..00000000 Binary files a/dsBase/lib/SparseBitSet-1.3.jar and /dev/null differ diff --git a/dsBase/lib/activation-1.1.1.jar b/dsBase/lib/activation-1.1.1.jar deleted file mode 100644 index 1b703ab2..00000000 Binary files a/dsBase/lib/activation-1.1.1.jar and /dev/null differ diff --git a/dsBase/lib/annotations-13.0.jar b/dsBase/lib/annotations-13.0.jar deleted file mode 100644 index fb794be9..00000000 Binary files a/dsBase/lib/annotations-13.0.jar and /dev/null differ diff --git a/dsBase/lib/bcprov-jdk18on-1.78.jar b/dsBase/lib/bcprov-jdk18on-1.78.jar deleted file mode 100644 index 1be0846a..00000000 Binary files a/dsBase/lib/bcprov-jdk18on-1.78.jar and /dev/null differ diff --git a/dsBase/lib/checker-qual-3.41.0.jar b/dsBase/lib/checker-qual-3.41.0.jar deleted file mode 100644 index 17a85a13..00000000 Binary files a/dsBase/lib/checker-qual-3.41.0.jar and /dev/null differ diff --git a/dsBase/lib/commons-beanutils-1.8.0.jar b/dsBase/lib/commons-beanutils-1.8.0.jar deleted file mode 100644 index caf7ae33..00000000 Binary files a/dsBase/lib/commons-beanutils-1.8.0.jar and /dev/null differ diff --git a/dsBase/lib/commons-codec-1.16.1.jar b/dsBase/lib/commons-codec-1.16.1.jar deleted file mode 100644 index f8966497..00000000 Binary files a/dsBase/lib/commons-codec-1.16.1.jar and /dev/null differ diff --git a/dsBase/lib/commons-collections-3.2.1.jar b/dsBase/lib/commons-collections-3.2.1.jar deleted file mode 100644 index c35fa1fe..00000000 Binary files a/dsBase/lib/commons-collections-3.2.1.jar and /dev/null differ diff --git a/dsBase/lib/commons-collections4-4.4.jar b/dsBase/lib/commons-collections4-4.4.jar deleted file mode 100644 index da06c3e4..00000000 Binary files a/dsBase/lib/commons-collections4-4.4.jar and /dev/null differ diff --git a/dsBase/lib/commons-compress-1.26.0.jar b/dsBase/lib/commons-compress-1.26.0.jar deleted file mode 100644 index 10f1e2b4..00000000 Binary files a/dsBase/lib/commons-compress-1.26.0.jar and /dev/null differ diff --git a/dsBase/lib/commons-email-1.5.jar b/dsBase/lib/commons-email-1.5.jar deleted file mode 100644 index 291bd194..00000000 Binary files a/dsBase/lib/commons-email-1.5.jar and /dev/null differ diff --git a/dsBase/lib/commons-io-2.14.0.jar b/dsBase/lib/commons-io-2.14.0.jar deleted file mode 100644 index 4273f322..00000000 Binary files a/dsBase/lib/commons-io-2.14.0.jar and /dev/null differ diff --git a/dsBase/lib/commons-lang-2.6.jar b/dsBase/lib/commons-lang-2.6.jar deleted file mode 100644 index 98467d3a..00000000 Binary files a/dsBase/lib/commons-lang-2.6.jar and /dev/null differ diff --git a/dsBase/lib/commons-lang3-3.12.0.jar b/dsBase/lib/commons-lang3-3.12.0.jar deleted file mode 100644 index 4d434a2a..00000000 Binary files a/dsBase/lib/commons-lang3-3.12.0.jar and /dev/null differ diff --git a/dsBase/lib/commons-logging-1.2.jar b/dsBase/lib/commons-logging-1.2.jar deleted file mode 100644 index 93a3b9f6..00000000 Binary files a/dsBase/lib/commons-logging-1.2.jar and /dev/null differ diff --git a/dsBase/lib/commons-math3-3.6.1.jar b/dsBase/lib/commons-math3-3.6.1.jar deleted file mode 100644 index 0ff582cf..00000000 Binary files a/dsBase/lib/commons-math3-3.6.1.jar and /dev/null differ diff --git a/dsBase/lib/commons-pool2-2.12.0.jar b/dsBase/lib/commons-pool2-2.12.0.jar deleted file mode 100644 index 269c5b0b..00000000 Binary files a/dsBase/lib/commons-pool2-2.12.0.jar and /dev/null differ diff --git a/dsBase/lib/cos-2022.2.jar b/dsBase/lib/cos-2022.2.jar deleted file mode 100644 index b1523f46..00000000 Binary files a/dsBase/lib/cos-2022.2.jar and /dev/null differ diff --git a/dsBase/lib/curvesapi-1.08.jar b/dsBase/lib/curvesapi-1.08.jar deleted file mode 100644 index 18fb71b1..00000000 Binary files a/dsBase/lib/curvesapi-1.08.jar and /dev/null differ diff --git a/dsBase/lib/dom4j-2.1.4.jar b/dsBase/lib/dom4j-2.1.4.jar deleted file mode 100644 index 0769bed9..00000000 Binary files a/dsBase/lib/dom4j-2.1.4.jar and /dev/null differ diff --git a/dsBase/lib/error_prone_annotations-2.23.0.jar b/dsBase/lib/error_prone_annotations-2.23.0.jar deleted file mode 100644 index c0f20d8a..00000000 Binary files a/dsBase/lib/error_prone_annotations-2.23.0.jar and /dev/null differ diff --git a/dsBase/lib/ezmorph-1.0.6.jar b/dsBase/lib/ezmorph-1.0.6.jar deleted file mode 100644 index 30fad12d..00000000 Binary files a/dsBase/lib/ezmorph-1.0.6.jar and /dev/null differ diff --git a/dsBase/lib/failureaccess-1.0.2.jar b/dsBase/lib/failureaccess-1.0.2.jar deleted file mode 100644 index d73ab80b..00000000 Binary files a/dsBase/lib/failureaccess-1.0.2.jar and /dev/null differ diff --git a/dsBase/lib/fastjson-2.0.52.jar b/dsBase/lib/fastjson-2.0.52.jar deleted file mode 100644 index 35a110fb..00000000 Binary files a/dsBase/lib/fastjson-2.0.52.jar and /dev/null differ diff --git a/dsBase/lib/fastjson2-2.0.52.jar b/dsBase/lib/fastjson2-2.0.52.jar deleted file mode 100644 index 40386575..00000000 Binary files a/dsBase/lib/fastjson2-2.0.52.jar and /dev/null differ diff --git a/dsBase/lib/fastjson2-extension-2.0.52.jar b/dsBase/lib/fastjson2-extension-2.0.52.jar deleted file mode 100644 index a44ea9a4..00000000 Binary files a/dsBase/lib/fastjson2-extension-2.0.52.jar and /dev/null differ diff --git a/dsBase/lib/freemarker-2.3.30.jar b/dsBase/lib/freemarker-2.3.30.jar deleted file mode 100644 index 222d14ff..00000000 Binary files a/dsBase/lib/freemarker-2.3.30.jar and /dev/null differ diff --git a/dsBase/lib/gson-2.10.1.jar b/dsBase/lib/gson-2.10.1.jar deleted file mode 100644 index a88c5bd9..00000000 Binary files a/dsBase/lib/gson-2.10.1.jar and /dev/null differ diff --git a/dsBase/lib/guava-33.0.0-jre.jar b/dsBase/lib/guava-33.0.0-jre.jar deleted file mode 100644 index e42ef633..00000000 Binary files a/dsBase/lib/guava-33.0.0-jre.jar and /dev/null differ diff --git a/dsBase/lib/httpclient-4.5.14.jar b/dsBase/lib/httpclient-4.5.14.jar deleted file mode 100644 index 2bb7c073..00000000 Binary files a/dsBase/lib/httpclient-4.5.14.jar and /dev/null differ diff --git a/dsBase/lib/httpcore-4.4.16.jar b/dsBase/lib/httpcore-4.4.16.jar deleted file mode 100644 index f0bdebeb..00000000 Binary files a/dsBase/lib/httpcore-4.4.16.jar and /dev/null differ diff --git a/dsBase/lib/httpmime-4.5.14.jar b/dsBase/lib/httpmime-4.5.14.jar deleted file mode 100644 index 331e95cf..00000000 Binary files a/dsBase/lib/httpmime-4.5.14.jar and /dev/null differ diff --git a/dsBase/lib/hutool-all-5.8.29.jar b/dsBase/lib/hutool-all-5.8.29.jar deleted file mode 100644 index 13e345b8..00000000 Binary files a/dsBase/lib/hutool-all-5.8.29.jar and /dev/null differ diff --git a/dsBase/lib/j2objc-annotations-2.8.jar b/dsBase/lib/j2objc-annotations-2.8.jar deleted file mode 100644 index 3595c4f9..00000000 Binary files a/dsBase/lib/j2objc-annotations-2.8.jar and /dev/null differ diff --git a/dsBase/lib/jackson-annotations-2.16.1.jar b/dsBase/lib/jackson-annotations-2.16.1.jar deleted file mode 100644 index b9c48e69..00000000 Binary files a/dsBase/lib/jackson-annotations-2.16.1.jar and /dev/null differ diff --git a/dsBase/lib/jackson-core-2.17.2.jar b/dsBase/lib/jackson-core-2.17.2.jar deleted file mode 100644 index 34be9026..00000000 Binary files a/dsBase/lib/jackson-core-2.17.2.jar and /dev/null differ diff --git a/dsBase/lib/jackson-databind-2.17.2.jar b/dsBase/lib/jackson-databind-2.17.2.jar deleted file mode 100644 index 3750b8c1..00000000 Binary files a/dsBase/lib/jackson-databind-2.17.2.jar and /dev/null differ diff --git a/dsBase/lib/javax.mail-1.5.6.jar b/dsBase/lib/javax.mail-1.5.6.jar deleted file mode 100644 index b10788ec..00000000 Binary files a/dsBase/lib/javax.mail-1.5.6.jar and /dev/null differ diff --git a/dsBase/lib/javax.servlet-api-4.0.1.jar b/dsBase/lib/javax.servlet-api-4.0.1.jar deleted file mode 100644 index 844ec7f1..00000000 Binary files a/dsBase/lib/javax.servlet-api-4.0.1.jar and /dev/null differ diff --git a/dsBase/lib/jaxb-api-2.3.0.jar b/dsBase/lib/jaxb-api-2.3.0.jar deleted file mode 100644 index 0817c083..00000000 Binary files a/dsBase/lib/jaxb-api-2.3.0.jar and /dev/null differ diff --git a/dsBase/lib/jaxb-core-2.3.0.jar b/dsBase/lib/jaxb-core-2.3.0.jar deleted file mode 100644 index 864ba311..00000000 Binary files a/dsBase/lib/jaxb-core-2.3.0.jar and /dev/null differ diff --git a/dsBase/lib/jaxb-impl-2.3.0.jar b/dsBase/lib/jaxb-impl-2.3.0.jar deleted file mode 100644 index 02f50ab5..00000000 Binary files a/dsBase/lib/jaxb-impl-2.3.0.jar and /dev/null differ diff --git a/dsBase/lib/jboss-logging-3.4.1.Final.jar b/dsBase/lib/jboss-logging-3.4.1.Final.jar deleted file mode 100644 index 42cd1e0a..00000000 Binary files a/dsBase/lib/jboss-logging-3.4.1.Final.jar and /dev/null differ diff --git a/dsBase/lib/jboss-threads-3.1.0.Final.jar b/dsBase/lib/jboss-threads-3.1.0.Final.jar deleted file mode 100644 index b23b4583..00000000 Binary files a/dsBase/lib/jboss-threads-3.1.0.Final.jar and /dev/null differ diff --git a/dsBase/lib/jedis-5.1.0.jar b/dsBase/lib/jedis-5.1.0.jar deleted file mode 100644 index 0e1f0424..00000000 Binary files a/dsBase/lib/jedis-5.1.0.jar and /dev/null differ diff --git a/dsBase/lib/jfinal-5.2.1.jar b/dsBase/lib/jfinal-5.2.1.jar deleted file mode 100644 index 9323f61d..00000000 Binary files a/dsBase/lib/jfinal-5.2.1.jar and /dev/null differ diff --git a/dsBase/lib/jfinal-undertow-3.6.jar b/dsBase/lib/jfinal-undertow-3.6.jar deleted file mode 100644 index 4d0c4a7a..00000000 Binary files a/dsBase/lib/jfinal-undertow-3.6.jar and /dev/null differ diff --git a/dsBase/lib/jjwt-0.7.0.jar b/dsBase/lib/jjwt-0.7.0.jar deleted file mode 100644 index 5a5c3fa6..00000000 Binary files a/dsBase/lib/jjwt-0.7.0.jar and /dev/null differ diff --git a/dsBase/lib/jsch-0.2.19.jar b/dsBase/lib/jsch-0.2.19.jar deleted file mode 100644 index 9a4e581f..00000000 Binary files a/dsBase/lib/jsch-0.2.19.jar and /dev/null differ diff --git a/dsBase/lib/json-20231013.jar b/dsBase/lib/json-20231013.jar deleted file mode 100644 index 465ad350..00000000 Binary files a/dsBase/lib/json-20231013.jar and /dev/null differ diff --git a/dsBase/lib/json-lib-2.4-jdk15.jar b/dsBase/lib/json-lib-2.4-jdk15.jar deleted file mode 100644 index 68d4f3b0..00000000 Binary files a/dsBase/lib/json-lib-2.4-jdk15.jar and /dev/null differ diff --git a/dsBase/lib/jsoup-1.17.2.jar b/dsBase/lib/jsoup-1.17.2.jar deleted file mode 100644 index 52ae16d8..00000000 Binary files a/dsBase/lib/jsoup-1.17.2.jar and /dev/null differ diff --git a/dsBase/lib/jsr305-3.0.2.jar b/dsBase/lib/jsr305-3.0.2.jar deleted file mode 100644 index 59222d9c..00000000 Binary files a/dsBase/lib/jsr305-3.0.2.jar and /dev/null differ diff --git a/dsBase/lib/kotlin-stdlib-1.8.21.jar b/dsBase/lib/kotlin-stdlib-1.8.21.jar deleted file mode 100644 index 18359808..00000000 Binary files a/dsBase/lib/kotlin-stdlib-1.8.21.jar and /dev/null differ diff --git a/dsBase/lib/kotlin-stdlib-common-1.9.10.jar b/dsBase/lib/kotlin-stdlib-common-1.9.10.jar deleted file mode 100644 index b48d773e..00000000 Binary files a/dsBase/lib/kotlin-stdlib-common-1.9.10.jar and /dev/null differ diff --git a/dsBase/lib/kotlin-stdlib-jdk7-1.8.21.jar b/dsBase/lib/kotlin-stdlib-jdk7-1.8.21.jar deleted file mode 100644 index b86ecd51..00000000 Binary files a/dsBase/lib/kotlin-stdlib-jdk7-1.8.21.jar and /dev/null differ diff --git a/dsBase/lib/kotlin-stdlib-jdk8-1.8.21.jar b/dsBase/lib/kotlin-stdlib-jdk8-1.8.21.jar deleted file mode 100644 index 72acadb8..00000000 Binary files a/dsBase/lib/kotlin-stdlib-jdk8-1.8.21.jar and /dev/null differ diff --git a/dsBase/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/dsBase/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar deleted file mode 100644 index 45832c05..00000000 Binary files a/dsBase/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar and /dev/null differ diff --git a/dsBase/lib/log4j-api-2.20.0.jar b/dsBase/lib/log4j-api-2.20.0.jar deleted file mode 100644 index 29d1b52a..00000000 Binary files a/dsBase/lib/log4j-api-2.20.0.jar and /dev/null differ diff --git a/dsBase/lib/log4j-core-2.20.0.jar b/dsBase/lib/log4j-core-2.20.0.jar deleted file mode 100644 index 54dafcd0..00000000 Binary files a/dsBase/lib/log4j-core-2.20.0.jar and /dev/null differ diff --git a/dsBase/lib/logback-classic-1.5.6.jar b/dsBase/lib/logback-classic-1.5.6.jar deleted file mode 100644 index 7ac4c1b8..00000000 Binary files a/dsBase/lib/logback-classic-1.5.6.jar and /dev/null differ diff --git a/dsBase/lib/logback-core-1.5.6.jar b/dsBase/lib/logback-core-1.5.6.jar deleted file mode 100644 index 9c75e363..00000000 Binary files a/dsBase/lib/logback-core-1.5.6.jar and /dev/null differ diff --git a/dsBase/lib/lombok-1.18.34.jar b/dsBase/lib/lombok-1.18.34.jar deleted file mode 100644 index ea0ba78a..00000000 Binary files a/dsBase/lib/lombok-1.18.34.jar and /dev/null differ diff --git a/dsBase/lib/minio-8.5.12.jar b/dsBase/lib/minio-8.5.12.jar deleted file mode 100644 index c3282db6..00000000 Binary files a/dsBase/lib/minio-8.5.12.jar and /dev/null differ diff --git a/dsBase/lib/mysql-connector-java-8.0.28.jar b/dsBase/lib/mysql-connector-java-8.0.28.jar deleted file mode 100644 index ac8904ee..00000000 Binary files a/dsBase/lib/mysql-connector-java-8.0.28.jar and /dev/null differ diff --git a/dsBase/lib/okhttp-4.12.0.jar b/dsBase/lib/okhttp-4.12.0.jar deleted file mode 100644 index faf3fa86..00000000 Binary files a/dsBase/lib/okhttp-4.12.0.jar and /dev/null differ diff --git a/dsBase/lib/okio-3.6.0.jar b/dsBase/lib/okio-3.6.0.jar deleted file mode 100644 index f3137562..00000000 Binary files a/dsBase/lib/okio-3.6.0.jar and /dev/null differ diff --git a/dsBase/lib/okio-jvm-3.6.0.jar b/dsBase/lib/okio-jvm-3.6.0.jar deleted file mode 100644 index ec8ad90f..00000000 Binary files a/dsBase/lib/okio-jvm-3.6.0.jar and /dev/null differ diff --git a/dsBase/lib/poi-5.2.5.jar b/dsBase/lib/poi-5.2.5.jar deleted file mode 100644 index 62e20d79..00000000 Binary files a/dsBase/lib/poi-5.2.5.jar and /dev/null differ diff --git a/dsBase/lib/poi-ooxml-5.2.5.jar b/dsBase/lib/poi-ooxml-5.2.5.jar deleted file mode 100644 index d671a8c7..00000000 Binary files a/dsBase/lib/poi-ooxml-5.2.5.jar and /dev/null differ diff --git a/dsBase/lib/poi-ooxml-lite-5.2.5.jar b/dsBase/lib/poi-ooxml-lite-5.2.5.jar deleted file mode 100644 index 15069275..00000000 Binary files a/dsBase/lib/poi-ooxml-lite-5.2.5.jar and /dev/null differ diff --git a/dsBase/lib/protobuf-java-3.11.4.jar b/dsBase/lib/protobuf-java-3.11.4.jar deleted file mode 100644 index 7224d23d..00000000 Binary files a/dsBase/lib/protobuf-java-3.11.4.jar and /dev/null differ diff --git a/dsBase/lib/screw-core-1.0.5.jar b/dsBase/lib/screw-core-1.0.5.jar deleted file mode 100644 index c81e6c03..00000000 Binary files a/dsBase/lib/screw-core-1.0.5.jar and /dev/null differ diff --git a/dsBase/lib/simple-xml-safe-2.7.1.jar b/dsBase/lib/simple-xml-safe-2.7.1.jar deleted file mode 100644 index d4ce9f11..00000000 Binary files a/dsBase/lib/simple-xml-safe-2.7.1.jar and /dev/null differ diff --git a/dsBase/lib/slf4j-api-1.7.30.jar b/dsBase/lib/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb..00000000 Binary files a/dsBase/lib/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/dsBase/lib/slf4j-simple-1.7.36.jar b/dsBase/lib/slf4j-simple-1.7.36.jar deleted file mode 100644 index ef831a8a..00000000 Binary files a/dsBase/lib/slf4j-simple-1.7.36.jar and /dev/null differ diff --git a/dsBase/lib/snakeyaml-2.3.jar b/dsBase/lib/snakeyaml-2.3.jar deleted file mode 100644 index 0c9b7fc1..00000000 Binary files a/dsBase/lib/snakeyaml-2.3.jar and /dev/null differ diff --git a/dsBase/lib/snappy-java-1.1.10.5.jar b/dsBase/lib/snappy-java-1.1.10.5.jar deleted file mode 100644 index 7707e587..00000000 Binary files a/dsBase/lib/snappy-java-1.1.10.5.jar and /dev/null differ diff --git a/dsBase/lib/undertow-core-2.2.33.Final.jar b/dsBase/lib/undertow-core-2.2.33.Final.jar deleted file mode 100644 index 800d3c3a..00000000 Binary files a/dsBase/lib/undertow-core-2.2.33.Final.jar and /dev/null differ diff --git a/dsBase/lib/undertow-servlet-2.2.33.Final.jar b/dsBase/lib/undertow-servlet-2.2.33.Final.jar deleted file mode 100644 index af1cb97d..00000000 Binary files a/dsBase/lib/undertow-servlet-2.2.33.Final.jar and /dev/null differ diff --git a/dsBase/lib/wildfly-client-config-1.0.1.Final.jar b/dsBase/lib/wildfly-client-config-1.0.1.Final.jar deleted file mode 100644 index 370e8c7f..00000000 Binary files a/dsBase/lib/wildfly-client-config-1.0.1.Final.jar and /dev/null differ diff --git a/dsBase/lib/wildfly-common-1.5.4.Final.jar b/dsBase/lib/wildfly-common-1.5.4.Final.jar deleted file mode 100644 index a5b5892e..00000000 Binary files a/dsBase/lib/wildfly-common-1.5.4.Final.jar and /dev/null differ diff --git a/dsBase/lib/xml-apis-1.4.01.jar b/dsBase/lib/xml-apis-1.4.01.jar deleted file mode 100644 index 46733464..00000000 Binary files a/dsBase/lib/xml-apis-1.4.01.jar and /dev/null differ diff --git a/dsBase/lib/xmlbeans-5.2.0.jar b/dsBase/lib/xmlbeans-5.2.0.jar deleted file mode 100644 index c9ac97f8..00000000 Binary files a/dsBase/lib/xmlbeans-5.2.0.jar and /dev/null differ diff --git a/dsBase/lib/xnio-api-3.8.16.Final.jar b/dsBase/lib/xnio-api-3.8.16.Final.jar deleted file mode 100644 index b3388111..00000000 Binary files a/dsBase/lib/xnio-api-3.8.16.Final.jar and /dev/null differ diff --git a/dsBase/lib/xnio-nio-3.8.16.Final.jar b/dsBase/lib/xnio-nio-3.8.16.Final.jar deleted file mode 100644 index 084d29a2..00000000 Binary files a/dsBase/lib/xnio-nio-3.8.16.Final.jar and /dev/null differ diff --git a/dsBase/pom.xml b/dsBase/pom.xml index 4de0d3b8..34e4192b 100644 --- a/dsBase/pom.xml +++ b/dsBase/pom.xml @@ -20,7 +20,7 @@ ali-maven - http://maven.aliyun.com/nexus/content/groups/public + https://maven.aliyun.com/nexus/content/groups/public true @@ -31,8 +31,8 @@ + - com.jfinal diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index a2994965..df223922 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java @@ -26,19 +26,30 @@ public class LoginPersonController extends Controller { @Before({POST.class}) public void doLogin(String username, String password, String platform, int forVue) { JSONObject jo = model.doLogin(username, password, platform, getResponse()); + + int identity_id = jo.getInteger("identity_id"); + + String person_id = jo.getString("person_id"); + String bureau_id = jo.getString("bureau_id"); + String person_name = jo.getString("person_name"); if (forVue == 0) { + if (identity_id <= 0 || identity_id >= 4) { + renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问,您的账号不是管理员!")); + return; + } renderJson(jo); } else { + if (identity_id != 5) { + renderJson(RetKit.renderFail("业务系统只支持真实人员登录!")); + return; + } boolean success = jo.getBoolean("success"); String msg = jo.getString("message"); if (!success) { renderJson(RetKit.renderFail(msg)); return; } - int identity_id = jo.getInteger("identity_id"); - String person_id = jo.getString("person_id"); - String bureau_id = jo.getString("bureau_id"); - String person_name = jo.getString("person_name"); + String jwt = jo.getString("jwt"); Map map = new HashMap<>(); map.put("identity_id", identity_id); diff --git a/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java b/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java index 0e675c82..313092c9 100644 --- a/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java +++ b/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java @@ -1,10 +1,13 @@ package com.dsideal.base.Menu.Controller; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.dsideal.base.Base.Model.BaseModel; import com.dsideal.base.Interceptor.*; import com.dsideal.base.Util.CommonUtil; import com.dsideal.base.Menu.Model.MenuModel; +import com.dsideal.base.Util.JwtUtil; +import com.dsideal.base.Util.RetKit; import com.dsideal.base.fay.tree.domain.MenuBean; import com.dsideal.base.fay.tree.service.IFayTreeNode; import com.dsideal.base.fay.tree.util.FayTreeUtil; @@ -15,10 +18,9 @@ import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; +import io.jsonwebtoken.Claims; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; @SuppressWarnings("unchecked") public class MenuController extends Controller { @@ -153,8 +155,8 @@ public class MenuController extends Controller { @EmptyInterface({"menu_name", "url", "memo", "identity_ids"}) @IsNumericInterface({"parent_id", "sort_id", "for_school", "for_bureau"}) @LengthInterface({"menu_name,1,32", "memo,1,255"}) - public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau,String icon,int isFull) { - int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau,icon,isFull); + public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau, String big_icon, String small_icon, int isFull) { + int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau, big_icon, small_icon, isFull); JSONObject map = new JSONObject(); map.put("menu_id", menu_id); if (menu_id > 0) { @@ -191,8 +193,8 @@ public class MenuController extends Controller { @IsNumericInterface({"menu_id", "sort_id", "for_school", "for_bureau"}) @LengthInterface({"menu_name,1,32", "memo,1,255"}) public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo, - int for_school, int for_bureau,String icon,int isFull) { - model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau,icon,isFull); + int for_school, int for_bureau, String big_icon,String small_icon, int isFull) { + model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau, big_icon,small_icon, isFull); renderJson(CommonUtil.returnMessageJson(true, "修改成功!")); } @@ -229,4 +231,29 @@ public class MenuController extends Controller { Kv kv = Kv.by("success", true).set("list", list); renderJson(kv); } + + /** + * 功能:获取人员可以看到的菜单 + */ + @Before({GET.class}) + public void getPersonMenu() { + //当前登录的人员是谁? + String token = getRequest().getHeader("Authorization"); + if (token == null) { + renderJson(RetKit.renderFail("请先登录!")); + return; + } + Claims claims = JwtUtil.getClaims(token); + String person_id = claims.get("person_id").toString(); + + //可见菜单 + List recordList = model.selectMenuByPersonId(person_id); + Set menuIdSet = new HashSet<>(); + for (Record record : recordList) { + menuIdSet.add(record.getInt("menu_id")); + } + //需要根据所有可见菜单,递归处理,生成树形菜单 + List menuList = model.fetchMenu(1, menuIdSet); + renderJson(RetKit.renderSuccess(JSONUtil.parseArray(menuList))); + } } \ No newline at end of file diff --git a/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java b/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java index f4bbed0e..2a692594 100644 --- a/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java +++ b/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java @@ -7,11 +7,10 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.SqlPara; +import lombok.Getter; +import lombok.Setter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @SuppressWarnings("unchecked") public class MenuModel { @@ -215,7 +214,7 @@ public class MenuModel { * @param url * @param memo */ - public int AddMenu(int parent_id, int sort_id, String menu_name, String url, String memo, String identity_ids, int for_school, int for_bureau, String icon, int isFull) { + public int AddMenu(int parent_id, int sort_id, String menu_name, String url, String memo, String identity_ids, int for_school, int for_bureau, String big_icon, String small_icon, int isFull) { //查找它父结点的level_id Record record = Db.findById("t_base_menu", "menu_id", parent_id); if (record == null) { @@ -232,7 +231,8 @@ public class MenuModel { record.set("level_id", level_id); record.set("for_school", for_school); record.set("for_bureau", for_bureau); - record.set("icon", icon); + record.set("big_icon", big_icon); + record.set("small_icon", small_icon); record.set("isFull", isFull); Db.save("t_base_menu", "menu_id", record); int menu_id = record.getInt("menu_id"); @@ -269,7 +269,8 @@ public class MenuModel { * @param url * @param memo */ - public boolean UpdateMenu(int menu_id, String menu_name, int sort_id, String url, String memo, String identity_ids, int for_school, int for_bureau,String icon,int isFull) { + public boolean UpdateMenu(int menu_id, String menu_name, int sort_id, String url, String memo, String identity_ids, + int for_school, int for_bureau, String big_icon, String small_icon, int isFull) { Record record = Db.findById("t_base_menu", "menu_id", menu_id); if (record == null) { return false; @@ -280,8 +281,9 @@ public class MenuModel { record.set("memo", memo); record.set("for_school", for_school); record.set("for_bureau", for_bureau); - record.set("icon",icon); - record.set("isFull",isFull); + record.set("big_icon", big_icon); + record.set("small_icon", small_icon); + record.set("isFull", isFull); Db.update("t_base_menu", "menu_id", record); //保存菜单与身份的关系 @@ -319,4 +321,80 @@ public class MenuModel { list = Db.find(sqlPara); return list; } + + //子类1:菜单 + @Getter + @Setter + public static class Menu { + private String path; + private String component; + private Meta meta; + private List children = new ArrayList<>(); + } + + //子类2:LinkMeta + @Getter + @Setter + public static class Meta { + private String icon; + private String big_icon; + private String title; + private String isLink; + private boolean isHide; + private boolean isFull; + private boolean isAffix; + private String name; + private boolean isKeepAlive; + } + + /** + * 功能:递归获取菜单 + * + * @param parent_id 父节点ID + * @return 此父节点下所有的子菜单 + */ + public List fetchMenu(int parent_id, Set menuIdSet) { + + String sql = "select * from t_base_menu where parent_id = ? order by sort_id"; + List list = Db.find(sql, parent_id); + List res = new ArrayList<>(); + + for (Record rs : list) { + int menu_id = rs.getInt("menu_id"); + if (!menuIdSet.contains(menu_id)) { + continue; + } + Menu sMenu = new Menu(); + String url = rs.getStr("url"); + sMenu.setPath(url); + sMenu.setComponent(url); + + Meta meta = new Meta(); + meta.setIcon(rs.getStr("small_icon")); + meta.setBig_icon(rs.getStr("big_icon")); + meta.setTitle(rs.getStr("menu_name")); + meta.setIsLink(""); + meta.setHide(false); + meta.setName(rs.getStr("menu_name")); + meta.setAffix(false); + if (rs.getStr("menu_name").equals("首页")) { + meta.setAffix(true); + } + if (rs.get("is_full") == null || rs.getInt("is_full") == 0) { + meta.setFull(false); + } else { + meta.setFull(true); + } + + meta.setKeepAlive(true); + sMenu.setMeta(meta); + // 递归查找子菜单 + List childMenu = fetchMenu(rs.getInt("menu_id"), menuIdSet); + sMenu.setChildren(childMenu); + res.add(sMenu); + } + return res; + } + + } diff --git a/dsBase/src/main/resource/Sql/menu.sql b/dsBase/src/main/resource/Sql/menu.sql index 360b8830..ee71baa9 100644 --- a/dsBase/src/main/resource/Sql/menu.sql +++ b/dsBase/src/main/resource/Sql/menu.sql @@ -36,7 +36,7 @@ select identity_id from t_base_menu_privilage where menu_id=? #sql("selectSingle") select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo, t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau, - t1.icon,t1.isFull, + t1.big_icon,t1.small_icon,t1.isFull, (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf from t_base_menu as t1 where t1.menu_id=? #end diff --git a/dsBase/src/main/resource/application_pro.yaml b/dsBase/src/main/resource/application_pro.yaml index 7673bd7f..0af87d49 100644 --- a/dsBase/src/main/resource/application_pro.yaml +++ b/dsBase/src/main/resource/application_pro.yaml @@ -1,5 +1,5 @@ # 上传文件的临时路径 -uploadTempPath: c:/Windows/Temp +uploadTempPath: /tmp # JWT SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM # 生成Token的密码 @@ -8,17 +8,20 @@ CookieMd5SingPwd: DsideaL4r5t6y7u mysql: # 数据库信息 driverClassName: com.mysql.cj.jdbc.Driver - user: root - password: DsideaL147258369 - jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + user: ylt + password: Ycharge666 + jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8 redis: - ip: 10.10.14.210 - port: 18890 - password: + ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com + port: 6379 + password: Ycharge666 # ============================================================== +jwt: + # 生成Token的密码 + CookieMd5SingPwd: DsideaL4r5t6y7u excel: # 导出excel 的模板配置路径 diff --git a/dsBase/target/classes/ExcelExportTemplate/excelTemp/占位文件.txt b/dsBase/target/classes/ExcelExportTemplate/excelTemp/占位文件.txt deleted file mode 100644 index e658701c..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/excelTemp/占位文件.txt +++ /dev/null @@ -1 +0,0 @@ -ww \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrincipalshipThirdParty.json b/dsBase/target/classes/ExcelExportTemplate/getPrincipalshipThirdParty.json deleted file mode 100644 index 0b3782e3..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrincipalshipThirdParty.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "title": "职务与分管工作", - "sheetName": "职务与分管工作", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - - "colInfo": [ - { - "show_column_name": "级别", - "list_column_name": "level_name", - "width": 40 - }, - { - "show_column_name": "单位类型", - "list_column_name": "org_type_name", - "width": 40 - }, - { - "show_column_name": "职务名称", - "list_column_name": "zhiwu_name", - "width": 40 - }, - { - "show_column_name": "分管工作", - "list_column_name": "fenguan", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrintAreaBureau.json b/dsBase/target/classes/ExcelExportTemplate/getPrintAreaBureau.json deleted file mode 100644 index fb311492..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrintAreaBureau.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "县区级单位管理员登录账号", - "sheetName": "管理员账号", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrintAreaManager.json b/dsBase/target/classes/ExcelExportTemplate/getPrintAreaManager.json deleted file mode 100644 index e548e545..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrintAreaManager.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "县区管理员登录账号", - "sheetName": "管理员账号", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrintCityBureau.json b/dsBase/target/classes/ExcelExportTemplate/getPrintCityBureau.json deleted file mode 100644 index 8d408313..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrintCityBureau.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "市直属单位登录账号", - "sheetName": "管理员账号", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrintCityManager.json b/dsBase/target/classes/ExcelExportTemplate/getPrintCityManager.json deleted file mode 100644 index 95763ed8..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrintCityManager.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "市管理员登录账号", - "sheetName": "管理员账号", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrintParent.json b/dsBase/target/classes/ExcelExportTemplate/getPrintParent.json deleted file mode 100644 index 15a3e0f2..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrintParent.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "家长登录信息", - "sheetName": "家长登录信息", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getPrintStudent.json b/dsBase/target/classes/ExcelExportTemplate/getPrintStudent.json deleted file mode 100644 index c5c996c2..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getPrintStudent.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "学生登录信息", - "sheetName": "学生登录信息", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "学生姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelExportTemplate/getTeacherListByBureauId.json b/dsBase/target/classes/ExcelExportTemplate/getTeacherListByBureauId.json deleted file mode 100644 index fb311492..00000000 --- a/dsBase/target/classes/ExcelExportTemplate/getTeacherListByBureauId.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "title": "县区级单位管理员登录账号", - "sheetName": "管理员账号", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "person_name", - "width": 40 - }, - { - "show_column_name": "登录名", - "list_column_name": "login_name", - "width": 40 - }, - { - "show_column_name": "原始密码", - "list_column_name": "original_pwd", - "width": 40 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelImportTemplate/Student.json b/dsBase/target/classes/ExcelImportTemplate/Student.json deleted file mode 100644 index ea70e7f8..00000000 --- a/dsBase/target/classes/ExcelImportTemplate/Student.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "rowHeight": 28, - "colInfo": [ - { - "column": 0, - "name": "stage", - "value": "学段", - "width": 20, - "promptContent": "请按下拉框进行选择!", - "need":1 - }, - { - "column":1, - "name": "class", - "value": "班级名称", - "width": 24, - "promptContent": "只支持入学年份+班号的形式,比如2017级8班", - "need":1 - }, - { - "column": 2, - "name": "person_name", - "value": "姓名", - "width": 18, - "promptContent": "人员姓名。", - "need":1 - }, - { - "column": 3, - "name":"xb", - "value": "性别", - "width": 14, - "promptContent": "性别请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 4, - "value": "民族", - "name":"mz", - "width": 20, - "promptContent": "民族请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 5, - "value": "政治面貌", - "name":"zzmm", - "width": 34, - "promptContent": "政治面貌请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 6, - "value": "身份证号", - "name":"cardNumber", - "width": 30, - "promptContent": "支持身份证号15位或18位。", - "need":1 - }, - { - "column": 7, - "value": "学籍号", - "name":"xjh", - "width": 18, - "promptContent": "可以为空!", - "need":0 - }, - { - "column": 8, - "value": "学籍辅号", - "name":"xjfh", - "width": 18, - "promptContent": "可以为空!", - "need":0 - }, - { - "column": 9, - "value": "学生来源", - "name":"stage", - "width": 16, - "promptContent": "学生来源请在下拉框中选择,或者将内容复制!", - "need":1 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelImportTemplate/Student.xls b/dsBase/target/classes/ExcelImportTemplate/Student.xls deleted file mode 100644 index 87e6f3da..00000000 Binary files a/dsBase/target/classes/ExcelImportTemplate/Student.xls and /dev/null differ diff --git a/dsBase/target/classes/ExcelImportTemplate/StudentSample.xls b/dsBase/target/classes/ExcelImportTemplate/StudentSample.xls deleted file mode 100644 index a121db67..00000000 Binary files a/dsBase/target/classes/ExcelImportTemplate/StudentSample.xls and /dev/null differ diff --git a/dsBase/target/classes/ExcelImportTemplate/Teacher.json b/dsBase/target/classes/ExcelImportTemplate/Teacher.json deleted file mode 100644 index 1878e155..00000000 --- a/dsBase/target/classes/ExcelImportTemplate/Teacher.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "rowHeight": 28, - "colInfo": [ - { - "column": 0, - "name": "department", - "value": "部门", - "width": 25, - "promptContent": "只支持一级部门,系统中存在将重用,不存在将创建!", - "need":0 - }, - { - "column": 1, - "name": "person_name", - "value": "姓名", - "width": 18, - "promptContent": "人员姓名。", - "need":1 - }, - { - "column": 2, - "name":"xb", - "value": "性别", - "width": 14, - "promptContent": "性别请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 3, - "value": "民族", - "name":"mz", - "width": 16, - "promptContent": "民族请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 4, - "value": "政治面貌", - "name":"zzmm", - "width": 34, - "promptContent": "政治面貌请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 5, - "value": "身份证号", - "name":"cardNumber", - "width": 30, - "promptContent": "支持身份证号15位或18位。", - "need":1 - }, - { - "column": 6, - "value": "最高学历", - "name":"xl", - "width": 18, - "promptContent": "最高学历请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 7, - "value": "职称", - "name":"zc", - "width": 18, - "promptContent": "职称请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 8, - "value": "学段", - "name":"stage", - "width": 16, - "promptContent": "学段请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 9, - "value": "主教学科", - "name":"subject", - "width": 22, - "promptContent": "主教学科请在下拉框中选择,或者将内容复制!", - "need":1 - }, - { - "column": 10, - "value": "从教年月日", - "name":"teach_date", - "width": 18, - "promptContent": "例:1978-01-01", - "need":1 - } - ] -} \ No newline at end of file diff --git a/dsBase/target/classes/ExcelImportTemplate/Teacher.xls b/dsBase/target/classes/ExcelImportTemplate/Teacher.xls deleted file mode 100644 index 8eb91693..00000000 Binary files a/dsBase/target/classes/ExcelImportTemplate/Teacher.xls and /dev/null differ diff --git a/dsBase/target/classes/ExcelImportTemplate/TeacherSample.xls b/dsBase/target/classes/ExcelImportTemplate/TeacherSample.xls deleted file mode 100644 index 7495ca3d..00000000 Binary files a/dsBase/target/classes/ExcelImportTemplate/TeacherSample.xls and /dev/null differ diff --git a/dsBase/target/classes/SetMinioDownload.json b/dsBase/target/classes/SetMinioDownload.json deleted file mode 100644 index 5955e673..00000000 --- a/dsBase/target/classes/SetMinioDownload.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "AWS": ["*"] - }, - "Action": ["s3:GetBucketLocation", "s3:ListBucket"], - "Resource": ["arn:aws:s3:::dsideal"] - }, { - "Effect": "Allow", - "Principal": { - "AWS": ["*"] - }, - "Action": ["s3:GetObject"], - "Resource": ["arn:aws:s3:::dsideal/*"] - }] -} \ No newline at end of file diff --git a/dsBase/target/classes/Sql/ClearDataBase.sql b/dsBase/target/classes/Sql/ClearDataBase.sql deleted file mode 100644 index b51df13d..00000000 --- a/dsBase/target/classes/Sql/ClearDataBase.sql +++ /dev/null @@ -1,26 +0,0 @@ -#namespace("clearDataBase") - #sql("clearAll") - truncate table t_base_class; - truncate table t_base_graduation; - truncate table t_base_organization; - truncate table t_import_student_by_excel; - truncate table t_import_teacher_by_excel; - truncate table t_person_duty_charge; - truncate table t_sys_account_mount; - truncate table t_transfer_apply; - truncate table t_sys_loginperson; - truncate table t_base_app_visiable; - #end - - #sql("set_install_area") - update t_base_global set global_value=? where global_code='install_area' - #end - - #sql("setPwd") - update t_sys_loginperson set original_pwd=?,pwd=?,pwdmd5=? where login_name=? - #end - - #sql("getAreaByCityId") - select * from t_dm_area where city_id=? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/YltWxGzh.sql b/dsBase/target/classes/Sql/YltWxGzh.sql deleted file mode 100644 index 89c3134b..00000000 --- a/dsBase/target/classes/Sql/YltWxGzh.sql +++ /dev/null @@ -1,20 +0,0 @@ -#namespace("YltWxGzh") - -- 获取绑定微信用户 - #sql("QuerybindWxUser") - SELECT - o.id, - o.operate_workers_name, - o.operate_workers_phone_number, - o.station_id, - DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%s') as create_time, - s.station_name, - o.wx_openid, - o.wx_bindtime - FROM - t_operate_workers_info o - LEFT JOIN t_station s - ON o.station_id=s.id - where o.operate_workers_name=#para(operate_workers_name) and - o.operate_workers_phone_number=#para(operate_workers_phone_number) - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/app.sql b/dsBase/target/classes/Sql/app.sql deleted file mode 100644 index b721e6df..00000000 --- a/dsBase/target/classes/Sql/app.sql +++ /dev/null @@ -1,62 +0,0 @@ --- 应用接入命名空间 -#namespace("app") - -- 根据appid获取app信息 - #sql("getAppInfoByAppid") - select t1.appid,t1.appkey,t1.appname,t1.sort_id,t1.system_type_id,t1.create_time,t1.update_ts,t1.bureau_id,t1.developer, - (select t2.org_name from t_base_organization as t2 where t1.bureau_id=t2.org_id) as bureau_name, - (select t2.system_type_name from t_dm_integrated_system_type as t2 where t2.system_type_id=t1.system_type_id) as system_type_name, - t1.is_system from t_base_app as t1 where appid=? - #end - - -- 获取应用系统的列表 - #sql("getAppList") - select t1.appid,t1.appkey,t1.appname,t1.sort_id,t1.system_type_id,t1.create_time,t1.update_ts,bureau_id,developer, - is_system,(select t2.system_type_name from t_dm_integrated_system_type as t2 where t2.system_type_id=t1.system_type_id) - as system_type_name, - (case when (select count(*) as c from t_integrated_system as t2 where t2.appid=t1.appid)>0 then 1 else 0 end) - as integrated_exist, - (case when (select count(*) as c from t_datashare_publish as t2 where t2.appid=t1.appid)>0 then 1 else 0 end) - as publish_exist, - (case when (select count(*) as c from t_datashare_subscribe as t2 where t2.appid=t1.appid)>0 then 1 else 0 end) - as subscribe_exist, - t1.b_use from t_base_app as t1 order by t1.sort_id - #end - - -- 获取集成系统的系统类型 - #sql("getIntegratedSystemType") - select system_type_id,system_type_name from t_dm_integrated_system_type - #end - - -- 通过appid 获取app的info信息 - #sql("getAppInfo") - select appid,appkey,appname,sort_id,system_type_id,create_time,update_ts,bureau_id,developer,is_system from t_base_app - where appid=? - #end - - -- 设置app为禁用或启用 - #sql("changeAppStatus") - update t_base_app set b_use=ABS(b_use-1) where appid=? - #end - - -- 通过appid清空它的发布系统配置 - #sql("deletePublishByAppid") - delete from t_datashare_publish where appid=? - #end - - -- 通过appid清空它的订阅系统配置 - #sql("deleteSubscribeByAppid") - delete from t_datashare_subscribe where appid=? - #end - - -- 删除一个集成的系统(可视范围表) - #sql("deleteVisiableByAppid") - delete from t_base_app_visiable where appid=? - #end - - --按系统获取系统与可视范围的关系 - #sql("appid_visible") - select t1.id,t1.appid,t1.city_id,t1.area_id,t1.bureau_id,t1.level_id,t1.update_ts, - (select t2.org_name from t_base_organization as t2 where t1.bureau_id=t2.org_id) as bureau_name - from t_base_app_visiable as t1 where appid=? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/base.sql b/dsBase/target/classes/Sql/base.sql deleted file mode 100644 index e4a90d53..00000000 --- a/dsBase/target/classes/Sql/base.sql +++ /dev/null @@ -1,339 +0,0 @@ --- 基础类命名空间 -#namespace("Base") - -- 获取整个单位类型与职务+分管信息树数据 - #sql("getLoginInfoByUserName") - select person_id,person_name,pwd,ifnull(wx_openid,0) as wx_openid,ifnull(qq_openid,0) as qq_openid, - identity_id,bureau_id,city_id,area_id - from t_sys_loginperson where b_use = 1 and login_name =? - #end - -- 获取整个单位类型与职务+分管信息树数据 - #sql("getOrgTypePrincipalshipTree") - select t1.id,t1.code,t1.name,t1.parent_id as pId,(case when length(t1.code)>6 then 0 else 1 end) as open, - (case when length(t1.code)=10 then 1 else 0 end ) as nocheck, - (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf,sort_id,b_use, - is_school,level,bureau_level - from t_base_org_type_principalship as t1 where b_use=1 order by sort_id - #end - - -- 获取单位类型与职务+分管信息树数据指定结点的信息 - #sql("getOrgTypePrincipalshipById") - select t1.id,t1.code,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level, - (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf - from t_base_org_type_principalship as t1 where t1.id=#para(0) order by t1.sort_id - #end - - -- 获取单位类型与职务+分管信息树数据指定结点的信息 - #sql("getOrgTypePrincipalshipByParentId") - select t1.id,t1.code,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level, - (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf - from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1 order by sort_id - #end - - -- 和上面的是一个东西,但要细分一下,比如幼儿园+中小学 - #sql("getOrgTypePrincipalshipByParentIdAndBigType") - select t1.id,t1.name,t1.parent_id as pId,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level, - (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id) as is_leaf - from t_base_org_type_principalship as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.is_school=#para(1) order by sort_id - #end - - -- 修改一个OrgTypePrincipalship节点 - #sql("updateOrgTypePrincipalshipNode") - update t_base_org_type_principalship set code=?,name=?,parent_id=?,sort_id=?,b_use=?,is_school=? where id=? - #end - - -- 删除一个OrgTypePrincipalship节点 - #sql("delOrgTypePrincipalshipById") - delete from t_base_org_type_principalship where id=? - #end - - -- 获取单位类型与职务+分管信息树数据指定结点下一级的数据ByCode - #sql("getOrgTypePrincipalshipByParentparent_code") - select id,code,name,parent_id as pId,sort_id,b_use,is_school,level,bureau_level - from t_base_org_type_principalship where code like ? and length(code)=length(?)+2 and b_use=1 order by sort_id - #end - - -- 获取指定CODE的个数 - #sql("t_base_org_type_principalship_CountByCode") - select count(1) as c from t_base_org_type_principalship where code=? and b_use=1 - #end - - -- 获取指定CODE的个数,不包括自己 - #sql("t_base_org_type_principalship_CountByCodeExceptSelf") - select count(1) as c from t_base_org_type_principalship where code=? and id!=? and b_use=1 - #end - - -- 通过单位ID获取职务权限树 - #sql("getPrincipalshipTreeByBureauId") - select t1.id,t1.code,t1.name,t1.sort_id,t1.b_use,t1.is_school,t1.level,t1.bureau_level, - (case when length(t1.code)=6 then -1 else t1.parent_id end ) as parent_id, - (select count(1) from t_base_org_type_principalship as t2 where t2.parent_id=t1.id and t2.b_use=1) as is_leaf - from t_base_org_type_principalship as t1 - where t1.code like concat((select code from t_base_org_type_principalship - where id=(select org_type_id from t_base_organization where org_id=?)),'%') and t1.b_use=1 - order by t1.sort_id - #end - - -- 获取职务列表打印EXCEL,用来方便第三方系统提供接入的职务与系统对应关系 - #sql("getPrincipalshipThirdParty") - select (case when substr(t1.code,1,4)='0101' then '市级' else '县区级' end ) as level_name, - (select t2.name from t_base_org_type_principalship as t2 where t2.code=SUBSTR(t1.code,1,6)) as org_type_name, - t1.name as zhiwu_name , - ifnull((select group_concat(name) as cols from t_base_org_type_principalship where parent_id=t1.id),'无') as fenguan - from t_base_org_type_principalship as t1 where t1.level =4 and t1.b_use=1 order by t1.code - #end - - -- 获取当前学期 - #sql("getCurrentTerm") - select xq_id,(case xq_code when '09' then xn else xn+1 end) as xn,xq, - xqmc,ksrq,jsrq,memo,xq_code,is_current from t_base_term where is_current=1 - #end - -- 按年份获取学期列表 - #sql("getTermListByYear") - select xq_id,(case xq_code when '09' then xn else xn+1 end) as xn,xq, - xqmc,ksrq,jsrq,memo,xq_code,is_current from t_base_term where xn=#(batch_year) - #end - -- 获取当前人员 - #sql("getCurrentPerson") - select t1.*,t4.rule_id - from t_sys_loginperson as t1 - left join t_base_student as t2 on t2.sfzh=AES_DECRYPT(from_base64(t1.idcard_code),'DsideaL4r5t6y7u!') - left join t_base_class as t3 on t2.class_id=t3.class_id - LEFT JOIN t_jw_major_rule AS t4 ON t3.zydm = t4.zhuanye_code - AND t3.entry_year = t4.entry_year - AND t3.type_id = t4.zhaosheng_type_id - AND t3.xq_code = t4.entry_term_code AND t4.rule_type_id=1 - where t1.person_id='#(person_id)' - #end - - -- 获取当前学生所在班级 - #sql("getCurrentClass") - select c.* from t_base_class as c left join t_sys_loginperson as l on c.class_id=l.s_class_id where l.person_id='#(person_id)' and l.identity_id=6 - #end - -- 获取人员(主部门)系列表 - #sql("getZhuDepartmentTypeId1List") - select l.login_name,case - when o.department_type_id=1 then o.org_id - when po.department_type_id=1 then po.org_id - end as org_id - from t_sys_loginperson as l - LEFT JOIN t_base_organization as o on l.org_id=o.org_id - LEFT JOIN t_base_organization as po on o.parent_id=po.org_id - where l.person_id='#(person_id)' and (o.department_type_id=1 or po.department_type_id=1 ) - #end - -- 获取人员(辅部门)系列表 - #sql("getFuDepartmentTypeId1List") - select l.login_name,case - when o.department_type_id=1 then o.org_id - when po.department_type_id=1 then po.org_id - end as org_id - from t_sys_loginperson as l - LEFT JOIN t_base_teacher_org as bto on l.person_id=bto.person_id - LEFT JOIN t_base_organization as o on bto.org_id=o.org_id - LEFT JOIN t_base_organization as po on o.parent_id=po.org_id - where l.person_id='#(person_id)' and (o.department_type_id=1 or po.department_type_id=1 ) - #end - -- 获取某人是管理员的专业列表 - #sql("getZhuanYeList") - select zt.zhuanye_id,z.zhuanye_code,z.zhuanye_name - from t_zhaosheng_zhuanye as z - left join t_zhaosheng_zhuanye_teacher as zt on zt.zhuanye_id=z.zhuanye_id - where zt.person_id='#(person_id)' - and z.b_use=1 and #(batch_year) BETWEEN z.begin_year AND z.end_year - #end - -- 获取所有专业列表 - #sql("getAllZhuanYeList") - select z.zhuanye_id,z.zhuanye_code,z.zhuanye_name - from t_zhaosheng_zhuanye as z - where z.b_use=1 and #(batch_year) BETWEEN z.begin_year AND z.end_year - #end - -- 获取学期列表 - #sql("getTermList") - select xq_id,xn,xq,xqmc, - date_format(ksrq,'%Y-%m-%d') as ksrq, - date_format(jsrq,'%Y-%m-%d') as jsrq,is_current - from t_base_term where - xq_id<=(select xq_id from t_base_term where is_current=1) - #if(addOne) - +1 - #end - and xn>=2018 order by xq_id - #if(action_asc) - asc - #else - desc - #end - #end - -- 获取校历的文字描述信息 - #sql("getXiaoLiMemo") - select memo from t_base_term where xq_id=#(xq_id) - #end - - -- 修改校历的文字描述信息 - #sql("updateXiaoLiMemo") - update t_base_term set memo='#(memo)',ksrq='#(ksrq)',jsrq='#(jsrq)' where xq_id=#(xq_id) - #end - - -- 是不是在职务列表中 - #sql("isInDutyList") - select count(*) as c from t_person_duty_charge where person_id='#(person_id)' and duties_id in - ( - #for(x:ids) - #(for.index == 0 ? "" : ",") #para(x) - #end - ) - #end - -- 查询人员职务列表 - #sql("selectDutyList") - select `name` from t_base_org_type_principalship where id in - ( #for(x:ids) - #(for.index == 0 ? "" : ",") - #para(x) - #end ) - #end - -- 获取所有的用户城市列表 - #sql("getAllUserCity") - select city_id,city_name,sort_id from t_base_user_city where b_use=1 order by sort_id - #end - - -- 教师选择器专用(多选) - #sql("selectPersonsByBureauId") - select person_id,person_name from t_sys_loginperson where bureau_id=? and b_use=1 and identity_id=5 - order by person_name,sort_id - #end - -- 系内人员选择器(主部门待选) - #sql("selectZhuPersonsByOrgId") - select sl.person_id,sl.person_name - from t_sys_loginperson as sl - LEFT JOIN t_base_organization AS bo ON bo.org_id = sl.org_id - where sl.bureau_id=? and sl.b_use=1 and sl.identity_id=5 - and (bo.org_id=? or bo.parent_id=?) - order by sl.person_name,sl.sort_id - #end - -- 系内人员选择器(辅部门待选) - #sql("selectFuPersonsByOrgId") - select sl.person_id,sl.person_name - from t_sys_loginperson as sl - LEFT JOIN t_base_teacher_org as bto on sl.person_id=bto.person_id - LEFT JOIN t_base_organization AS bo ON bo.org_id = bto.org_id - where sl.bureau_id=? and sl.b_use=1 and sl.identity_id=5 - and (bo.org_id=? or bo.parent_id=?) - order by sl.person_name,sl.sort_id - #end - -- 系内人员选择器(已选) - #sql("selectAlreadyPersonsByOrgId") - select sl.person_id,sl.person_name - from t_zhaosheng_zhuanye_teacher as sl - LEFT JOIN t_base_organization AS bo ON bo.org_id = sl.org_id - where sl.zhuanye_id=? and sl.org_id=? - order by sl.person_name - #end - --把原已选清空 - #sql("clearZhuanyeOrgTeacher") - delete from t_zhaosheng_zhuanye_teacher where zhuanye_id=? and org_id=? - #end - -- 获取场地列表 - #sql("getSiteList") - select t1.site_id,t1.type_id,t2.type_name,t1.site_code,t1.site_name,t1.site_storied_building, - t3.building_name as site_storied_building_name,t1.floor,t1.room_number,t1.capacity_normal, - (case t1.for_examination when 1 then '是' else '否' end) as for_examination_memo, - t1.for_examination,t1.capacity_examination,t1.sort_id, - ( - select t5.class_name as class_name - from t_base_class as t5 inner join t_base_term as t2 on t5.xq_id=t2.xq_id - inner join t_zhaosheng_zhuanye as t3 on t5.zydm=t3.zhuanye_code - inner join t_zhaosheng_person_type as t4 on t5.person_type_id=t4.person_type_id - where t5.class_id=t1.class_id - ) as class_name - from t_base_site as t1 left join t_base_site_type as t2 on t1.type_id=t2.type_id - left join t_base_site_storied_building as t3 on t1.site_storied_building=t3.building_id - where 1=1 - #if(site_storied_building>0) - and t1.site_storied_building=#(site_storied_building) - #end - #if(floor>0) - and t1.floor=#(floor) - #end - #if(type_id) - and t1.type_id=#(type_id) - #end - #if(for_class_id>0) - and (t1.class_id is not null and t1.class_id<>'') - #else - and (t1.class_id is null or t1.class_id='') - #end - order by t1.sort_id - #end - - -- 获取场地类型 - #sql("getSiteTypeList") - select type_id,type_name,sort_id from t_base_site_type order by sort_id - #end - - -- 获取教学楼列表 - #sql("getBindBuildingList") - select building_id,building_name,sort_id from t_base_site_storied_building order by sort_id - #end - -- 获取教学楼楼层列表 - #sql("getBuildingLevelList") - select DISTINCT floor from t_base_site where site_storied_building=#(site_storied_building) order by floor - #end - - -- 获取指定单位下多机构的教师列表 - #sql("getBureauPersonListByOrgId") - select t1.person_id,t1.person_name from t_sys_loginperson as t1 - where t1.b_use=1 - #if(org_id) - and (t1.org_id in ( - select t2.org_id from t_base_organization as t2 where t2.parent_id='#(org_id)' - union - select '#(org_id)' - ) - ) - or t1.person_id in ( - select person_id from t_base_teacher_org as t2 where t2.org_id in ( - select t2.org_id from t_base_organization as t2 where t2.parent_id='#(org_id)' - union - select '#(org_id)' - ) - ) - #end - order by t1.person_name; - #end - -- 获取指定单位下的场地列表 - #sql("getBureauBuildingList") - select distinct t1.building_id,t1.building_name from t_base_site_storied_building as t1 - order by t1.sort_id; - #end - -- 获取指定单位下的场地列表 - #sql("getBaseSiteList") - select distinct t1.site_id,t1.site_name from t_base_site as t1 - where t1.site_storied_building=#(building_id) - order by t1.sort_id; - #end - -- 获取指定单位下的班级列表 - #sql("getBureauClassList") - select distinct t1.class_id,t1.class_name from t_base_class as t1 - where ifnull(graduate_flag,0)=0 - #if(zhuanye_code) - and t1.zydm='#(zhuanye_code)' - #end - #if(batch_year) - and t1.entry_year=#(batch_year); - #end - #end - - -- 获取固定的班级 - #sql("getfixedClass") - select t1.class_id,t1.class_name - from t_base_class as t1 inner join t_base_term as t2 on t1.xq_id=t2.xq_id - inner join t_zhaosheng_zhuanye as t3 on t1.zydm=t3.zhuanye_code - inner join t_zhaosheng_person_type as t4 on t1.person_type_id=t4.person_type_id - order by t1.zydm,t1.xq_id,t1.class_name - #end - - #sql("getZyyxClassTree") - select bureau_id,org_id,org_name,parent_id from t_base_organization where bureau_id=? and department_type_id in (1,2) and b_use=1 - union - select bureau_id,org_id,org_name,'-1' as parent_id from t_base_organization where org_id=? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/class.sql b/dsBase/target/classes/Sql/class.sql deleted file mode 100644 index 2668784c..00000000 --- a/dsBase/target/classes/Sql/class.sql +++ /dev/null @@ -1,55 +0,0 @@ --- 班级命名空间 -#namespace("class") - - -- 根据单位号获取下面正常班级的个数 - #sql("getClassCountByBureauId") - select count(1) as c from t_base_class where bureau_id=? and b_use=1 - #end - - -- 根据单位ID、学段、入学年份获取班级List - #sql("getClassListByBureauIdStageIdEntryYear") - select class_name from t_base_class where b_use = 1 and bureau_id= ? and stage_id = ? and entry_year = ? - order by class_num - #end - - -- 获取班级列表 - #sql("getClassList") - select class_id, class_name, ifnull(altas_name,'') as altas_name, entry_year, - (select count(1) from t_sys_loginperson t2 where t2.b_use = 1 and identity_id = 6 and t2.s_class_id = t1.class_id) - as studentcount, bureau_id,org_id - from t_base_class t1 where b_use = 1 and bureau_id = #para(0) and org_id=#para(1) and stage_id = #para(2) - and entry_year =#para(3) order by class_num - #end - - -- 获取班级信息 - #sql("getClassInfoByClassId") - select class_name,ifnull(altas_name,'') as altas_name, stage_id,entry_year, bureau_id, city_id, area_id, main_school_id - from t_base_class where b_use = 1 and class_id = ? - #end - - -- 检查重名班级 - #sql("checkClassNameExists") - select class_id from t_base_class where b_use = 1 and bureau_id = ? and stage_id = ? and entry_year = ? - and class_name = ? and class_id <> ? - #end - - -- 修改班级名称 - #sql("updateClassName") - update t_base_class set altas_name = ?,operator=?,ip_address=? where class_id = ? - #end - - -- 删除班级 - #sql("deleteClassById") - update t_base_class set b_use = 0,operator=?,ip_address=?,class_code=UPPER(UUID()) where class_id = ? - #end - - #sql("getStudentCountByClassId") - select person_id from t_sys_loginperson where b_use = 1 and identity_id=6 and s_class_id = ? - #end - - -- 获取指定单位下有哪些班级名称 - #sql("getClassName") - select class_id,class_name,stage_id from t_base_class where bureau_id=? and b_use=1 - #end - -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/dm.sql b/dsBase/target/classes/Sql/dm.sql deleted file mode 100644 index 1db967d6..00000000 --- a/dsBase/target/classes/Sql/dm.sql +++ /dev/null @@ -1,121 +0,0 @@ --- 字典命名空间 -#namespace("dm") - - -- 获取学校办别 - #sql("getDmSchoolProperty") - select property_id,property_name from t_dm_schoolproperty - #end - - -- 获取学校隶属关系 - #sql("getDmSchoolLevel") - select * from t_dm_schoollevel - #end - - -- 获取编制的字典 - #sql("getDmBz") - select bz_id,bz_name from t_dm_bz - #end - - -- 获取性别的字典 - #sql("getDmXb") - select xb_id,xb_name from t_dm_xb - #end - - -- 获取民族的字典 - #sql("getDmMz") - select mz_id,mz_name from t_dm_mz - #end - - -- 获取学段字典 - #sql("getDmStage") - select stage_id,stage_name from t_dm_stage order by stage_id - #end - - -- 获取指定学段下的学科 - #sql("getDmSubject") - select subject_id,subject_name from t_dm_subject where stage_id=? order by sort_id - #end - - --获取学历字典信息 - #sql("getDmXl") - select xl_id,xl_name from t_dm_xl - #end - - --获取职称字典信息 - #sql("getDmZc") - select zc_id,zc_name from t_dm_zc - #end - - --获取政治面貌字典信息 - #sql("getDmZzmm") - select zzmm_id,zzmm_name from t_dm_zzmm - #end - - -- 获取全量的行政区划树 - #sql("getAreaAll") - select id,area_code,area_name,parent_id,(case when parent_id='-1' then 1 else 0 end ) as open from t_dm_area order by area_code - #end - - -- 获取指定父节点的行政区划 - #sql("getAreaByParentId") - select t1.id,t1.area_code,t1.area_name,t1.parent_id, - (case when parent_id='-1' then 1 else 0 end ) as open, - (select count(1) from t_dm_area as t2 where t2.parent_id=t1.id) as is_leaf - from t_dm_area as t1 where t1.parent_id=? order by t1.area_code - #end - - -- 获取指定节点的行政区划 - #sql("getAreaById") - select t1.id,t1.area_code,t1.area_name,t1.parent_id,t1.province_id, - (select area_name from t_dm_area as t2 where t1.province_id=t2.id) as province_name,t1.city_id,t1.area_id,t1.level_id,t1.sort_id from t_dm_area as t1 - where t1.id=? order by t1.sort_id - #end - - -- 获取指定父节点的行政区划 - #sql("getOrgLevel") - select org_id,org_code,org_name,parent_id,org_type_id,school_type_id,sort_id,create_time,update_ts,b_use,org_pk_num,city_id,area_id,main_school_id,bureau_id - from t_base_organization where org_id=? - #end - - -- 获取学校类型 - #sql("getSchoolType") - select school_type_id,school_type_name from t_dm_schooltype - #end - - -- 将学校类型换算成组织机构类型 - #sql("convertSchoolTypeToOrgType") - select shi_org_type,area_org_type from t_dm_schooltype where school_type_id=? - #end - - -- 通过ID获取区域的信息 - #sql("getAreaInfoById") - select * from t_dm_area where id=? - #end - - -- 获取学段下学科名称集合,用于EXCEL导入 - #sql("getStageSubjectNameRecord") - select t2.stage_name,t1.subject_name from t_dm_subject as t1 inner join t_dm_stage as t2 - on t1.stage_id=t2.stage_id where t2.b_use=1 - #end - - -- 获取有哪些学生来源 - #sql("getStudentSource") - select source_id,source_name from t_dm_student_source - #end - - -- 获取当前安装市下有哪些县区 - #sql("getAllAreaInfoByInstallCity") - select id,area_code,area_name from t_dm_area where parent_id= - (select global_value from t_base_global where global_code='install_area') order by sort_id - #end - - -- 系统中共有多少种身份 - #sql("getDmIdentity") - select identity_id,identity_name from t_dm_identity - #end - - -- 获取城市的坐标 - #sql("getCityCoordinate") - select * from t_city_coordinate where city_id=? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/global.sql b/dsBase/target/classes/Sql/global.sql deleted file mode 100644 index 662b7e91..00000000 --- a/dsBase/target/classes/Sql/global.sql +++ /dev/null @@ -1,59 +0,0 @@ --- 全局变量命名空间 -#namespace("global") - - -- 获取全局变量的分类类型 - #sql("getGlobalType") - select global_type_id,global_type_name from t_base_global_type - #end - - -- 获取所有分类 - #sql("getGlobalList") - select global_id,global_type_id,global_code,global_value,global_name,sort_id from t_base_global order by sort_id - #end - - -- 检查一个globalCode是不是重复 - #sql("checkGlobalCodeCount") - select count(1) as c from t_base_global where global_id!=? and global_code=? - #end - - -- 增加一个全局变量设置 - #sql("addGlobal") - insert into t_base_global(global_type_id,global_code,global_value,global_name,sort_id) values(?,?,?,?,?) - #end - - -- 修改一个全局变量设置 - #sql("updateGlobalById") - update t_base_global set global_type_id=?,global_code=?,global_value=?,global_name=?,sort_id=? where global_id=? - #end - - -- 删除一个全局变量设置 - #sql("delGlobalById") - delete from t_base_global where global_id=? - #end - - -- 获取一个全局变量设置 - #sql("getGlobalById") - select global_type_id,global_code,global_value,global_name from t_base_global where global_id=? - #end - - -- 传入一组global_code 返回对应的数据 - #sql("getGlobalByCodes") - select global_id,global_type_id,global_code,global_value,global_name from t_base_global where global_code=? - #end - - -- 获取area_id通过area_name - #sql("getAreaIdByAreaName") - select id from t_dm_area as t2 where t2.area_name=? and parent_id=(select id from t_dm_area as t1 where t1.area_name=?) - #end - #sql("getAreaIdByAreaNameOnlyCityName") - select id from t_dm_area as t1 where t1.area_name=? - #end - -- 保存设置安装地区 - #sql("saveInstallArea") - update t_base_global set global_value=? where global_code='install_area' - #end - -- 根据全局变量的KEY获取VALUE - #sql("getGlobalValueByKey") - select ifnull(global_value,'') as global_value from t_base_global where global_code = ? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/graduationAction.sql b/dsBase/target/classes/Sql/graduationAction.sql deleted file mode 100644 index 0ddc7b01..00000000 --- a/dsBase/target/classes/Sql/graduationAction.sql +++ /dev/null @@ -1,23 +0,0 @@ -#namespace("graduation") - - -- 获取当前年份是否已处理完毕业 - #sql("checkCurrentYearIsGraduation") - select count(1) as count from t_base_graduation where finish_year=? - #end - - -- 获取需要处理的班级个数 - #sql("getNeedActionClass") - select class_id from t_base_class where entry_year+school_length=? and b_use=1 limit ? - #end - - -- 修改指定班级下的学生和家长为毕业状态 - #sql("changeToGraduationByClassId") - update t_sys_loginperson set b_use=0,status_code='07' where s_class_id=? - #end - - -- 修改班级为毕业状态 - #sql("changeClassBuse") - update t_base_class set b_use=0 where class_id=? - #end - -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/gtzz.sql b/dsBase/target/classes/Sql/gtzz.sql deleted file mode 100644 index 8579cd42..00000000 --- a/dsBase/target/classes/Sql/gtzz.sql +++ /dev/null @@ -1,521 +0,0 @@ --- 命名空间 -#namespace("Gtzz") - -- 获取指定步骤的项目列表(待办) max()...group by 只显示同一个项目+步骤CODE的最后一条 - #sql("getToDoStepList") - select '#(person_id)' as operator_id,progress_id,subject_id,subject_name,org_code,subject_type_id,subject_type_name, - step_code,step_name,action_bureau,year,check_status,is_current,begin_time, - task_number,data_type,is_back_log,lixiang_time,org_name as xmdw - from t_gtzz_progress as ta where is_finish_flag <3 and progress_id in - ( - select max(progress_id) from t_gtzz_progress where step_code in - ( - #for(id:step_codes) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - and is_current = #(is_current) - #if(org_code) - and org_code='#(org_code)' - #end - #if(keyword) - and ((subject_name like '%#(keyword)%') or (task_number like '%#(keyword)%') or (org_name like '%#(keyword)%')) - #end - #if(begin_date) - and lixiang_time >= '#(begin_date)' - #end - #if(end_date) - and lixiang_time <= '#(end_date)' - #end - -- 专家 - #if(expert_person_id) - and subject_id in (select subject_id from t_gtzz_subject_expert where progress_id=0 and step_code in - ( - #for(id:step_codes) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - and person_id='#(expert_person_id)') - #end - -- 监理 - #if(jianli_person_id) - and subject_id in (select subject_id from t_gtzz_subject_jianli where step_code in - ( - #for(id:step_codes) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - and person_id='#(jianli_person_id)') - #end - -- 已上报,不显示退回 - #if(is_current==0) - and check_status<>2 - #end - group by subject_id, step_code - ) order by progress_id desc - #end - - - -- 哪些步骤有上传附件的需要 - #sql("getStepDocument") - select t1.step_code,t1.type_id,t2.type_name from t_gtzz_step_document as t1 - inner join t_gtzz_document_type as t2 on t1.type_id=t2.type_id - where 1=1 - #if(step_code) - and t1.step_code='#(step_code)' - #end - #end - - -- 获取指定项目的详细信息 - #sql("getSubjectExtInfo") - -- pay_flag:第二阶段业务完成标记(项目资金支付)(0:未完成 1:完成) - -- use_flag:项目启用废除标记(0:废除,1:启用) - -- delete_flag 删除标记(0:有效 1:删除) - -- task_type: 0培训 1新建 2维修 3绿化 4校园文化 5软件平台 6 购买服务 7安全 8装备 - -- 数据类型(0-新建 1-支付 2-续拨) - -- process_node_id: 流程节点id - -- process_node_name: 流程节点名称 - select t1.sn,(select parent_name from t_pro_detail where task_sn=t1.sn limit 1) as subject_type_name,t1.task_number,t1.task_title,t1.task_year,t1.ex_send_org_name,t1.pay_flag,t1.use_flag,t1.delete_flag,t1.task_type,t1.create_time,t1.data_type,t1.process_node_id,t1.process_node_name, - t2.itemvalue11 as xmjj, -- 项目简介 - t2.itemValue20 as ztz, -- 总投资 - t2.itemValue47 as zbj, -- 中标价(合同金额) - t2.itemValue20211 as pfje2021, -- 批复金额2021 - t2.itemValue20221 as pfje2022, -- 批复金额2022 - t2.itemValue20231 as pfje2023, -- 批复金额2023 - t2.itemValue20241 as pfje2024, -- 批复金额2024 - t2.itemValue20251 as pfje2025 -- 批复金额2025 - from t_pro_task as t1 left join t_pro_form_value as t2 on t2.task_sn=t1.sn - where t1.sn='#(task_sn)' - #end - - -- 填充项目数据 - #sql("fillSubject") - select t1.sn,t1.task_number,t1.task_title,t1.task_year,t1.ex_send_org_name,t1.task_type as subject_type_id , - t3.subject_type_name, t3.subject_type_name,t1.create_time - from t_pro_task as t1 - left join t_pro_form_value as t2 on t2.task_sn=t1.sn - left join t_gtzz_subject_type as t3 on t1.task_type=t3.subject_type_id - where - -- 只关心市直属学校的数据 - t1.ex_send_org_name in (select org_name from t_gtzz_school) - -- 立项通过,审批完成 - and t1.use_flag=1 and t1.draft_flag=0 and t1.close_flag=1 and t1.data_type=0 - -- 按申报时间倒序 - order by t1.create_time desc - #end - - -- 获取项目财务审批流水 - #sql("getSubjectPreInfo") - select handle_node_name,receive_user_name as send_user_name,msg_title, handle_opinion,create_time,modify_time - from t_pro_message where task_sn='#(task_sn)' and DELETE_FLAG=0 order by create_time - #end - -- 获取指定年份的项目查询列表 - #sql("getXmxcList") - select * from t_gtzz_progress where progress_id in - (select max(progress_id) from t_gtzz_progress group by subject_id) - #if(year) - and year=#(year) - #end - #if(org_code) - and org_code='#(org_code)' - #end - #if(year) - and year='#(year)' - #end - #if(subject_type_id) - and subject_type_id=#(subject_type_id) - #end - #if(keyword) - and subject_name like '%#(keyword)%' - #end - and step_code like '#(step_code)%' order by begin_time desc - #end - -- 获取符合条件的专家列表 - #sql("getExpertList") - select t1.*, - (select group_concat(zc_name) from t_gtzz_expert_domain as t2 where t1.person_id=t2.person_id group by t2.zc_id) zc_name - from t_gtzz_expert as t1 where b_use=1 - #if(keyword) - and t1.person_name like '%#(keyword)%' - #end - #if(zc_id) - and t1.person_id in (select person_id from t_gtzz_expert_domain where zc_id=#(zc_id)) - #end - order by t1.bureau_name,t1.person_name - #end - -- 项目查询列表之专家分配 - #sql("getSubjectListForSettingExpert") - select * from ( - select t1.*, - (select count(1) from t_gtzz_subject_expert as t2 where t1.subject_id=t2.subject_id and t2.step_code='#(step_code)' and t2.progress_id=0) as zj_count, - (select count(1) from t_gtzz_progress as t2 where t1.subject_id=t2.subject_id and t2.step_code='#(end_step_code)' ) as can_update - from t_gtzz_subject as t1 where - subject_id in (select subject_id from t_gtzz_progress where - step_code>='#(start_step_code)' and step_code<='#(end_step_code)' - #if(not_setting_zj) - and is_current=1 - #end - ) - #if(data_type) - and t1.data_type=#(data_type) - #end - - #if(begin_date) - and t1.lixiang_time between '#(begin_date)' and '#(end_date)' - #end - - #if(keyword) - and (t1.xmmc like '%#(keyword)%' or t1.xmdw like '%#(keyword)%' or t1.task_number like '%#(keyword)%') - #end - order by t1.lixiang_time - ) as ta where 1=1 - #if(setting_zj) - and ta.zj_count>0 - #end - #if(not_setting_zj) - and ta.zj_count=0 - #end - #end - -- 项目查询列表之监理公司分配 - #sql("getFenPeiJianLiList") - select * from ( - select t1.*, - (select progress_id from t_gtzz_progress as t2 where t1.subject_id=t2.subject_id order by progress_id desc limit 1 ) as progress_id, - (select max(step_code) from t_gtzz_progress as t2 where t2.subject_id=t1.subject_id) as last_step_code, - (select count(1) from t_gtzz_subject_jianli as t2 where t1.subject_id=t2.subject_id and t2.step_code='#(step_code)' and t2.person_id='-1') as no_need_jl, - (select count(1) from t_gtzz_subject_jianli as t2 where t1.subject_id=t2.subject_id and t2.step_code='#(step_code)') as jl_count, - (select count(1) from t_gtzz_progress as t2 where t1.subject_id=t2.subject_id and t2.step_code='#(end_step_code)') as can_update - from t_gtzz_subject as t1 where t1.bureau_id='#(bureau_id)' - #if(data_type) - and t1.data_type=#(data_type) - #end - #if(begin_date) - and t1.lixiang_time between '#(begin_date)' and '#(end_date)' - #end - #if(keyword) - and (t1.xmmc like '%#(keyword)%' or t1.xmdw like '%#(keyword)%' or t1.task_number like '%#(keyword)%' ) - #end - ) as ta where last_step_code>='0206' - #if(setting_jl) - and ta.jl_count>0 - #end - #if(not_setting_jl) - and ta.jl_count=0 - #end - order by ta.progress_id desc - #end - -- 获取指定处理流水中指定流水号的上传文件类型列表 - #sql("getProgressIdDocTypeList") - select ta.document_type_id,count(1) as c from - (select t1.progress_id,t2.* from t_gtzz_progress_file as t1 inner join t_gtzz_file as t2 on t1.file_id=t2.file_id) as ta - where ta.progress_id=#(progress_id) group by ta.document_type_id - #end - -- 综合查询(项目) - #sql("querySubject") - select t1.*, - (select progress_id from t_gtzz_progress where subject_id=t1.subject_id order by progress_id desc limit 1) as progress_id, - (select step_code from t_gtzz_progress where subject_id=t1.subject_id order by progress_id desc limit 1) as step_code - from t_gtzz_subject as t1 where 1=1 - #if(keyword) - and (t1.xmmc like '%#(keyword)%' or t1.task_number like '%#(keyword)%') - #end - #if(subject_type_ids) - and t1.subject_type_id in - ( - #for(id:subject_type_ids) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - #end - #if(org_code) - and t1.org_code='#(org_code)' - #end - #if(begin_date) - and (t1.lixiang_time between '#(begin_date)' and '#(end_date)') - #end - #if(data_type) - and t1.data_type=#(data_type) - #end - #if(sbnd) - and t1.sbnd=#(sbnd) - #end - #if(step_code) - and t1.subject_id in (select subject_id from t_gtzz_progress where is_current=#(is_current) and step_code like '#(step_code)%') - #end - #end - - -- 综合查询(项目关闭) - #sql("querySubjectForClose") - select *, - (select progress_id from t_gtzz_progress where subject_id=t1.subject_id order by progress_id desc limit 1) as progress_id, - (select step_code from t_gtzz_progress where subject_id=t1.subject_id order by progress_id desc limit 1) as step_code, - (select is_finish_flag from t_gtzz_progress where subject_id=t1.subject_id order by progress_id desc limit 1) as is_finish_flag - from t_gtzz_subject as t1 - where 1=1 - #if(keyword) - and (t1.xmmc like '%#(keyword)%' or t1.task_number like '%#(keyword)%') - #end - #if(subject_type_ids) - and t1.subject_type_id in - ( - #for(id:subject_type_ids) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - #end - #if(org_code) - and t1.org_code='#(org_code)' - #end - #if(begin_date) - and (t1.lixiang_time between '#(begin_date)' and '#(end_date)') - #end - #if(data_type) - and t1.data_type=#(data_type) - #end - #if(sbnd) - and t1.sbnd=#(sbnd) - #end - and (select t2.is_finish_flag from t_gtzz_progress as t2 where t2.subject_id=t1.subject_id order by t2.progress_id desc limit 1)=2 - #end - - -- 综合查询(文件) - #sql("queryFile") - select t2.*,t3.*,concat('/dsBase/upload/',t2.file_id,'.', t2.suffix) as url from t_gtzz_progress_file as t1 inner join t_gtzz_file as t2 on t1.file_id=t2.file_id - inner join t_gtzz_progress as t3 on t1.progress_id=t3.progress_id - where 1=1 - #if(keyword) - and((t3.subject_name like '%#(keyword)%') or (t3.task_number like '%#(keyword)%')) - #end - #if(document_type_ids) - and t2.document_type_id in - ( - #for(id:document_type_ids) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - #end - #if(subject_type_ids) - and t3.subject_type_id in - ( - #for(id:subject_type_ids) - #(for.index > 0 ? ", " : "") '#(id)' - #end - ) - #end - #if(org_code) - and t1.org_code='#(org_code)' - #end - #if(begin_date) - and t2.update_ts between '#(begin_date)' and '#(end_date)' - #end - #if(data_type) - and t3.data_type=#(data_type) - #end - #if(sbnd) - and t3.year=#(sbnd) - #end - #if(step_code) - and t3.step_code like '#(step_code)%' - #end - #end - -- 四个阶段的统计信息(市、校两级兼容) - #sql("tjTopFourStep") - select - (select count(1) from t_gtzz_sy_laststep where year=year(now())-1 - #if(org_code) - and org_code='#(org_code)' - #end - ) as xmlx, - (select count(1) from t_gtzz_sy_laststep where year=year(now())-1 - #if(org_code) - and org_code='#(org_code)' - #end - and step_code like '02%') as zbcg, - (select count(1) from t_gtzz_sy_laststep where year=year(now())-1 - #if(org_code) - and org_code='#(org_code)' - #end - and is_finish_flag=0 and step_code like '03%') as ssys, - (select count(1) from t_gtzz_sy_laststep where year=year(now())-1 - #if(org_code) - and org_code='#(org_code)' - #end - and is_finish_flag=1) as xmbf - #end - -- 今年项目概览(市专用) - #sql("tjSubjectSummaryCurrentYear") - select sum(subject_count) as subject_count, - sum(finish_count) as finish_count, - sum(close_count) as close_count, - sum(jz_count) as jz_count, - sum(yq_count) as yq_count, - ROUND(sum(money),2) as money - from t_gtzz_sy_base_year where year=year(now())-1 - #end - -- 逾期提醒(市、校两级兼容) - #sql("tjYqList") - select * from t_gtzz_sy_laststep where 1=1 - #if(org_code) - and org_code='#(org_code)' - #end - and yq_count>0; - #end - -- 项目待办(市、校两级兼容) - #sql("tjSubjectWaitStep") - select t1.step_code,t1.step_name,ifnull(t2.count,0) as count from t_gtzz_step as t1 left join ( - select step_code,count(1) as count from t_gtzz_sy_laststep - where is_current=1 and is_finish_flag<3 - #if(org_code) - and org_code='#(org_code)' - #end - group by step_code) as t2 on t1.step_code=t2.step_code where (t1.step_code like '02%' or t1.step_code like '03%') - #end - -- 今年项目分布(市专用) -- year=year(now()) - #sql("tjFenBu") - select * from - ( - select org_code,org_name,sum(subject_count) as subject_count,sum(finish_count) as finish_count, - sum(close_count) as close_count, - sum(jz_count) as jz_count, - sum(yq_count) as yq_count, - ROUND(sum(money),2) as money - from t_gtzz_sy_base_year where year=year(now())-1 - group by org_code,org_name - ) as ta order by ta.subject_count desc,money desc,finish_count desc - #end - -- 项目进展(学校专用) - #sql("tjxmJz") - select id,year,subject_id,subject_name,date_format(lixiang_time, '%Y-%m-%d') as lixiang_time,step_code,step_name, - step_order_id,big_step_name, - all_step_count,is_finish_flag,is_current,org_code,begin_time,end_time,duration,days_limit, - date_diff_count,create_time,yq_count from t_gtzz_sy_laststep where org_code='#(org_code)' - #end - -- 获取结转的项目列表 - #sql("getJzList") - select max(progress_id) as progress_id, - subject_id,org_code,org_name,subject_name,subject_type_id,subject_type_name, - year,step_code,step_name,begin_time,end_time,action_bureau,input_value,radio_id, - is_current,is_back_log,is_finish_flag,check_status,lixiang_time,bxlx_name,cxlx_name, - jsfa_type_id,task_number,data_type,is_finish_time from t_gtzz_progress where org_code='#(org_code)' - and is_finish_flag=#(is_finish_flag) - group by subject_id order by progress_id - #end - -- 归档列表 - #sql("getGdList") - select org_code,org_name, sum(subject_count) as subject_count, sum(finish_count) as finish_count, - sum(close_count) as close_count, sum(jz_count) as jz_count, sum(yq_count) as yq_count,ROUND(sum(money),2) as money - from t_gtzz_sy_base_year where 1=1 - #if(year) - and year=#(year) - #end - #if(org_code) - and org_code='#(org_code)' - #end - group by org_code,org_name order by sum(subject_count) desc - #end - -- 获取监理项目列表 - #sql("getJlSubjectList") - select * from (select t1.*, - ifnull((select count(distinct group_question_id) from t_gtzz_jianli_question as t2 where t2.subject_id=t1.subject_id),0) as question_count, - ifnull((select count(distinct group_question_id) from t_gtzz_jianli_question as t2 where t2.subject_id=t1.subject_id and t2.state_id=3),0) as finish_count, - (select t4.begin_time from t_gtzz_progress as t4 where t4.subject_id=t1.subject_id and t4.step_code='0301' and t4.progress_id='#(being_date)' and ta.qd_time <='#(end_date) 23:59:59' - #end - #if(keyword) - and (ta.subject_name like '%#(keyword)%' or ta.org_name like '%#(keyword)%') - #end - order by ta.begin_time desc - #end - -- 获取指定项目的监理流水 - #sql("getSubjectQuestion") - select t1.* from t_gtzz_jianli_question as t1 where t1.group_question_id=t1.progress_id - and t1.subject_id=#(subject_id) - #if(question_level_id) - and t1.question_level_id=#(question_level_id) - #end - #if(question_type_id) - and t1.question_type_id=#(question_type_id) - #end - #if(begin_date) - and t1.create_time between '#(begin_date)' and '#(end_date) 23:59:59' - #end - #if(state_id) - and t1.state_id=#(state_id) - #end - order by t1.progress_id desc - #end - -- ==========统计分析 ============================================================================================================================================ - -- p_shouye_init_base_year - -- 插入单位数据 - -- 刷新频率:项目变更+项目单位变更 - -- 策略:项目变更时更新 - #sql("insertBureauData") - insert into t_gtzz_sy_base_year(org_code,org_name,year) - select t1.org_code,t1.org_name,t2.year from t_gtzz_school as t1 cross join - (select distinct sbnd as year from t_gtzz_subject) as t2 - #end - - -- 按年度更新项目总数 - -- 策略:项目变更时更新 - #sql("updateProjectCountByYear") - update t_gtzz_sy_base_year as t1, (select org_code,sbnd,count(1) as subject_count from t_gtzz_subject group by org_code,sbnd) as t2 - set t1.subject_count=t2.subject_count where t1.org_code=t2.org_code and t1.year=t2.sbnd; - #end - - -- 按年度更新预算金额 - #sql("updateMoneyByYear") - update t_gtzz_sy_base_year p,(select org_code,sbnd, sum(ifnull(money,0)) as money - from t_gtzz_subject group by org_code,sbnd) as s set p.money = s.money - where p.org_code = s.org_code and p.year=s.sbnd - #end - - -- p_shouye_init_laststep - #sql("get_02_step_count") - select count(1) as c from (select step_order_id from t_gtzz_step where step_code like '02%' and LENGTH(step_code)=4 group by step_order_id ) as t1 - #end - - #sql("get_03_step_count") - select count(1) as c from (select step_order_id from t_gtzz_step where step_code like '03%' and LENGTH(step_code)=4 group by step_order_id ) as t1 - #end - - -- 按年度+单位查询完成个数、关闭个数、延期个数 - #sql("getRefreshCountByYearOrgCode") - select t1.id, t1.year,t1.org_code, - (select count(distinct t2.subject_id) from t_gtzz_progress as t2 where t2.is_finish_flag=1 and t2.year=t1.year and t2.org_code=t1.org_code) as c1, - (select count(distinct t2.subject_id) from t_gtzz_progress as t2 where t2.is_finish_flag=2 and t2.year=t1.year and t2.org_code=t1.org_code) as c2, - (select ifnull(sum(t2.yq_count),0) from t_gtzz_sy_laststep as t2 where t2.year =t1.year and t2.org_code =t1.org_code) as c3 - from t_gtzz_sy_base_year as t1 - #end - -- 0:未完成项目流程,1:已完成项目流程,2:项目流程已取消,3:项目结转,本年结束,转入明年。 - #sql("laststep_1") - insert into t_gtzz_sy_laststep(year,subject_id,step_code,is_finish_flag,is_current,org_code,begin_time,end_time,subject_name,lixiang_time) - select year,subject_id,step_code,is_finish_flag,is_current,org_code,begin_time,end_time,subject_name,lixiang_time from t_gtzz_progress where progress_id in - (select progress_id from (select max(progress_id),subject_id from t_gtzz_progress group by subject_id) as ta) - #end - -- 对于结束时间为空的,写入当前时间 - #sql("laststep_2") - update t_gtzz_sy_laststep set end_time=now() where end_time is null - #end - -- 补充步骤名称和内部排序号 - #sql("laststep_3") - update t_gtzz_sy_laststep as t1,t_gtzz_step as t2 set t1.step_name=t2.step_name,t1.days_limit=t2.days_limit where t1.step_code=t2.step_code - #end - #sql("laststep_4") - update t_gtzz_sy_laststep as t1,t_gtzz_step as t2 set t1.step_order_id=t2.in_order_id where t1.step_code=t2.step_code and t1.step_code like '02%' - #end - #sql("laststep_5") - update t_gtzz_sy_laststep as t1,t_gtzz_step as t2 set t1.step_order_id=#para(v_02_step_count)+t2.in_order_id where t1.step_code=t2.step_code and t1.step_code like '03%' - #end - -- 补充大类名称 - -- 写入运行时长 - -- 写入超时时长 - #sql("laststep_6") - update t_gtzz_sy_laststep as t1 set t1.duration=datediff(end_time,begin_time), - t1.date_diff_count=days_limit-duration, - t1.big_step_name=(select step_name from t_gtzz_step as t2 where substr(t1.step_code,1,2)=t2.step_code), - t1.all_step_count=#para(v_02_step_count)+#para(v_03_step_count) - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/loginPerson.sql b/dsBase/target/classes/Sql/loginPerson.sql deleted file mode 100644 index 7a150e6f..00000000 --- a/dsBase/target/classes/Sql/loginPerson.sql +++ /dev/null @@ -1,251 +0,0 @@ --- 登录命名空间 -#namespace("loginPerson") - - -- 获取指定身份的最大主键号 - #sql("getMaxPkByIdentityId") - select ifnull(max(identity_pk_num),0) as identity_pk_num from t_sys_loginperson where identity_id=? - #end - -- 删除一个人员:通过单位ID - #sql("deletePersonByBureauId") - update t_sys_loginperson set b_use=0,operator=?,ip_address=? where bureau_id=? and identity_id=4 - #end - - -- 删除一个人员:通过人员编号 - #sql("deletePersonById") - UPDATE t_sys_loginperson - SET b_use = 0,status_code=?,operator=?,ip_address=? - WHERE - person_id = ? - #end - - -- 根据学生ID获取家长ID - #sql("getParentInfoByStudentId") - select person_id from t_sys_loginperson where p_child_id=? - #end - - -- 修改密码 - #sql("changePwd") - update t_sys_loginperson set operator=?,ip_address=?,original_pwd=?,pwd=?,pwdmd5=? where person_id=? - #end - - -- 获取指定人员所在的区域信息 - #sql("getLoginPersonAreaInfo") - select city_id,area_id from t_sys_loginperson where person_id=? - #end - - -- 根据person_id获取是否已绑定了手机号 - #sql("getIsBindPhoneNum") - select ifnull(telephone, 0) as telephone from t_sys_loginperson where b_use = 1 and person_id = ? - #end - - -- 根据person_id获取是否已绑定了邮箱 - #sql("getIsBindEmail") - select ifnull(email, 0) as email from t_sys_loginperson where b_use = 1 and person_id = ? - #end - - -- 根据person_id获取是否已绑定了QQ - #sql("getIsBindQq") - select ifnull(qq_openid, 0) as qq_openid from t_sys_loginperson where b_use = 1 and person_id = ? - #end - - -- 根据person_id获取是否已绑定了微信 - #sql("getIsBindWx") - select ifnull(wx_openid, 0) as wx_openid from t_sys_loginperson where b_use = 1 and person_id = ? - #end - - -- 人员与手机号绑定 - #sql("bindPersonPhoneNum") - update t_sys_loginperson set telephone= ?,operator=?,ip_address=? where person_id = ? - #end - - -- 人员与邮箱绑定 - #sql("bindPersonEmail") - update t_sys_loginperson set email= ?,operator=?,ip_address=? where person_id = ? - #end - - -- 获取一个QQ的openId获了是否已存在 - #sql("getQqOpenIdIsExist") - select person_id from t_sys_loginperson where b_use = 1 and qq_openid =? - #end - - -- 绑定QQ - #sql("bindPersonQq") - update t_sys_loginperson set qq_openid= ?,operator=?,ip_address=? where person_id = ? - #end - - -- 获取一个微信的openId获了是否已存在 - #sql("getWxOpenIdIsExist") - select person_id from t_sys_loginperson where b_use = 1 and wx_openid =? - #end - - -- 绑定微信 - #sql("bindPersonWx") - update t_sys_loginperson set wx_openid= ?,operator=?,ip_address=? where person_id = ? - #end - - -- 根据人员的ID获取此人员的登录信息 - #sql("getLoginInfoByPersonId") -select person_id,person_name,identity_id,login_name,pwd,original_pwd,xb,zzmm,mz,idcard_code,birthday,create_time,sort_id,telephone,wx_openid,qq_openid,email,status_code,b_use,identity_pk_num,city_id,area_id,main_school_id,bureau_id,org_id,s_class_id,s_xjh,s_xjfh,s_source, - t_duty_charge,t_xl_id,t_zc_id,t_stage_id,t_subject_id,telephone,date_format(t_teaching_date,'%Y-%m-%d') as t_teaching_date,p_child_id, - update_ts from t_sys_loginperson where person_id =? - #end - - -- 根据单位号获取下面正常教师的个数 - #sql("getTeacherCountByBureauId") - select count(1) as c from t_sys_loginperson where bureau_id=? and b_use=1 and identity_id=5 - #end - - -- 根据部门获取下面正常教师的个数 - #sql("getTeacherCountByOrgId") - select count(1) as c from t_sys_loginperson where org_id=? and b_use=1 and identity_id=5 - #end - - -- 根据单位号获取下面正常学生的个数 - #sql("getStudentCountByBureauId") - select count(1) as c from t_sys_loginperson where bureau_id=? and b_use=1 and identity_id=6 - #end - - -- 根据单位号获取下面正常家长的个数 - #sql("getParentCountByBureauId") - select count(1) as c from t_sys_loginperson where bureau_id=? and b_use=1 and identity_id=7 - #end - - -- 根据身份证号获取是否存在 - #sql("getIdCardIsExist") - select person_id from t_sys_loginperson where b_use = 1 and idcard_code=? - #end - - -- 根据手机号获取是否存在 - #sql("getTelephoneIsExist") - select person_id from t_sys_loginperson where b_use = 1 and telephone=? - #end - - -- 根据邮箱获取是否存在 - #sql("getEmailIsExist") - select person_id from t_sys_loginperson where b_use = 1 and email=? - #end - - -- 根据身份证号和人员ID获取是否存在 - #sql("getIdCardIsExistByPersonId") - select person_id from t_sys_loginperson where b_use = 1 and idcard_code=? and person_id<>? - #end - - -- 根据手机号和人员ID获取是否存在 - #sql("getTelephoneIsExistByPersonId") - select person_id from t_sys_loginperson where b_use = 1 and telephone=? and person_id<>? - #end - - -- 根据邮箱获和人员ID获取是否存在 - #sql("getEmailIsExistByPersonId") - select person_id from t_sys_loginperson where b_use = 1 and email=? and person_id<>? - #end - - - -- 市管理员 - #sql("getPrintCityManager") - select person_id,person_name,login_name,original_pwd,pwd from t_sys_loginperson where identity_id =2 order by sort_id - #end - - -- 市直属单位 - #sql("getPrintCityBureau") - select person_id,person_name,login_name,original_pwd,pwd from t_sys_loginperson where identity_id =4 - order by sort_id - #end - - -- 县区管理员 - #sql("getPrintAreaManager") - select person_id,person_name,login_name,original_pwd,pwd from t_sys_loginperson where identity_id =3 order by sort_id - #end - - -- 指定县区的单位 - #sql("getPrintAreaBureau") - select person_id,person_name,login_name,original_pwd,pwd from t_sys_loginperson where identity_id =4 and area_id=#para(0) order by sort_id - #end - -- 更改人员的所在部门 - #sql("changePersonBureau") - update t_sys_loginperson set city_id=?,area_id=?,main_school_id=?,bureau_id=?,org_id=?,operator=?,ip_address=? where person_id=? - #end - - -- 更改学生、家长的所在班级 - #sql("changePersonClass") - update t_sys_loginperson set city_id=?,area_id=?,main_school_id=?,bureau_id=?,s_class_id=?,operator=?,ip_address=? where person_id=? - #end - - -- 检查身份证号与数据库中的身份证号重复,教师 - #sql("checkRepeatidcardByTeacherImport") - select t1.idcard_code from t_import_teacher_by_excel as t1 where t1.batch_id=? - and t1.idcard_code_aes in (select idcard_code from t_sys_loginperson as t2 where t2.b_use=1) - #end - -- 检查身份证号与数据库中的身份证号重复,学生 - #sql("checkRepeatidcardByStudentImport") - select t1.idcard_code from t_import_student_by_excel as t1 where t1.batch_id=? - and t1.idcard_code_aes in (select idcard_code from t_sys_loginperson as t2 where t2.b_use=1) - #end - - -- 使用单位ID填充部门ID - #sql("fillOrgIdByBureauId") - update t_import_teacher_by_excel set org_id=bureau_id where batch_id=? and org_name='' - #end - - -- 有哪些部门需要检查 - #sql("needCheckOrgName") - select org_name from t_import_teacher_by_excel where batch_id=? and org_name!='' group by org_name - #end - - -- 有哪些班级需要检查 - #sql("needCheckClassName") - select class_name,stage_id from t_import_student_by_excel where batch_id=? group by class_name,stage_id - #end - - -- 找到本次教师导入批次的组织机构名称有哪些 - #sql("selectBatchInfoTeacher") - select * from t_import_teacher_by_excel where batch_id=? - #end - #sql("selectBatchInfoStudent") - select * from t_import_student_by_excel where batch_id=? - #end - - -- 根据导入的ID,修改部门编号 - #sql("UpdateOrgIdByImportTeacherId") - update t_import_teacher_by_excel set org_id=? where id=? - #end - - -- 根据导入的ID,修改班级编号 - #sql("UpdateOrgIdByImportStudentId") - update t_import_student_by_excel set class_id=? where id=? - #end - - --删除导入的临时数据,通过batchId - #sql("deleteByBatchId") - delete from t_import_teacher_by_excel where batch_id=? - #end - - -- 根据人员ID,获取教师的学段id - #sql("getStageInfoByTeacherId") - select t_stage_id as s_stage_id from t_sys_loginperson where person_id=? - #end - -- 根据人员ID,获取学生的学段id - #sql("getStageInfoByStudentId") - select s_stage_id from t_sys_loginperson where person_id=? - #end --- 根据人员ID,获取家长的学段id - #sql("getStageInfoByParentId") - select s_stage_id from t_sys_loginperson where person_id=? - #end - - -- 根据主、子账号获取信息 - #sql("getMountAccountInfo") - select id,person_id,identity_id,main_person_id,main_identity_id,account_type from t_sys_account_mount where main_person_id = ? and person_id = ? - #end - - -- 挂载子账号 - #sql("mountSubAccount") - insert into t_sys_account_mount (person_id,identity_id,main_person_id,main_identity_id,account_type) values (?,?,?,?,?) - #end - - -- 根据人员ID和密码,验证是不是合法,用于修改新密码 - #sql("checkPwdByPersonId") - select count(*) as c from t_sys_loginperson where person_id=? and pwd=? - #end - -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/menu.sql b/dsBase/target/classes/Sql/menu.sql deleted file mode 100644 index 360b8830..00000000 --- a/dsBase/target/classes/Sql/menu.sql +++ /dev/null @@ -1,78 +0,0 @@ --- 菜单命名空间 -#namespace("menu") - -- 获取获取异步接口 - #sql("selectChildAsync") -select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,t1.create_time,t1.update_ts,t1.level_id, - (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf -from t_base_menu as t1 where parent_id=? order by t1.sort_id - #end - - -- 获取全部菜单 - #sql("selectAll") - select t1.menu_id as id,t1.menu_name as name,t1.parent_id as pId,t1.sort_id,t1.url,t1.memo,t1.create_time,t1.update_ts,t1.level_id, - (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf - from t_base_menu as t1 order by t1.sort_id - #end - -- 获取所有不为学校提供的数据 - #sql("selectNotForSchool") - select menu_id from t_base_menu where for_school=0 - #end - -- 获取所有不为单位提供的数据 - #sql("selectNotForBureau") - select menu_id from t_base_menu where for_bureau=0 - #end - - --删除指定菜单ID - #sql("deletePrivilageByMenuId") - delete from t_base_menu_privilage where menu_id=? - #end - - -- 根据菜单ID返回这个菜单的可用身份 - #sql("selectIdentityByMenuId") -select identity_id from t_base_menu_privilage where menu_id=? - #end - - -- 获取指定的节点信息 - #sql("selectSingle") - select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo, - t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau, - t1.icon,t1.isFull, - (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf - from t_base_menu as t1 where t1.menu_id=? - #end - - -- 通过身份获取有哪些菜单ID - #sql("selectMenuByIdentityId") - select menu_id from t_base_menu_privilage where identity_id=? - union - select 1 - #end - - -- 查询菜单的ids - #sql("selectMenuForIds") - select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,t1.create_time,t1.update_ts,t1.level_id, - (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf - from t_base_menu as t1 where t1.menu_id in - ( - #for(x:ids) - #(for.index == 0 ? "" : ",") #para(x) - #end - ) order by t1.sort_id - #end - - -- 删除指定职务+分管工作的所有菜单,准备重新设置 - #sql("deleteMenuByDutyInCharge") - delete from t_base_principalship_menu where duties_id=#(duties_id) and in_charge_id=#(in_charge_id) - #end - - -- 获取指定职务+分管工作的所有菜单,用于显示 - #sql("selectMenuByDutyInCharge") - select duties_id,in_charge_id,menu_id from t_base_principalship_menu where duties_id=? and in_charge_id=? - #end - - -- 人员根据职务+分管工作可见的菜单 - #sql("selectMenuByPersonId") - select distinct menu_id from t_base_principalship_menu as t1 inner join t_person_duty_charge as t2 on t1.duties_id=t2.`duties_id` - and t1.in_charge_id=t2.`in_charge_id` where t2.person_id=? and t2.b_use=1 - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/organization.sql b/dsBase/target/classes/Sql/organization.sql deleted file mode 100644 index 09c0c270..00000000 --- a/dsBase/target/classes/Sql/organization.sql +++ /dev/null @@ -1,122 +0,0 @@ --- 组织机构命名空间 -#namespace("organization") - - -- 获取组织机构的最大主键号 - #sql("getMaxPkByOrg") - select ifnull(max(org_pk_num),0) as org_pk_num from t_base_organization - #end - -- 获取指定单位或组织机构的信息 - #sql("getOrgInfoById") - select org_id,org_code,org_name,parent_id,org_type_id,school_type_id,sort_id,create_time,department_type_id, - update_ts,b_use,org_pk_num,ifnull(city_id, -1) as city_id,ifnull(area_id, -1) as area_id, - ifnull(main_school_id, -1) as main_school_id,bureau_id,property_id,level_id - from t_base_organization where org_id=? and b_use=1 - #end - - -- 判断一个组织机构号是不是单位 - #sql("IsBureau") - select count(1) as c from t_base_organization where org_id=? and org_id=bureau_id - #end - - - -- 根据单位号获取下面正常部门的个数 - #sql("getOrgCountByBureauId") - select count(1) as c from t_base_organization where bureau_id=? and org_id<>? and b_use=1 - #end - - - -- 删除一个机构 - #sql("deleteOrgById") - update t_base_organization set b_use=0,operator=?,ip_address=? where org_id=? - #end - - -- 判断此ORG_CODE是不是存在 - #sql("getOrgCodeCount") - select count(1) as c from t_base_organization where org_code=? and b_use=1 - #end - - -- 判断此ORG_CODE是不是存在(排除自己用于修改) - #sql("getOrgCodeCountExceptSelf") - select count(1) as c from t_base_organization where org_code=? and org_id!=? and b_use=1 - #end - - -- 获取部门列表 - #sql("getOrgList") - select * from t_base_organization where parent_id=#para(0) and b_use=1 order by sort_id - #end - - -- 获取学校列表 - #sql("getSchoolList") - select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id,t1.school_type_id,t1.sort_id, - t1.create_time,t1.update_ts,t1.b_use,t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id, - (select t2.school_type_name from t_dm_schooltype as t2 where t2.school_type_id=t1.school_type_id) as school_type_name - from t_base_organization as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.school_type_id>0 - #end - - -- 获取学校列表(指定学校类型) - #sql("getSchoolListBySchoolType") - select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id, - t1.school_type_id,t1.sort_id,t1.create_time,t1.update_ts,t1.b_use, - t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id, - (select t2.school_type_name from t_dm_schooltype as t2 where t2.school_type_id=t1.school_type_id) as school_type_name - from t_base_organization as t1 where t1.parent_id=#para(0) and t1.b_use=1 and t1.school_type_id =#para(1) - #end - - - -- 获取单位列表 - #sql("getBureauList") - select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id, - (select t2.name from t_base_org_type_principalship as t2 WHERE t2.id=t1.org_type_id) as org_type_name, - t1.school_type_id,t1.sort_id,t1.create_time, - t1.update_ts,t1.b_use,t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id - from t_base_organization as t1 where t1.parent_id=#para(0) and t1.school_type_id<=0 and t1.b_use=1 order by t1.sort_id,t1.update_ts - #end - - -- 获取单位列表(指定单位类型) - #sql("getBureauListByBureauType") - select t1.org_id,t1.org_code,t1.org_name,t1.parent_id,t1.org_type_id, - (select t2.name from t_base_org_type_principalship as t2 WHERE t2.id=t1.org_type_id) as org_type_name, - t1.school_type_id,t1.sort_id,t1.create_time, - t1.update_ts,t1.b_use,t1.org_pk_num,t1.city_id,t1.area_id,t1.main_school_id,t1.bureau_id - from t_base_organization as t1 where t1.parent_id=#para(0) and t1.school_type_id<=0 and t1.org_type_id = #para(1) - and t1.b_use=1 order by t1.sort_id,t1.update_ts - #end - - -- 组织机构部门树 - #sql("getOrgTreeByBureauId") - select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,school_type_id,department_type_id from t_base_organization where bureau_id=? - and b_use=1 order by sort_id,update_ts - #end - - -- 传入一个区域ID,获取它下面的学校 - #sql("getSchoolListByAreaId") - select org_id,org_code,org_name from t_base_organization where (city_id=#para(0) or area_id=#para(1)) and b_use=1 and is_bureau=1 - and org_name like #para(2) and school_type_id>0 order by area_id,sort_id - #end - -- 传入一个区域ID,获取它下面的单位 - #sql("getBureauListByAreaId") - select org_id,org_code,org_name from t_base_organization where (city_id=#para(0) or area_id=#para(1)) and b_use=1 and is_bureau=1 - and org_name like #para(2) and school_type_id<=0 order by area_id,sort_id - #end - -- 传入一个区域ID,获取它下面全部 - #sql("getAllListByAreaId") - select org_id,org_code,org_name from t_base_organization where (city_id=#para(0) or area_id=#para(1)) and b_use=1 and is_bureau=1 - and org_name like #para(2) order by area_id,sort_id - #end - - --传入一个单位ID,获取它的一级部门有哪些 - #sql("getFirstLevelOrgName") - select org_id,org_name from t_base_organization where bureau_id=? and parent_id=? and b_use=1 - #end - - #sql("getZyClassSelectTreeLevel1") - select t1.org_id,t1.org_name,t1.parent_id,(select count(1) from t_base_organization as t2 where t1.parent_id=t2.org_id) as cnt - from t_base_organization as t1 where t1.bureau_id='#(bureau_id)' - and ((t1.department_type_id =1) or (t1.department_type_id =2 and t1.parent_id='#(bureau_id)')) - #end - - #sql("getZyClassSelectTreeLevel2") - select org_id,org_name,parent_id,0 as cnt from t_base_organization where bureau_id='#(bureau_id)' - and (department_type_id =2 and parent_id<>'#(bureau_id)') - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/student.sql b/dsBase/target/classes/Sql/student.sql deleted file mode 100644 index 283f6939..00000000 --- a/dsBase/target/classes/Sql/student.sql +++ /dev/null @@ -1,67 +0,0 @@ -#namespace("student") - - -- 根据学生的ID获取家长的信息 - #sql("getParentByChildId") - select * from t_sys_loginperson where p_child_id=? - #end - - -- 获取学生列表 - #sql("getStudentOrParentList") - SELECT - t1.person_id, - t1.person_name, - t1.login_name, - IFNULL(t1.xb, '1') AS xb, - t1.original_pwd, - t1.pwd, - (select count(*) as c from t_transfer_apply as t2 where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1) - as apply_status - FROM - t_sys_loginperson as t1 - WHERE - t1.b_use = 1 - AND t1.identity_id = #para(0) - AND t1.s_class_id = #para(1) order by t1.sort_id - #end - - -- 获取学生列表按学生姓名 - #sql("getStudentOrParentListByPersonName") - SELECT - t1.person_id, - t1.person_name, - t1.login_name, - IFNULL(t1.xb, '1') AS xb, - t1.original_pwd, - (select count(*) as c from t_transfer_apply as t2 where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1) - as apply_status - FROM - t_sys_loginperson as t1 - WHERE - t1.b_use = 1 - AND t1.identity_id = #para(0) - AND t1.s_class_id = #para(1) - AND t1.person_name LIKE concat('%',#para(2),'%') order by t1.sort_id - #end - - - -- 根据学生ID获取学生信息 - #sql("getStudentInfoByPersonId") - SELECT - person_id, - person_name, - IFNULL(xb, '1') AS xb, - IFNULL(mz, '01') AS mz, - idcard_code, - birthday, - zzmm, - (case when s_xjh='-1' then '' else s_xjh end) AS xjh, - (case when s_xjfh='-1' then '' else s_xjfh end) AS xjfh, - s_source AS stu_source, - sort_id - FROM - t_sys_loginperson - WHERE - b_use = 1 - AND person_id = ? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/studentYd.sql b/dsBase/target/classes/Sql/studentYd.sql deleted file mode 100644 index c5b9d4bb..00000000 --- a/dsBase/target/classes/Sql/studentYd.sql +++ /dev/null @@ -1,91 +0,0 @@ -#namespace("studentYd") - - -- 获取学生状态列表 - #sql("get_dm_status_student") - select status_code,status_name,b_use,change_person_b_use,is_show from t_dm_status_student where b_use=1 and is_show=1 - #end - - -- 获取学生状态列表ByCode - #sql("get_dm_status_student_by_code") - select status_code,status_name,b_use,change_person_b_use,is_show from t_dm_status_student where b_use=1 and is_show=1 and status_code=? - #end - - -- 修改人员主表的人员状态 - #sql("updateStudentStatus") - update t_sys_loginperson set b_use=?,status_code=?,operator=?,ip_address=? where person_id=? - #end - - - -- 判断一个学生是不是可以申请调转 - #sql("checkAllowStudentTransferApply") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where t1.b_use=1 and t1.person_id=? order by t1.apply_time desc - #end - - -- 获取学生调动申请列表 - #sql("getStudentTransferApplyList") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.class_name from t_base_class as t2 where t2.class_id=(select t3.s_class_id from t_sys_loginperson as t3 where t3.person_id=t1.person_id)) as class_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where t1.source_bureau_id=#para(0) and t1.person_name LIKE concat('%',#para(1),'%') - and t1.b_use=1 and t1.identity_id=6 order by t1.apply_time desc - #end - - -- 获取学生调动反馈列表 - #sql("getStudentTransferEchoList") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.class_name from t_base_class as t2 where t2.class_id=(select t3.s_class_id from t_sys_loginperson as t3 where t3.person_id=t1.person_id)) as class_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where t1.target_bureau_id=#para(0) - and t1.person_name LIKE concat('%',#para(1),'%') and t1.b_use=1 and t1.identity_id=6 - order by t1.apply_time desc - #end - - -- 获取指定ID的学生调转申请 - #sql("getStudentTransferInfoById") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.class_name from t_base_class as t2 where t2.class_id=(select t3.s_class_id from t_sys_loginperson as t3 where t3.person_id=t1.person_id)) as class_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where id=? - #end - - -- 删除指定的调转ID - #sql("deleteTransferInfoById") - update t_transfer_apply set b_use=0,operator=?,ip_address=? where id=? - #end - - -- 获取学生调转申请的未读取个数 - #sql("getNewStudentTransferApplyCount") - select count(1) as c from t_transfer_apply where b_use=1 and target_is_read=0 and status_id=1 - and target_bureau_id=? and identity_id=6 - #end - - -- 教师调转提醒(收到新的回执) - #sql("getNewStudentTransferEchoCount") - select count(1) as c from t_transfer_apply where b_use=1 and source_is_read=0 and status_id>1 - and source_bureau_id=? and identity_id=6 - #end - - -- 调转的三种状态 - #sql("getTransferApplyStatus") - select apply_status_id,apply_status_name,for_check from t_transfer_apply_status where for_check=1 - #end - - --判断一个人是不是处于待审核状态 - #sql("getPersonStatus") - select count(*) as c from t_transfer_apply where person_id=? and b_use=1 and status_id=1 - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/teacher.sql b/dsBase/target/classes/Sql/teacher.sql deleted file mode 100644 index 5b33494c..00000000 --- a/dsBase/target/classes/Sql/teacher.sql +++ /dev/null @@ -1,90 +0,0 @@ -#namespace("teacher") - - -- 通过部门ID获取教师列表 - #sql("getTeacherListByOrgId") - SELECT - t1.person_id, - t1.person_name, - t1.login_name, - IFNULL(t1.xb, '1') AS xb, - t1.original_pwd, - t1.pwd, - (select count(*) as c from t_transfer_apply as t2 where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1) - as apply_status - FROM - t_sys_loginperson as t1 - WHERE - t1.b_use = 1 - AND t1.identity_id = 5 - AND t1.org_id = #para(0) order by t1.sort_id - #end - - -- 通过单位ID获取教师列表 - #sql("getTeacherListByBureauId") - SELECT - t1.person_id, - t1.person_name, - t1.login_name, - IFNULL(t1.xb, '1') AS xb, - t1.original_pwd, - t1.pwd, - (select count(*) as c from t_transfer_apply as t2 where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1) - as apply_status - FROM - t_sys_loginperson as t1 - WHERE - t1.b_use = 1 - AND t1.identity_id = 5 - AND t1.bureau_id = #para(0) order by t1.sort_id - #end - - -- 按教师姓名获取教师列表 - #sql("getTeacherListByOrgIdPersonName") - SELECT - t1.person_id, - t1.person_name, - t1.login_name, - IFNULL(t1.xb, '1') AS xb, - t1.original_pwd, - t1.pwd, - (select count(*) as c from t_transfer_apply as t2 where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1) - as apply_status - FROM - t_sys_loginperson as t1 - WHERE - t1.b_use = 1 - AND t1.identity_id = 5 - AND t1.org_id = #para(0) - AND t1.person_name LIKE concat('%',#para(1),'%') order by t1.sort_id - #end - - -- 按教师姓名,通过单位 获取教师列表 - #sql("getTeacherListByPersonNameAndBureauId") - SELECT - t1.person_id, - t1.person_name, - t1.login_name, - IFNULL(t1.xb, '1') AS xb, - t1.original_pwd, - t1.pwd, - (select count(*) as c from t_transfer_apply as t2 where t2.person_id=t1.person_id and t2.status_id=1 and t2.b_use=1) - as apply_status - FROM - t_sys_loginperson as t1 - WHERE - t1.b_use = 1 - AND t1.identity_id = 5 - AND t1.bureau_id = #para(0) - AND t1.person_name LIKE concat('%',#para(1),'%') order by t1.sort_id - #end - - -- 更改人员的部门 - #sql("changeOrgByPersonIdAndOrgId") - update t_sys_loginperson set org_id=?,operator=?,ip_address=? where person_id=? - #end - - --删除指定人员的职务与分管工作 - #sql("deleteDutuesAndChargeByPersonId") - update t_person_duty_charge set b_use=0,operator=?,ip_address=? where person_id=? - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/Sql/teacherYd.sql b/dsBase/target/classes/Sql/teacherYd.sql deleted file mode 100644 index ba4c82c9..00000000 --- a/dsBase/target/classes/Sql/teacherYd.sql +++ /dev/null @@ -1,88 +0,0 @@ -#namespace("teacherYd") - - -- 获取教师状态列表 - #sql("get_dm_status_teacher") - select status_code,status_name,b_use,change_person_b_use,is_show from t_dm_status_teacher where b_use=1 and is_show=1 - #end - - -- 获取教师状态列表ByCode - #sql("get_dm_status_teacher_by_code") - select status_code,status_name,b_use,change_person_b_use from t_dm_status_teacher where b_use=1 and is_show=1 and status_code=? - #end - - -- 修改人员主表的人员状态 - #sql("updateTeacherStatus") - update t_sys_loginperson set b_use=?,status_code=?,operator=?,ip_address=? where person_id=? - #end - - - -- 判断一个教师是不是可以申请调转 - #sql("checkAllowTeacherTransferApply") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where t1.b_use=1 and t1.person_id=? order by t1.apply_time desc - #end - - -- 获取教师调动申请列表 - #sql("getTeacherTransferApplyList") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where t1.source_bureau_id=#para(0) and t1.person_name LIKE concat('%',#para(1),'%') - and t1.b_use=1 and t1.identity_id=5 order by t1.apply_time desc - #end - - -- 获取教师调动反馈列表 - #sql("getTeacherTransferEchoList") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where t1.target_bureau_id=#para(0) - and t1.person_name LIKE concat('%',#para(1),'%') and t1.b_use=1 and t1.identity_id=5 - order by t1.apply_time desc - #end - - -- 获取指定ID的教师调转申请 - #sql("getTeacherTransferInfoById") - select t1.id,t1.source_bureau_id,t1.target_bureau_id, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.source_bureau_id) as source_bureau_name, - (select t2.org_name from t_base_organization as t2 where t2.org_id=t1.target_bureau_id) as target_bureau_name, - t1.identity_id,t1.person_id,t1.person_name,t1.status_id,t1.target_is_read,t1.source_is_read,t1.apply_time, - t1.apply_message,t1.echo_time,t1.echo_message,t1.b_use - from t_transfer_apply as t1 where id=? - #end - - -- 删除指定的调转ID - #sql("deleteTransferInfoById") - update t_transfer_apply set b_use=0,operator=?,ip_address=? where id=? - #end - - -- 获取教师调转申请的未读取个数 - #sql("getNewTeacherTransferApplyCount") - select count(1) as c from t_transfer_apply where b_use=1 and target_is_read=0 and status_id=1 and - target_bureau_id=? and identity_id=5 - #end - - -- 教师调转提醒(收到新的回执) - #sql("getNewTeacherTransferEchoCount") - select count(1) as c from t_transfer_apply where b_use=1 and source_is_read=0 and status_id>1 - and source_bureau_id=? and identity_id=5 - #end - - -- 调转的三种状态 - #sql("getTransferApplyStatus") - select apply_status_id,apply_status_name,for_check from t_transfer_apply_status where for_check=1 - #end - - --判断一个人是不是处于待审核状态 - #sql("getPersonStatus") - select count(*) as c from t_transfer_apply where person_id=? and b_use=1 and status_id=1 - #end -#end \ No newline at end of file diff --git a/dsBase/target/classes/application_ali.yaml b/dsBase/target/classes/application_ali.yaml deleted file mode 100644 index 0af87d49..00000000 --- a/dsBase/target/classes/application_ali.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: ylt - password: Ycharge666 - jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8 - - -redis: - ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com - port: 6379 - password: Ycharge666 - -# ============================================================== -jwt: - # 生成Token的密码 - CookieMd5SingPwd: DsideaL4r5t6y7u - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsBase/target/classes/application_dev.yaml b/dsBase/target/classes/application_dev.yaml deleted file mode 100644 index 7673bd7f..00000000 --- a/dsBase/target/classes/application_dev.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: c:/Windows/Temp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: root - password: DsideaL147258369 - jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - - -redis: - ip: 10.10.14.210 - port: 18890 - password: - -# ============================================================== - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsBase/target/classes/application_pro.yaml b/dsBase/target/classes/application_pro.yaml deleted file mode 100644 index 7673bd7f..00000000 --- a/dsBase/target/classes/application_pro.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: c:/Windows/Temp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: root - password: DsideaL147258369 - jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - - -redis: - ip: 10.10.14.210 - port: 18890 - password: - -# ============================================================== - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsBase/target/classes/cron4j.properties b/dsBase/target/classes/cron4j.properties deleted file mode 100644 index b75e22f0..00000000 --- a/dsBase/target/classes/cron4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# cron 表达式由五部分组成:分 时 天 月 周 # 分 :从 0 到 59 # 时 :从 0 到 23 # 天 :从 1 到 31,字母 L 可以表示月的最后一天 # 月 :从 1 到 12,可以别名:jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov" and "dec" -# 周 :从 0 到 6,0 表示周日,6 表示周六,可以使用别名: "sun", "mon", "tue", "wed", "thu", "fri" and "sat" -# -# 数字 n:表示一个具体的时间点,例如 5 * * * * 表示 5 分这个时间点时执行 -# 逗号 , :表示指定多个数值,例如 3,5 * * * * 表示 3 和 5 分这两个时间点执行 -# 减号 -:表示范围,例如 1-3 * * * * 表示 1 分、2 分再到 3 分这三个时间点执行 -# 星号 *:表示每一个时间点,例如 * * * * * 表示每分钟执行 -# 除号 /:表示指定一个值的增加幅度。例如 n/m表示从 n 开始,每次增加 m 的时间点执行 -# cron4j 集成cron 只有 分 时 天 月 周 没有秒 -cron4j=clearRubbish,backup - -# 每天凌晨2点执行一次 -clearRubbish.cron=0 2 * * * -clearRubbish.class=com.dsideal.dsBase.clearRubbish.clearRubbishAction -clearRubbish.daemon=true -clearRubbish.enable=true - -# 每天凌晨2点执行一次,备份数据库 -backup.cron=0 2 * * * -backup.class=Backup.BackupAll -backup.daemon=true -backup.enable=true - - diff --git a/dsBase/target/classes/log4j.properties b/dsBase/target/classes/log4j.properties deleted file mode 100644 index 625cca1e..00000000 --- a/dsBase/target/classes/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=WARN, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n - -log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender -log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST -log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT -log4j.appender.mq.ProducerGroup=meiwei-producer-retry -log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877 -log4j.appender.mq.layout=org.apache.log4j.PatternLayout -log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) % \ No newline at end of file diff --git a/dsBase/target/classes/logback.xml b/dsBase/target/classes/logback.xml deleted file mode 100644 index 2c24fb65..00000000 --- a/dsBase/target/classes/logback.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) - - %msg%n - - - - - - ${LOG_HOME}/dsBase.log - - - ${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log - - 30 - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n - - - - 100MB - - - - - - - - - - \ No newline at end of file diff --git a/dsBase/target/classes/logo.txt b/dsBase/target/classes/logo.txt deleted file mode 100644 index 450e2587..00000000 --- a/dsBase/target/classes/logo.txt +++ /dev/null @@ -1,13 +0,0 @@ - - __ _______ - / | / \ - ____$$ | _______ $$$$$$$ | ______ _______ ______ - / $$ | / |$$ |__$$ | / \ / | / \ -/$$$$$$$ |/$$$$$$$/ $$ $$< $$$$$$ |/$$$$$$$/ /$$$$$$ | -$$ | $$ |$$ \ $$$$$$$ | / $$ |$$ \ $$ $$ | -$$ \__$$ | $$$$$$ |$$ |__$$ |/$$$$$$$ | $$$$$$ |$$$$$$$$/ -$$ $$ |/ $$/ $$ $$/ $$ $$ |/ $$/ $$ | - $$$$$$$/ $$$$$$$/ $$$$$$$/ $$$$$$$/ $$$$$$$/ $$$$$$$/ - - -power by http://patorjk.com/software/taag/ \ No newline at end of file diff --git a/dsBase/target/classes/undertow_dev.properties b/dsBase/target/classes/undertow_dev.properties deleted file mode 100644 index 0308a392..00000000 --- a/dsBase/target/classes/undertow_dev.properties +++ /dev/null @@ -1,36 +0,0 @@ -# true 值支持热加载 -undertow.devMode=true -undertow.port=8001 -undertow.host=0.0.0.0 -#undertow.resourcePath =/root/dsBase/WebRoot,classpath:static -#undertow.resourcePath =D:/dsWork/dsProject/dsbase/WebRoot,classpath:static - -# 目录名称 -undertow.contextPath=/dsBase - -# 设定I/O线程数. -server.undertow.io-threads=8 - -# 设定工作线程数 -server.undertow.worker-threads=60 - -# 查询当前某程序的线程或进程数 -# yum install psmisc -y -# ps -e | grep java | awk '{print $1} -# pstree -p 15453 | wc -l - -# gzip 压缩开关 -undertow.gzip.enable=true -# 配置压缩级别,默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度,9 拥有最高压缩率 -undertow.gzip.level=-1 -# 触发压缩的最小内容长度 -undertow.gzip.minLength=1024 - -# 开启access日志 -server.undertow.accesslog.enabled=true -server.undertow.accesslog.pattern=%t %a "%r" %s (%D ms) - -# ssl 开启时,是否开启 http2。检测该配置是否生效在 chrome 地址栏中输入: chrome://net-internals/#http2 -#undertow.http2.enable=true - -#http://www.jfinal.com/doc/1-4 diff --git a/dsBase/target/classes/undertow_pro.properties b/dsBase/target/classes/undertow_pro.properties deleted file mode 100644 index 63bd941a..00000000 --- a/dsBase/target/classes/undertow_pro.properties +++ /dev/null @@ -1,35 +0,0 @@ -# true 值支持热加载 -undertow.devMode=true -undertow.port=8001 -undertow.host=0.0.0.0 -#undertow.resourcePath =/root/WebRoot,classpath:static - -# 目录名称 -undertow.contextPath=/dsBase - -# 设定I/O线程数. -server.undertow.io-threads=8 - -# 设定工作线程数 -server.undertow.worker-threads=60 - -# 查询当前某程序的线程或进程数 -# yum install psmisc -y -# ps -e | grep java | awk '{print $1} -# pstree -p 15453 | wc -l - -# gzip 压缩开关 -undertow.gzip.enable=true -# 配置压缩级别,默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度,9 拥有最高压缩率 -undertow.gzip.level=-1 -# 触发压缩的最小内容长度 -undertow.gzip.minLength=1024 - -# 开启access日志 -server.undertow.accesslog.enabled=true -server.undertow.accesslog.pattern=%t %a "%r" %s (%D ms) - -# ssl 开启时,是否开启 http2。检测该配置是否生效在 chrome 地址栏中输入: chrome://net-internals/#http2 -#undertow.http2.enable=true - -#http://www.jfinal.com/doc/1-4 diff --git a/dsBase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dsBase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 66e2923a..00000000 --- a/dsBase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,117 +0,0 @@ -com\dsideal\base\Util\PythonUtil.class -com\dsideal\base\fay\tree\service\impl\FayTree.class -com\dsideal\base\Base\Controller\BaseController.class -com\dsideal\base\Global\Controller\GlobalController.class -com\dsideal\base\clearRubbish\clearRubbishAction.class -com\dsideal\base\Index\Controller\IndexController.class -com\dsideal\base\Util\RandomGeneratorUtil.class -com\dsideal\base\Util\RedisKit.class -com\dsideal\base\Util\ExcelExportUtil.class -com\dsideal\base\Teacher\Model\TeacherModel.class -com\dsideal\base\UnitTest\TestPika.class -com\dsideal\base\Util\MinioUtils.class -com\dsideal\base\Plugin\Slf4jLog.class -com\dsideal\base\ExcelImportTemplate\StudentTemplateUtil.class -com\dsideal\base\Util\IdCardGenerator.class -com\dsideal\base\Util\SsoUtil.class -com\dsideal\base\ExcelImportTemplate\StudentImportExcelUtil.class -com\dsideal\base\Graduation\GraduationAction.class -com\dsideal\base\Interceptor\VerifyIDCardInterface.class -com\dsideal\base\Classes\Model\ClassModel.class -com\dsideal\base\fay\tree\domain\MenuBean.class -com\dsideal\base\Interceptor\LengthInterface.class -com\dsideal\base\Base\Model\BaseModel.class -com\dsideal\base\Util\IpUtil.class -com\dsideal\base\Const\CheckConst.class -com\dsideal\base\Dm\Model\DmModel.class -com\dsideal\base\Util\ClickHouseUtil.class -com\dsideal\base\Interceptor\IsGuidInterface.class -com\dsideal\base\Const\BackConst.class -com\dsideal\base\Const\IdentityConst.class -com\dsideal\base\Const\ManagerConst.class -com\dsideal\base\ExcelImportTemplate\TeacherImportExcelUtil$1.class -com\dsideal\base\ExcelImportTemplate\StudentInitImportTemplate.class -com\dsideal\base\DataAuthority\Controller\DataAuthorityController.class -com\dsideal\base\Menu\Model\MenuModel.class -com\dsideal\base\Interceptor\IsNumericInterface.class -com\dsideal\base\Interceptor\VerifyTelephoneInterface.class -com\dsideal\base\Util\PkUtil.class -com\dsideal\base\Const\FinishConst.class -com\dsideal\base\ExcelImportTemplate\ImportExcelUtil.class -com\dsideal\base\Util\SSHUtil.class -com\dsideal\base\Organization\Model\OrganizationModel.class -com\dsideal\base\Student\Controller\StudentController.class -com\dsideal\base\StudentYd\Model\StudentYdModel.class -com\dsideal\base\ExcelImportTemplate\TeacherImportExcelUtil.class -com\dsideal\base\Teacher\Controller\TeacherController.class -com\dsideal\base\Interceptor\CheckIdsInterceptor.class -com\dsideal\base\Tools\ClearDataBase.class -com\dsideal\base\Global\Model\GlobalModel.class -com\dsideal\base\Interceptor\EmptyInterceptor.class -com\dsideal\base\Student\Model\StudentModel.class -com\dsideal\base\Interceptor\IsLoginInterceptor.class -com\dsideal\base\Interceptor\AuthorityInterface.class -com\dsideal\base\Util\ReplaceAndInsertImage.class -com\dsideal\base\Interceptor\LengthInterceptor.class -com\dsideal\base\Dm\Controller\DmController.class -com\dsideal\base\Util\LogBackLog.class -com\dsideal\base\Interceptor\CheckIdsInterface.class -com\dsideal\base\LoginPerson\Model\LoginPersonModel.class -com\dsideal\base\StudentYd\Controller\StudentYdController.class -com\dsideal\base\Util\CookieUtil.class -com\dsideal\base\model\TestHuanghai.class -com\dsideal\base\ExcelImportTemplate\TeacherCopyToSample.class -com\dsideal\base\Student\Service\StudentService.class -com\dsideal\base\Util\ExcelCommonUtil$1.class -com\dsideal\base\fay\tree\service\IFayTreeNode.class -com\dsideal\base\Const\OsSystemConst.class -com\dsideal\base\Const\RedisKeyConst.class -com\dsideal\base\Util\TelNumGenerator.class -com\dsideal\base\Util\IDCardUtil.class -com\dsideal\base\Interceptor\LayUiPageInfoInterface.class -com\dsideal\base\Interceptor\IsSysAdminInterface.class -com\dsideal\base\Util\FileSizeUtil.class -com\dsideal\base\Const\PyEchartsModel.class -com\dsideal\base\Interceptor\VerifyIDCardInterceptor.class -com\dsideal\base\Interceptor\AuthorityInterceptor.class -com\dsideal\base\model\_MappingKit.class -com\dsideal\base\Plugin\Slf4jLogFactory.class -com\dsideal\base\Util\PassWordUtil.class -com\dsideal\base\ExcelImportTemplate\ImportBindUtil.class -com\dsideal\base\LoginPerson\Controller\LoginPersonController.class -com\dsideal\base\ExcelImportTemplate\TeacherTemplateUtil.class -com\dsideal\base\DataAuthority\Model\DataAuthorityModel.class -com\dsideal\base\TeacherYd\Model\TeacherYdModel.class -com\dsideal\base\ExcelImportTemplate\TeacherInitImportTemplate.class -com\dsideal\base\Interceptor\IsNumbericInterceptor.class -com\dsideal\base\Handler\XssHandler.class -com\dsideal\base\fay\tree\service\IFayTree.class -com\dsideal\base\Handler\XssHttpServletRequestWrapper.class -com\dsideal\base\BaseApplication.class -com\dsideal\base\Tools\SyncResource.class -com\dsideal\base\Interceptor\IsSysAdminInterceptor.class -com\dsideal\base\Organization\Controller\OrganizationController.class -com\dsideal\base\model\base\BaseTestHuanghai.class -com\dsideal\base\Const\StepConst.class -com\dsideal\base\TeacherYd\Controller\TeacherYdController.class -com\dsideal\base\Util\FileUtil.class -com\dsideal\base\Interceptor\VerifyTelephoneInterceptor.class -com\dsideal\base\Util\CommonUtil.class -com\dsideal\base\Classes\Controller\ClassController.class -com\dsideal\base\Interceptor\VerifyEmailInterceptor.class -com\dsideal\base\fay\tree\domain\FayTreeNode.class -com\dsideal\base\Interceptor\IsLoginInterface.class -com\dsideal\base\Util\ExcelCommonUtil.class -com\dsideal\base\Classes\Model\ClassUtil.class -com\dsideal\base\Student\Model\StudentUtil.class -com\dsideal\base\Util\LogBackLogFactory.class -com\jfinal\plugin\activerecord\Db.class -com\dsideal\base\Interceptor\IsGuidInterceptor.class -com\dsideal\base\fay\tree\util\FayTreeUtil.class -com\dsideal\base\Interceptor\EmptyInterface.class -com\dsideal\base\Interceptor\LayUiPageInfoInterceptor.class -com\dsideal\base\Util\RsaUtils.class -com\dsideal\base\Menu\Controller\MenuController.class -com\dsideal\base\ExcelImportTemplate\StudentImportExcelUtil$1.class -com\dsideal\base\Interceptor\VerifyEmailInterface.class -com\dsideal\base\Const\RoleConst.class diff --git a/dsBase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dsBase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 492b307c..00000000 --- a/dsBase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,114 +0,0 @@ -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Classes\Model\ClassUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\PassWordUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\SSHUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\StudentYd\Model\StudentYdModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\LogBackLog.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\IDCardUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\PythonUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\IdentityConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsSysAdminInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\VerifyEmailInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\ReplaceAndInsertImage.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\fay\tree\service\impl\FayTree.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Base\Model\BaseModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Student\Model\StudentModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\VerifyIDCardInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\IdCardGenerator.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\LayUiPageInfoInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\SsoUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Classes\Controller\ClassController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\fay\tree\domain\MenuBean.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\fay\tree\service\IFayTree.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Student\Controller\StudentController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\FinishConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\fay\tree\service\IFayTreeNode.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Menu\Controller\MenuController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\RoleConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Handler\XssHttpServletRequestWrapper.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\CheckIdsInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Dm\Model\DmModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\DataAuthority\Controller\DataAuthorityController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\LengthInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\CommonUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\TeacherYd\Model\TeacherYdModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Graduation\GraduationAction.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\RedisKeyConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Global\Controller\GlobalController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsGuidInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\OsSystemConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\VerifyTelephoneInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\LoginPerson\Model\LoginPersonModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\model\base\BaseTestHuanghai.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Index\Controller\IndexController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\VerifyEmailInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\VerifyIDCardInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Plugin\Slf4jLog.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\IpUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\ManagerConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\AuthorityInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Student\Model\StudentUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\StudentYd\Controller\StudentYdController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\FileUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Teacher\Controller\TeacherController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\MinioUtils.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\BaseApplication.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\EmptyInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\StudentInitImportTemplate.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\LayUiPageInfoInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsLoginInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\CheckIdsInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\ImportExcelUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\LoginPerson\Controller\LoginPersonController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Tools\ClearDataBase.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\AuthorityInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\TeacherCopyToSample.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsNumbericInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\EmptyInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Base\Controller\BaseController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\StudentImportExcelUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\fay\tree\domain\FayTreeNode.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Teacher\Model\TeacherModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\PyEchartsModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsGuidInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\CheckConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsNumericInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\model\TestHuanghai.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Organization\Controller\OrganizationController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\UnitTest\TestPika.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\fay\tree\util\FayTreeUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\RedisKit.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Tools\SyncResource.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\FileSizeUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Plugin\Slf4jLogFactory.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\TelNumGenerator.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Global\Model\GlobalModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Menu\Model\MenuModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\model\_MappingKit.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsSysAdminInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\TeacherInitImportTemplate.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\CookieUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Classes\Model\ClassModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\VerifyTelephoneInterface.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\LengthInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Interceptor\IsLoginInterceptor.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\PkUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Student\Service\StudentService.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\LogBackLogFactory.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\ExcelCommonUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\ImportBindUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\ClickHouseUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\StepConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\clearRubbish\clearRubbishAction.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Handler\XssHandler.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Organization\Model\OrganizationModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\RandomGeneratorUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\RsaUtils.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\TeacherTemplateUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Util\ExcelExportUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Dm\Controller\DmController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\DataAuthority\Model\DataAuthorityModel.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\TeacherYd\Controller\TeacherYdController.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\TeacherImportExcelUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\ExcelImportTemplate\StudentTemplateUtil.java -D:\dsWork\dsProject\ds-base\src\main\java\com\dsideal\base\Const\BackConst.java -D:\dsWork\dsProject\ds-base\src\main\java\com\jfinal\plugin\activerecord\Db.java diff --git a/dsBase/.idea/dsBase.iml b/dsBuild/dsBuild.iml similarity index 64% rename from dsBase/.idea/dsBase.iml rename to dsBuild/dsBuild.iml index 97714aba..546154af 100644 --- a/dsBase/.idea/dsBase.iml +++ b/dsBuild/dsBuild.iml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/dsBuild/pom.xml b/dsBuild/pom.xml index b1a3094a..928586f2 100644 --- a/dsBuild/pom.xml +++ b/dsBuild/pom.xml @@ -16,21 +16,6 @@ 21 21 - - - - ali-maven - http://maven.aliyun.com/nexus/content/groups/public - - true - - - true - always - fail - - - @@ -64,15 +49,6 @@ ${mysql.version} - - - - - ch.qos.logback - logback-classic - 1.5.6 - - @@ -164,6 +140,13 @@ jsch 0.2.19 + + ch.qos.logback + logback-classic + 1.5.8 + runtime + + diff --git a/dsBuild/src/main/java/Publish.java b/dsBuild/src/main/java/Publish.java index 1244e7a4..66c1bca6 100644 --- a/dsBuild/src/main/java/Publish.java +++ b/dsBuild/src/main/java/Publish.java @@ -9,7 +9,7 @@ import com.jfinal.kit.Kv; public class Publish { public static void main(String[] args) throws Exception { - PublishUtil.bluePrint("欢迎使用一站式镜像打包上传生成器V1.0"); + PublishUtil.bluePrint("欢迎使用一站式镜像打包上传生成器V1.1"); //1、探测当前目录下有哪些以ds开头的目录,这些目录都是待发布的项目 List projectNames = PublishUtil.getProjectNames(); @@ -36,7 +36,7 @@ public class Publish { System.out.println(); //让用户选择使用哪个配置文件进行打镜像? //这个项目下有以application_?.yaml形式的配置文件,分配ID为1,2,3,...,让用户选择使用哪个进行镜像打包 - String choiceConfig = PublishUtil.userSelectConfig(listProject,choiceProject); + String choiceConfig = PublishUtil.userSelectConfig(listProject, choiceProject); //这个项目是什么类型? String projectAttribute = PublishUtil.getProjectAttribute(choiceProject, listProject); @@ -47,8 +47,8 @@ public class Publish { String basedir = new File(System.getProperty("user.dir")).getCanonicalPath(); workingPath = basedir + "\\" + projectBean.getDevProjectName() + "\\"; projectName = projectBean.getPublishProjectName(); - if (FileUtil.exist(workingPath + "\\lib")) { - localLibPath = workingPath + "\\lib\\"; + if (FileUtil.exist(workingPath + "lib")) { + localLibPath = workingPath + "lib\\"; } break; } @@ -57,6 +57,15 @@ public class Publish { isStatic = true; } //开始打包 - PublishUtil.publish(projectName, isStatic, workingPath, localLibPath, choiceWarehouse,choiceConfig); + Kv ret = PublishUtil.publish(projectName, isStatic, workingPath, localLibPath, choiceWarehouse, choiceConfig); + + System.out.println("测试运行一下容器吧"); + if (ret.getStr("project_port") != null) { + String port = ret.getStr("project_port"); + System.out.println("docker run --name " + ret.getStr("projectName").split(":")[0] + " -p " + port + ":" + port + " -d " + ret.getStr("projectName")); + //System.out.println("docker exec -it 替换我为容器ID /bin/bash"); + }else{ + System.out.println("docker run --name " + ret.getStr("projectName").split(":")[0] + " -p 80:80 -d " + ret.getStr("projectName")); + } } } diff --git a/dsBuild/src/main/java/Util/PublishUtil.java b/dsBuild/src/main/java/Util/PublishUtil.java index 7ee0a2e0..92ee4a47 100644 --- a/dsBuild/src/main/java/Util/PublishUtil.java +++ b/dsBuild/src/main/java/Util/PublishUtil.java @@ -47,7 +47,7 @@ public class PublishUtil { * docker tag 19a54d2204aa registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 * docker push registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 */ - public static void publish(String projectName, boolean isStatic, String workingPath, String localLibPath, Kv choiceWarehouse, String choiceConfig) throws Exception { + public static Kv publish(String projectName, boolean isStatic, String workingPath, String localLibPath, Kv choiceWarehouse, String choiceConfig) throws Exception { System.out.println("正在生成" + projectName + "的镜像..."); //配置文件 String path = PathKit.getRootClassPath() + "\\publishImage.json"; @@ -58,6 +58,8 @@ public class PublishUtil { String pwd = jo.getString("pwd"); int port = jo.getIntValue("port"); + String project_port = null; + //声明SSH对象 SSHUtil ssh = new SSHUtil(user, pwd, host, port); ssh.connect(); @@ -66,8 +68,11 @@ public class PublishUtil { LocalDateTime now = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); String newVersion = now.format(formatter); - newVersion = choiceConfig + "_" + newVersion.replace(" ", "").replace("-", "").replace(":", ""); - + if (!StrKit.isBlank(choiceConfig)) { + newVersion = choiceConfig + "_" + newVersion.replace(" ", "").replace("-", "").replace(":", ""); + } else { + newVersion = newVersion.replace(" ", "").replace("-", "").replace(":", ""); + } //准备工作 String remotePath = "/usr/local/" + projectName + "/"; ssh.exec("rm -rf " + remotePath); @@ -105,6 +110,11 @@ public class PublishUtil { System.out.println("正在解压缩target.zip..."); ssh.exec("cd " + remotePath + " && unzip target.zip"); ssh.exec("cd " + remotePath + " && rm -rf target.zip"); + + //获取项目端口 + String undertow_dev = remotePath + "target/classes/undertow_dev.properties"; + String cmd = "grep '^undertow\\.port=' " + undertow_dev + " | awk -F'=' '{print $2}'"; + project_port = ssh.exec(cmd).getStr("message").replace("[", "").replace("]", ""); } //处理静态文件 @@ -138,16 +148,22 @@ public class PublishUtil { //登录镜像仓库 //处理一下Dockerfile中的JDK21此用问题,因为不同的打包操作,需要登录不同的仓库,这里临时用shell修改一下 String remoteDockerFile = remotePath + "Dockerfile"; - doLogin(ssh, choiceWarehouse.getStr("username"), choiceWarehouse.getStr("password")); - String cmd = "sed -i '1s/^FROM .*/FROM registry.cn-hangzhou.aliyuncs.com\\/" + choiceWarehouse.getStr("name") + "\\/jdk:21/' " + remoteDockerFile; - ssh.exec(cmd); - System.out.println("仓库登录成功!修改JDK21的引用镜像成功!"); + + if (choiceWarehouse.get("id") != null) { + doLogin(ssh, choiceWarehouse.getStr("username"), choiceWarehouse.getStr("password")); + System.out.println("仓库登录成功!"); + } + //修改镜像要用的配置文件 - cmd = "sed -i 's|ENV WORKING_ENV=\"pro\"|ENV WORKING_ENV=\"" + choiceConfig + "\"|g' " + remoteDockerFile; + String cmd = "sed -i 's|ENV WORKING_ENV=\"pro\"|ENV WORKING_ENV=\"" + choiceConfig + "\"|g' " + remoteDockerFile; ssh.exec(cmd); System.out.println(cmd); System.out.println("环境变量修改成功!"); + //如果容器正在运行中,那么容器对应的镜像删除失败 + cmd = "docker rm -f $(docker ps -aq)"; + ssh.exec(cmd); + //删除所有镜像 cmd = "docker rmi -f $(docker images -q)"; ssh.exec(cmd); @@ -169,18 +185,24 @@ public class PublishUtil { System.exit(0); } - System.out.println("打标签..."); - cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/" + choiceWarehouse.getStr("name") + "/" + projectName + ":" + newVersion; - ssh.exec(cmd); + if (choiceWarehouse.get("id") != null) { + System.out.println("打标签..."); + cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/" + choiceWarehouse.getStr("name") + "/" + projectName + ":" + newVersion; + ssh.exec(cmd); - System.out.println("开始推送到远程仓库,稍等..."); - cmd = "docker push registry.cn-hangzhou.aliyuncs.com/" + choiceWarehouse.getStr("name") + "/" + projectName + ":" + newVersion; - System.out.println(cmd); - ssh.exec(cmd); - System.out.println("推送到远程仓库完成!"); + System.out.println("开始推送到远程仓库,稍等..."); + cmd = "docker push registry.cn-hangzhou.aliyuncs.com/" + choiceWarehouse.getStr("name") + "/" + projectName + ":" + newVersion; + System.out.println(cmd); + ssh.exec(cmd); + System.out.println("推送到远程仓库完成!"); + } ssh.disconnect(); System.out.println("恭喜,镜像打包成功!"); + + Kv ret = Kv.by("projectName", projectName + ":" + newVersion); + ret.set("project_port", project_port); + return ret; } /** @@ -204,7 +226,7 @@ public class PublishUtil { // 获取目录名称 String dirName = file.getName(); // 检查目录名称是否以"ds"开头且不是"dsBuild" - if (dirName.startsWith("ds") && !dirName.equals("dsBuild")) { + if (dirName.startsWith("ds") && !dirName.equals("dsBuild") && !dirName.contains("-")) { dirList.add(file.getAbsolutePath()); } } @@ -295,26 +317,34 @@ public class PublishUtil { Kv kv = Kv.create(); while (true) { redPrint("2、请选择您本次要发布的仓库:"); - System.out.println("1:驿来特仓库 2:黄海私人仓库"); + System.out.println("1:不上传到仓库 2:黄海私人仓库 3:驿来特仓库"); int choice = scanner.nextInt(); // 读取用户输入的整数 - if (choice == 1) { - kv.set("id", 1); - kv.set("name", "yltcharge"); - kv.set("username", "驿来特充电"); - kv.set("password", "ylt5033."); - System.out.println("您选择的仓库是:驿来特仓库"); - } else { + kv.set("id", null); + kv.set("name", null); + kv.set("username", null); + kv.set("password", null); + System.out.println("您选择的仓库是:不上传到仓库"); + } + if (choice == 2) { kv.set("id", 2); kv.set("name", "dsideal"); kv.set("username", "东师黄海"); kv.set("password", "DsideaL4r5t6y7u"); System.out.println("您选择的仓库是:黄海私人仓库"); } - if (choice == 1 || choice == 2) { + if (choice == 3) { + kv.set("id", 3); + kv.set("name", "yltcharge"); + kv.set("username", "驿来特充电"); + kv.set("password", "ylt5033."); + System.out.println("您选择的仓库是:驿来特仓库"); + } + + if (choice == 1 || choice == 2 || choice == 3) { break; // 如果输入正确,退出循环 } else { - System.out.println("输入不正确,请输入1 或者 2 !"); // 提示用户输入不正确 + System.out.println("输入不正确,请输入1, 2 或者 3 !"); // 提示用户输入不正确 } } return kv; diff --git a/dsBuild/src/main/resources/.kube/config b/dsBuild/src/main/resources/.kube/config new file mode 100644 index 00000000..d9277637 --- /dev/null +++ b/dsBuild/src/main/resources/.kube/config @@ -0,0 +1,19 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJQ3pNUkpBbEJVSzB3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBNU1URXdPREUyTlRSYUZ3MHpOREE1TURrd09ESXhOVFJhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUUNobzZhakc4RVFiNktyUDhnd3BpOEoyMFFNRGxRNGYvYkJJSGVCVS9mN28yc3ZjcmRPUktvVGxDVnQKMHpvWmJuZHhrd0pNaURBZVJ4Z3R2NHBQTnFwNlV4M2tMZ1NqRE55Mnl4NThUOXdEc3M5YkJvNUlza01GZ2JNUQp3K3NGWEVCelN5R3B0aVA2L3FKbU5mYVlQcWhIRkRpdlJkRjFqTVJKK2JpNlNTakhPSmJ6aXhnd2VjSFMxdVY0CmZldkczNWROckZCZEI4WVNmczY0cGwvOXdiWC84S0s5M1ovWUF1K1RVNUF4T0FhY0c5U3FKWEZQajJoS01QT3gKcHYwc1ExTVIxSmduazF1MEx6T2RoWDdOOTkydThRRVZHQ1hwQmRjOWxVQSt4MmhPc2lUWjE1WW1GWmxQdStmYgo4UjhvYitNZ0NIdGNkUUtzOXFFSnB3L1h3aU1qQWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJUZk9hNWlyRmJBSGdxaVZkMFFnRURia2s1QlpEQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQWpzQ3pXUTFnKwprc0lvNTg5Y1ZncFVOSFlIaWhVRXlpcDhUbE1ySGR3eFBuU0dOaFNyS0haTGJkVWZnWWorR2x3QlRHcXVrL3JzCmR0dWZWUmxaNXA1ZlUzZSs2SW5CY0xmWFdEaGRRMFlvSUpzSU4rbUZCL01haDBjQkxlQzZqOWN1eXArcWllUXAKMml6ZDJzb1F6cjN2TmlQM3l1T0NOU0dGdFBvdXRHUis5YWJzVC9lYUMzVTJvcFo4Tm5KenVFb2ljQnV4ZWt2SApIZVZadHhCT3l5QkpWbzEyZzdmTVhuSm1PRlR6TmhCdVpzVFZ1cndTZTdPTmtLOUVsbHBXeCtWcGRhOXdPZ3NOCmFId010Qkc1YUJVTDU0T0Fac004eXpJaldtb0dPZzBySkl1Mjk0YTNXTjJhR2UrMHFWdVdpV2U4N2k1SWVNcHAKSE05amswUVBrbjFaCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + server: https://10.10.14.200:6443 + name: kubernetes +contexts: +- context: + cluster: kubernetes + user: kubernetes-admin + name: kubernetes-admin@kubernetes +current-context: kubernetes-admin@kubernetes +kind: Config +preferences: {} +users: +- name: kubernetes-admin + user: + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJWmVoaXMzR3dHVUF3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBNU1URXdPREUyTlRSYUZ3MHlOVEE1TVRFd09ESXlNREJhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEcDFvNzcKNzJaOWhERVdJQWVldm5YYXVWRG5aZkdlNGF2Ly90cDhudjlHTHBNd2hOT0JaaEpZNE55SkhhQTdYVTAvVTVBYwpSWG01VVNJb0NaRU9FQXpjNW9kOGNZNm5sOE9qMUhxa0dDZG1ZcllpMUVKRElDdnJ4d1phQ2RCRVYxNzJ1WFJYCitSY1hxaDdlcWRPRDJ4SHl0N2ZBZXFHQ3NSVjNnbFJ3ak5DMUovalFnRmtYUGs3NXdXZDRDcXh4VVEvcXdNeUUKVVRlVTg0SHFTZzRzVzRpU1gwbm83YnBlNTZNRG8rMnZYTmVDQzQwZGNJMVRWZDAyc21PbEx6VGhtd1M4U05PSAo3bUdlSkJWZ2hlaXRyR3kwSjlWT1NXdyszVHl1NEdQZm1YbmhPeU5DUVR6UVMzUDNQNmlyNzR4UGRUci9JT2JrCno3bGE3SjdIdjV6MGZUcnhBZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRk44NXJtS3NWc0FlQ3FKVgozUkNBUU51U1RrRmtNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUI5dzRmd2RhS1R3L3YxODlhK01LbHM3c3NTCml5SnNDd0RDQUtHMnY4UmhNTXl6N2JkaTM0M1JOMFJHQnU5bGZKWk0zNWlpNXA1c29nK2NGcnlBb1FYVVI5cmEKS0NBS1VXNUg5eE90Qm95S3hYaXFkNTd6WWs5VVlUNDdEYkh4VllSaVgwNWZpaWM0NVNxT0pBNUdzUGNDdmlObwowYVo0MnFISTkrVnB5WXN5TGN1eGd3U1lkR1h5VjdiR1liclVDZmpwNk5USnVOTEh0NTl4VGtaNWNsZzdCTEFNCkVPV2E3WWVZWDE3VUdHbmh6YUN1WngvNzJZaXBWdkNLdjR5VXRTZVJpMm1HRnpZWXBoSmpXdm9wR1VoQUM5MWYKTlFUWEE1ZU9VTTZpOFo2OG5YRE9WUWFTb3BNbnZvZGM2UDlwSFR6YkVHdGdmdW82czI2dkoyRTZsUlVUCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBNmRhTysrOW1mWVF4RmlBSG5yNTEycmxRNTJYeG51R3IvLzdhZko3L1JpNlRNSVRUCmdXWVNXT0RjaVIyZ08xMU5QMU9RSEVWNXVWRWlLQW1SRGhBTTNPYUhmSEdPcDVmRG85UjZwQmduWm1LMkl0UkMKUXlBcjY4Y0dXZ25RUkZkZTlybDBWL2tYRjZvZTNxblRnOXNSOHJlM3dIcWhnckVWZDRKVWNJelF0U2Y0MElCWgpGejVPK2NGbmVBcXNjVkVQNnNETWhGRTNsUE9CNmtvT0xGdUlrbDlKNk8yNlh1ZWpBNlB0cjF6WGdndU5IWENOClUxWGROckpqcFM4MDRac0V2RWpUaCs1aG5pUVZZSVhvcmF4c3RDZlZUa2xzUHQwOHJ1QmozNWw1NFRzalFrRTgKMEV0ejl6K29xKytNVDNVNi95RG01TSs1V3V5ZXg3K2M5SDA2OFFJREFRQUJBb0lCQVFDcklpNlVyTmxLUk9PVAp1Szg2KzFMUFYwNmhleGRBMnhJQkVTZ2ZpbEZ5c0lWaVBlTjQwUlhlVy9xcWtyY0FtMEQ4ZHBDQ1VFcE1XTmR4Cmk4YlFEdWtMQmQva01FdGgxZzBGS216ekNRWlV4U3RkQkJEV2hZWC9VVElSMVJySjJWT1RwNWhCQmZoamhrcC8KVkxTS3pGb3ZVMHMwbjhyeUZkMkxFQ1B5RnV4cmxzWWk3dlAwSmIyMllFTTJqZXBaZ1dVU3FyR2xQWmo3YmZ2SApZbC9MSGZ3bmM5cU1VUzJHV2tDeUR5bWdCSVJ1SnA1S0FSTTNRaHd1UlhsekFiT1hSUFZyd3FXKzlEdHpzT0x3CkRITDNXYytYVG90QkJmZ2RkdG1leHNlRmp2TFF1QlQ5ZUI1RHg1dDRGQU9lRUM2T09Fa0R1RHM2dWpmYUNIK3IKa0s5RE56TTlBb0dCQU82dGkyS0xjaEkvYUZEQ3ZDcGJpUWl3RUg1QnhNeU5rTVFnbDAxbUg4Vi9VckFxUTZxawpRcTRkSkZzYnl5NC9tVjZNTGE3eDRGM1c2Z04rQ1lvZEh3WmlDOGQzM3o5RzRFYjVrZUFZTml2VUR3bHRGYU54Clp4M0hRQ0RYV05LRzV4U2NVRmxIOU1iQjAyM2h3d2Y2ZmNEa0N6c2pHanJlWHpYOVJzT2dHOGF6QW9HQkFQclAKR0N6QXJ0QUh1YUVhbUVBMm9SN1kzWDJwaEdxQ3p4eWR5VWdNb1Zab0w5S0hhdmZqb3h3UW5leElMcDlZSnpXegpSUHlKRm5qK2JmU1VWYUdxMWNGTWhyVGZUL1NOSTZadUxEbmhybzczaWNnbXNIZG5lVURidUt4Nkg5NSs3Q1RkCmRJY1dxWXpBMncxOWk1UXlyMlM4RU91K0Fmb0QzREp0dk1OM3pDbkxBb0dBZEdGQzJlWk0xUUQrQ0lNcjVTdUYKQWl0M24xaktjVU9HRjF3YzZxeWxTVlB3S2Q0eDZINzMxSlo1SjhQQnF1ZHdEVjRrMkcwd2poRkJRanF1eEIyMwpCeEcvMUo5cXlCdnpPQ2h4TE9naFlmV2c3Mk8xYldEYWV2YXhHbEpuQ1NDbWhMSkRxNFVlb2R2WkVIZEk5aGI2ClFwZnZzZ0pIdy9TeVVFMFR1RWZWdzJrQ2dZQVQwOTFvWkU4dG1QNiswcmhva3lrSHBFTldWTmxvQmpGVFpOSHQKeFRuWDkrS1g5U2FxdEM5SDM3UnNZb1IxQ21ZSEk4WDNaT3NHNDY1VG9JcG9mblhwa3lBdkdseGF5L0dlamFVbgpha1QvZm1oQkQzWHg2cGMyWG1ocUVqbUV3R253dkNVakxOSjRreUorSFllMFRwRjVHRGtLT2ZvMEJxd1l2SDRvCndjYTlJd0tCZ0RPLzVxcnFzZFZOdHljZFduQ1BhU1orR3QyMGIyMDI1QzFXZXBraVd4ZWs4eTEzNDRkWnRQaWYKOFhoTVZpNzBhYkt3QWNBeVdlWmdKNXM5bm41NlFFcHlCRFN1L2o0Tk5CczZieGNwbUZ4d3phaTFJdkd5NGRVRwpialorZ2NXMXVFQTZDQ3FrYnQ0Smh2RkVEVUZmUUlQMUZaZ1JNc2g4OFpnZ2FjV2YrRktMCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/dsBuild/target/classes/publishImage.json b/dsBuild/target/classes/publishImage.json deleted file mode 100644 index 6e6528b2..00000000 --- a/dsBuild/target/classes/publishImage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "host": "10.10.14.212", - "user": "root", - "pwd": "dsideal", - "port": 22 -} diff --git a/dsBuild/target/classes/publishImage.jsonstatic.zip b/dsBuild/target/classes/publishImage.jsonstatic.zip deleted file mode 100644 index 3038dad6..00000000 Binary files a/dsBuild/target/classes/publishImage.jsonstatic.zip and /dev/null differ diff --git a/dsBuild/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dsBuild/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index aa8a6ef1..00000000 --- a/dsBuild/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -build_ds_gw.class -build_ds_base.class -Util\PublishUtil.class -Util\SSHUtil.class diff --git a/dsBuild/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dsBuild/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index f1d1fed7..00000000 --- a/dsBuild/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -D:\dsWork\dsProject\ds-build\src\main\java\Util\PublishUtil.java -D:\dsWork\dsProject\ds-build\src\main\java\build_ds_gw.java -D:\dsWork\dsProject\ds-build\src\main\java\build_ds_base.java -D:\dsWork\dsProject\ds-build\src\main\java\Util\SSHUtil.java diff --git a/dsGw/Dockerfile b/dsGw/Dockerfile index 27ebed36..52e5119c 100644 --- a/dsGw/Dockerfile +++ b/dsGw/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 +FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:21 # WORKDIR指令用于设置容器内部的工作目录,即后续指令执行时的当前目录。当Docker容器启动并执行命令时,这些命令将在WORKDIR指定的目录中执行。 WORKDIR /root @@ -6,6 +6,10 @@ WORKDIR /root # ENV TZ这样的用法通常是用来设置时区环境变量,TZ代表Time Zone ENV TZ=Asia/Shanghai +# 让容器内部正常显示中文 +ENV LANG C.UTF-8 + + # 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下 COPY ./lib /root/lib COPY ./target /root/target diff --git a/dsGw/dsGw.iml b/dsGw/dsGw.iml new file mode 100644 index 00000000..546154af --- /dev/null +++ b/dsGw/dsGw.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/dsGw/target/classes/application_ali.yaml b/dsGw/target/classes/application_ali.yaml deleted file mode 100644 index 7604cfe6..00000000 --- a/dsGw/target/classes/application_ali.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -# 路由 -route: - # 基础数据 - dsBase: - url: http://ds-base:8001 - # 资源库 - dsRes: - url: http://ds-res:8002 - -# 白名单 -whitelist: - # 全局变量获取 - - /dsBase/global/getGlobalValueByKey - # 登录 - - /dsBase/loginPerson/doLogin - diff --git a/dsGw/target/classes/application_dev.yaml b/dsGw/target/classes/application_dev.yaml deleted file mode 100644 index a1ad96f6..00000000 --- a/dsGw/target/classes/application_dev.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: c:/Windows/Temp - -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -# 路由 -route: - # 基础数据 - dsBase: - url: http://ds-base:8001 - # 资源库 - dsRes: - url: http://ds-res:8002 - - - -# 白名单 -whitelist: - # 全局变量获取 - - /dsBase/global/getGlobalValueByKey - # 登录 - - /dsBase/loginPerson/doLogin - - /dsBase/loginPerson/doLoginV2 - # 登录首页 - - /dsBase/ diff --git a/dsGw/target/classes/application_pro.yaml b/dsGw/target/classes/application_pro.yaml deleted file mode 100644 index 7604cfe6..00000000 --- a/dsGw/target/classes/application_pro.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -# 路由 -route: - # 基础数据 - dsBase: - url: http://ds-base:8001 - # 资源库 - dsRes: - url: http://ds-res:8002 - -# 白名单 -whitelist: - # 全局变量获取 - - /dsBase/global/getGlobalValueByKey - # 登录 - - /dsBase/loginPerson/doLogin - diff --git a/dsGw/target/classes/logback.xml b/dsGw/target/classes/logback.xml deleted file mode 100644 index 9f487643..00000000 --- a/dsGw/target/classes/logback.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) - - %msg%n - - - - - - ${LOG_HOME}/QingLong.log - - - ${LOG_HOME}/dsGw.log.%d{yyyy-MM-dd}.log - - 30 - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n - - - - 100MB - - - - - - - - - - \ No newline at end of file diff --git a/dsGw/target/classes/logo.txt b/dsGw/target/classes/logo.txt deleted file mode 100644 index b5406466..00000000 --- a/dsGw/target/classes/logo.txt +++ /dev/null @@ -1,11 +0,0 @@ - - $$\ $$$$$$\ - $$ | $$ __$$\ - $$$$$$$ | $$$$$$$\ $$ / \__|$$\ $$\ $$\ -$$ __$$ |$$ _____|$$ |$$$$\ $$ | $$ | $$ | -$$ / $$ |\$$$$$$\ $$ |\_$$ |$$ | $$ | $$ | -$$ | $$ | \____$$\ $$ | $$ |$$ | $$ | $$ | -\$$$$$$$ |$$$$$$$ |\$$$$$$ |\$$$$$\$$$$ | - \_______|\_______/ \______/ \_____\____/ - -power by http://patorjk.com/software/taag/ \ No newline at end of file diff --git a/dsGw/target/classes/undertow_dev.properties b/dsGw/target/classes/undertow_dev.properties deleted file mode 100644 index 0d46552b..00000000 --- a/dsGw/target/classes/undertow_dev.properties +++ /dev/null @@ -1,24 +0,0 @@ -# true 值支持热加载 -undertow.devMode=false -undertow.port=8000 -undertow.host=0.0.0.0 - -# 目录名称 -undertow.contextPath=/ - -# 设定I/O线程数. -server.undertow.io-threads=8 - -# 设定工作线程数 -server.undertow.worker-threads=60 - -# gzip 压缩开关 -undertow.gzip.enable=true -# 配置压缩级别,默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度,9 拥有最高压缩率 -undertow.gzip.level=-1 -# 触发压缩的最小内容长度 -undertow.gzip.minLength=1024 - -# 开启access日志 -server.undertow.accesslog.enabled=false -server.undertow.accesslog.pattern=%t %a "%r" %s (%D ms) diff --git a/dsGw/target/classes/undertow_pro.properties b/dsGw/target/classes/undertow_pro.properties deleted file mode 100644 index eb94762a..00000000 --- a/dsGw/target/classes/undertow_pro.properties +++ /dev/null @@ -1,25 +0,0 @@ -# true 值支持热加载 -undertow.devMode=false -undertow.port=8000 -undertow.host=0.0.0.0 - -# 目录名称 -undertow.contextPath=/ - -# 设定I/O线程数. -server.undertow.io-threads=8 - -# 设定工作线程数 -server.undertow.worker-threads=60 - -# gzip 压缩开关 -undertow.gzip.enable=true -# 配置压缩级别,默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度,9 拥有最高压缩率 -undertow.gzip.level=-1 -# 触发压缩的最小内容长度 -undertow.gzip.minLength=1024 - -# 开启access日志 -server.undertow.accesslog.enabled=false -server.undertow.accesslog.pattern=%t %a "%r" %s (%D ms) - diff --git a/dsGw/生成依赖jar.bat b/dsGw/生成依赖jar.bat new file mode 100644 index 00000000..1ef4abc5 --- /dev/null +++ b/dsGw/生成依赖jar.bat @@ -0,0 +1,7 @@ +mkdir lib +cd lib +del *.jar /q +cd .. +mvn -f pom.xml dependency:copy-dependencies -DoutputDirectory=lib + +@echo 黄海完成了! diff --git a/dsPay/Invoice-master/README.md b/dsPay/Invoice-master/README.md new file mode 100644 index 00000000..d5c899f2 --- /dev/null +++ b/dsPay/Invoice-master/README.md @@ -0,0 +1,6 @@ +# 发票 HTML( invoice ) +辅助 JAVA,HTML 生成 PDF发票 +# 模板 HTML 地址 +[HTML DIV布局模板预览地址](https://leexhuan.github.io/Invoice/index.html) + +[HTML 无缝滚动模板预览地址](https://leexhuan.github.io/Invoice/new_file.html) diff --git a/dsPay/Invoice-master/images/1561108150.png b/dsPay/Invoice-master/images/1561108150.png new file mode 100644 index 00000000..0500c086 Binary files /dev/null and b/dsPay/Invoice-master/images/1561108150.png differ diff --git a/dsPay/Invoice-master/index.css b/dsPay/Invoice-master/index.css new file mode 100644 index 00000000..5deda38e --- /dev/null +++ b/dsPay/Invoice-master/index.css @@ -0,0 +1,573 @@ +p, +dl, +dt, +dd { + margin: 0; + padding: 0; +} + +.fl { + float: left; +} +.fz10 { + font-size: 10px; +} +.fz12 { + font-size: 12px; +} +.fz16 { + font-size: 16px; +} + +.black { + color: #000; +} + +.orange { + color: #ab6226; +} + +.l-s1 { + letter-spacing: 1px; +} + +.l-s2 { + letter-spacing: 2px; +} + +.l-s38 { + letter-spacing: 38px; +} + +.ta-c { + text-align: center; +} + +.ta-l { + text-align: left; +} + +.ta-r { + text-align: right; +} + +.ovh { + overflow: hidden; +} + +.ps-r { + position: relative; +} + +.m-l14 { + margin-left: 14px; +} +.m-r20 { + margin-right: 20px; +} +.ps-al-203, +.ps-al-260, +.ps-al-306, +.ps-al-394, +.ps-al-489, +.ps-al-607, +.ps-al-638 { + position: absolute; + bottom: 0; + left: 203px; +} +.ps-al-306 { + left: 306px; +} + +.ps-al-260 { + left: 260px; +} + +.ps-al-394 { + left: 394px; +} + +.ps-al-489 { + left: 489px; +} + +.ps-al-638 { + left: 638px; +} + +.ps-al-607 { + left: 607px; +} + +.ps-al-203 { + left: 203px; +} + +.lh19 { + line-height: 19px; +} + +.lh20 { + line-height: 20px; +} + +.lh24 { + line-height: 24px; +} + +.lh29 { + line-height: 29px; +} + +.lh34 { + line-height: 34px; +} + +.invoice-body { + width: 814px; + height: 526px; + background: #fff; + padding: 10px 24px 30px 30px; + font-size: 10px; + font-family: "宋体"; + margin: 0 auto; +} + +.invoice-body-up { + margin: 0 auto 12px; + width: 760px; + height: 100px; +} + +.invoice-body-up-left { + width: 230px; + height: 100%; +} + +.invoice-body-up-left-img { + padding: 0 0 6px 16px; +} + +.invoice-body-up-center { + width: 298px; +} + +.invoice-body-up-center-title { + font-size: 24px; + margin: 24px 0 12px; +} + +.invoice-body-up-center-border { + border-top: 2px solid #902121; + border-bottom: 2px solid #b46a6a; + height: 1px; +} + +.invoice-body-up-right { + width: 210px; + padding-left: 20px; +} + +.w29 { + width: 29px; + height: 100%; + min-height: 10px; +} +.w31 { + width: 31px; + height: 100%; + min-height: 10px; +} +.w44 { + width: 44px; + height: 100%; + min-height: 10px; +} +.w46 { + width: 46px; + height: 100%; + min-height: 10px; +} + +.w50 { + width: 50px; + height: 100%; + min-height: 10px; +} + +.w57 { + width: 57px; + height: 100%; + min-height: 10px; +} +.w74 { + width: 74px; + height: 100%; + min-height: 10px; +} +.w77 { + width: 77px; + height: 100%; + min-height: 10px; +} +.w81 { + width: 81px; + height: 100%; + min-height: 10px; +} +.w88 { + width: 88px; + height: 100%; + min-height: 10px; +} +.w90 { + width: 90px; + height: 100%; + min-height: 10px; +} +.w91 { + width: 91px; + height: 100%; + min-height: 10px; +} +.w95 { + width: 95px; + height: 100%; + min-height: 10px; +} +.w97 { + width: 97px; + height: 100%; + min-height: 10px; +} +.w117 { + width: 117px; + height: 100%; + min-height: 10px; +} + +.w118 { + width: 118px; + height: 100%; + min-height: 10px; +} + +.w126 { + width: 126px; + height: 100%; + min-height: 10px; +} + +.w150 { + width: 150px; + height: 100%; + min-height: 10px; +} + +.w160 { + width: 160px; + height: 100%; + min-height: 10px; +} + +.w170 { + width: 170px; + height: 100%; + min-height: 10px; +} + +.w192 { + width: 192px; + height: 100%; + min-height: 10px; +} + +.w203 { + width: 203px; + height: 100%; + min-height: 10px; +} + +.w204 { + width: 204px; + height: 100%; + min-height: 10px; +} + +.w212 { + width: 212px; + height: 100%; + min-height: 10px; +} +.w215 { + width: 215px; + height: 100%; + min-height: 10px; +} +.w360 { + width: 360px; + height: 100%; + min-height: 10px; +} + +.w552 { + width: 552px; + height: 100%; + min-height: 10px; +} + +.t-i4 { + text-indent: 4px; +} + +.invoice-right-label { + display: inline-block; + text-align-last: justify; + text-align: justify; +} + +.invoice-table { + border: 1px solid #902121; + width: 758px; + height: 353px; + margin: 0 auto; +} + +.invoice-table-header { + height: 78px; + border-bottom: 1px solid #902121; + width: 100%; +} + +.invoice-table-header-left { + width: 24px; + border-right: 1px solid #902121; + color: #ab6226; + height: 72px; + padding: 6px 0 0 2px; +} + +.invoice-table-header-center1 { + width: 398px; + border-right: 1px solid #902121; + height: 78px; + padding-left: 8px; +} + +.invoice-table-header-right { + width: 252px; + height: 78px; + padding: 0 20px 0 24px; + word-break: break-all; +} + +.invoice-table-content { + height: 166px; +} + +.invoice-table-content-header { + height: 20px; + width: 100%; +} +.invoice-map{ + height: 128px; +} + +.invoice-table-content-center { + height: 16px; + line-height: 16px; +} + +.invoice-table-content-bottom { + height: 18px; +} + +.border-right-height { + border-right: 1px solid #902121; + height: 100%; +} + +.invoice-table-content2 { + height: 29px; + border-bottom: 1px solid #902121; + border-top: 1px solid #902121; + width: 100%; +} + +.invoice-table-bottom { + height: 78px; + width: 100%; +} + +.invoice-table-footer { + margin: 10px auto; + width: 758px; +} + +.invoice-list { + width: 795px; + background: #ffffff; + padding: 55px 35px 30px 38px; + font-size: 14px; + font-family: "宋体"; + margin: 0 auto; +} +.invoice-list-title { + height: 58px; + text-align: center; + font-size: 20px; + font-weight: 600; + color: #ab6226; +} +.invoice-list-header { + height: 100px; + width: 739px; + overflow: hidden; + padding-left: 6px; +} +.invoice-list-header-name { + height: 30px; +} +.invoice-list-header-name1 { + width: 310px; +} +.invoice-list-header-name2 { + width: 258px; +} +.invoice-list-table { + width: 744px; + border: 2px solid #902121; + margin-bottom: 24px; +} +.invoice-list-table-title { + border-bottom: 2px solid #c58c8c; + width: 100%; + height: 18px; + line-height: 18px; + color: #ab6226; + text-align: center; + overflow: hidden; + font-size: 12px; +} +.invoice-list-table-title1, +.invoice-list-table-title2, +.invoice-list-table-title3, +.invoice-list-table-title4, +.invoice-list-table-title5, +.invoice-list-table-title6, +.invoice-list-table-title7, +.invoice-list-table-title8 { + float: left; + width: 30px; + min-height: 18px; + border-right: 1px solid #c58c8c; +} + +.invoice-list-table-title2 { + width: 214px; +} +.invoice-list-table-title3 { + width: 72px; +} +.invoice-list-table-title4 { + width: 43px; +} +.invoice-list-table-title5 { + width: 76px; +} +.invoice-list-table-title6 { + width: 80px; +} +.invoice-list-table-title7 { + width: 90px; +} +.invoice-list-table-title8 { + width: 28px; +} +.invoice-list-table-title9 { + float: left; + width: 96px; +} +.invoice-table-map { + height: 900px; + overflow: hidden; + position: relative; +} +.invoice-border-line1, +.invoice-border-line2, +.invoice-border-line3, +.invoice-border-line4, +.invoice-border-line5, +.invoice-border-line6, +.invoice-border-line7, +.invoice-border-line8 { + position: absolute; + height: 100%; + bottom: 0; + border-right: 1px solid #c58c8c; +} +.invoice-border-line1 { + left: 30px; +} +.invoice-border-line2 { + left: 245px; +} +.invoice-border-line3 { + left: 318px; +} +.invoice-border-line4 { + left: 362px; +} +.invoice-border-line5 { + left: 439px; +} +.invoice-border-line6 { + left: 520px; +} +.invoice-border-line7 { + left: 611px; +} +.invoice-border-line8 { + left: 640px; +} +.invoice-table-map-item { + width: 100%; + line-height: 18px; + text-align: center; + font-size: 12px; + overflow: hidden; +} +.invoice-table-bottom1 { + width: 100%; + line-height: 18px; + text-align: center; + font-size: 12px; + overflow: hidden; +} +.invoice-table-bottom2 { + width: 100%; + text-align: center; + font-size: 12px; + overflow: hidden; + border-top: 1px solid #c58c8c; +} +.invoice-table-bottom2-left { + min-height: 40px;float: left;width: 30px;border-right: 1px solid #c58c8c;text-align: center;color: #ab6226;line-height: 40px; +} +.invoice-table-bottom2-right { + min-height: 40px; + float: left; + width: 700px; + text-align: left; +} +.invoice-table-footer{ + overflow:hidden;margin: 0 auto;width:744px; +} +.invoice-table-footer-left{ + float: left;width: 460px; +} +.invoice-table-footer-right{ + float: left;width: 240px; +} + diff --git a/dsPay/Invoice-master/index.html b/dsPay/Invoice-master/index.html new file mode 100644 index 00000000..b8921068 --- /dev/null +++ b/dsPay/Invoice-master/index.html @@ -0,0 +1,247 @@ + + + + + + + + 发票 + + + + + +
+
+
+
+
+ 二维码 +
+
机器编号:661611953410
+
+
+
+

重庆增值税电子普通发票

+
+
+
+

+ 发票代码 + 044031800211 +

+

+ 发票号码 + 805421210 +

+

+ 开票日期 + 2019 05 23 +

+

+ 校验码 + 73165 09840 76544 48548 +

+
+
+
+
+
+ 购买方 +
+
+

+ 名称 + 044031800211 +

+

+ 纳税人识别号 + 805421210 +

+

+ 地址、电话 + 重庆开票 +

+

+ 开户行及账号 + 73165 09840 76544 48548 +

+
+
+ 密码区 +
+
+ /2/75+<311+54*3667<<>>5<++9+/ <7-4+18-//0*12*25-1*9/17975203 <601*00<2+84*3625>6>**<-+/3>17-4+18-//0*12*25/8>*5/ +
+
+
+
+
+
+
+
+
+
+
+
货物或应税劳务、服务名称
+
规格型号
+
单位
+
数量
+
单 价
+
金 额
+
税率
+
税 额
+
+
+
+
(详见销货清单)
+
+
+
1
+
1
+
4287.17
+
13%
+
557.33
+
+
+
+
合计
+
+
+
+
+
¥4287.17
+
+
¥557.33
+
+
+
+
价税合计(大写)
+
+

肆仟捌佰肆拾肆圆五角

+

(小写) ¥4844.50

+
+
+
+
销售方
+
+

+ 名称 + 044031800211 +

+

+ 纳税人识别号 + 805421210 +

+

+ 地址、电话 + 重庆开票 +

+

+ 开户行及账号 + 73165 09840 76544 48548 +

+
+
+ 备 注 +
+
订单C1182451210021215540
+
+
+ +
+ +
+
销售货物或者提供应税劳务、服务清单
+
+

购买方姓名:个人

+

销售方名称:重庆万普拉斯贸易有限公司

+
+

所属增值税电子普通发票代码:044031800311 +

+

号码:044031800311

+

+ 1 + 1 +

+
+
+
+
+
序号
+
货物(劳务)名称
+
规格型号
+
单位
+
数  量
+
单  价
+
金  额
+
税率
+
税  额
+
+
+
+
+
+
+
+
+
+
+ +
+
1
+
磨烟灰 12GB+512G 中国 G M 1910磨烟灰 12GB+512G 中国 G M 1910
+
+
+
1
+
3981.42
+
3981.42
+
13%
+
517.58
+
+
+
+
小计
+
+
+
+
+
+
¥4287.17
+
+
¥557.33
+
+
+
总计
+
+
+
+
+
+
¥4287.17
+
+
¥557.33
+
+
+
+ 备注
+
订单C111905223158193421
+
+
+ +
+ + + \ No newline at end of file diff --git a/dsPay/Invoice-master/index.html.pdf b/dsPay/Invoice-master/index.html.pdf new file mode 100644 index 00000000..e69de29b diff --git a/dsPay/Invoice-master/new_file.html b/dsPay/Invoice-master/new_file.html new file mode 100644 index 00000000..c6b6c316 --- /dev/null +++ b/dsPay/Invoice-master/new_file.html @@ -0,0 +1,74 @@ + + + + + + 无标题文档 + + + + +
+
    +
  • 1
  • +
  • 2
  • +
  • 3
  • +
  • 4
  • +
  • 5
  • +
  • 1
  • +
  • 2
  • +
  • 3
  • +
  • 4
  • +
  • 5
  • +
+
+ + + \ No newline at end of file diff --git a/dsPay/pom.xml b/dsPay/pom.xml new file mode 100644 index 00000000..4811b97e --- /dev/null +++ b/dsPay/pom.xml @@ -0,0 +1,74 @@ + + 4.0.0 + dsPay + 1.0 + + dsideal + dsProject + 1.0 + + + + UTF-8 + 21 + 21 + + + + + ali-maven + https://maven.aliyun.com/nexus/content/groups/public + + true + + + true + always + fail + + + + + + + org.xhtmlrenderer + core-renderer + R8pre2 + + + + org.docx4j + xhtmlrenderer + 1.0.0 + + + + + com.lowagie + itext + 2.0.8 + + + + + + src/main/resources + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 21 + 21 + UTF-8 + + -parameters + + + + + diff --git a/dsPay/src/main/java/HtmltoPDF.java b/dsPay/src/main/java/HtmltoPDF.java new file mode 100644 index 00000000..d1b01618 --- /dev/null +++ b/dsPay/src/main/java/HtmltoPDF.java @@ -0,0 +1,82 @@ +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStream; + + +import org.xhtmlrenderer.pdf.ITextFontResolver; +import org.xhtmlrenderer.pdf.ITextRenderer; + +import com.lowagie.text.pdf.BaseFont; + + +public class HtmltoPDF { + + public static void main( String[] args ) throws Exception{ + + +// htmlToPdf(); +// htmlToPdf2(); + htmlToPdf3(); + } + + // 不支持中文 + public static void htmlToPdf() throws Exception + { + String inputFile = "D:/Test/flying.html"; + String url = new File( inputFile ).toURI().toURL().toString(); + String outputFile = "D:/Test/flying.pdf"; + OutputStream os = new FileOutputStream( outputFile ); + ITextRenderer renderer = new ITextRenderer(); + renderer.setDocument( url ); + renderer.layout(); + renderer.createPDF( os ); + os.close(); + } + + // 支持中文 + public static void htmlToPdf2() throws Exception { + String outputFile = "F:/TestDemo/demo_3.pdf"; + OutputStream os = new FileOutputStream(outputFile); + ITextRenderer renderer = new ITextRenderer(); + ITextFontResolver fontResolver = renderer.getFontResolver(); + fontResolver.addFont("C:/Windows/fonts/simsun.ttc", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); + StringBuffer html = new StringBuffer(); + // DOCTYPE 必需写否则类似于 这样的字符解析会出现错误 + html.append(""); + html.append(""). + append("") + .append("") + .append("") + .append("") + .append(""); + html.append("
支持中文!
"); + html.append(""); + renderer.setDocumentFromString(html.toString()); + // 解决图片的相对路径问题 + // renderer.getSharedContext().setBaseURL("file:/F:/teste/html/"); + renderer.layout(); + renderer.createPDF(os); + System.out.println("======转换成功!"); + os.close(); + } + + public static void htmlToPdf3() throws Exception{ + String inputFile = "F:/TestDemo/test.html"; //本地目录必须html语言否则报错 + String outFile = "F:/TestDemo/test.pdf"; + OutputStream os = null; + os = new FileOutputStream(outFile); + ITextRenderer renderer = new ITextRenderer(); + ITextFontResolver fontResolver = renderer.getFontResolver(); + fontResolver.addFont("C:/Windows/fonts/simsun.ttc", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); + + String url = new File( inputFile ).toURI().toURL().toString(); + System.out.println("=============url: "+url); + renderer.setDocument(url); + renderer.layout(); + renderer.createPDF(os); + System.out.println("======转换成功!"); + os.close(); + } + + +} \ No newline at end of file diff --git a/dsPay/文档.md b/dsPay/文档.md new file mode 100644 index 00000000..4947f07d --- /dev/null +++ b/dsPay/文档.md @@ -0,0 +1,6 @@ +IJPay 让支付触手可及 +https://github.com/Javen205/IJPay + +发票 HTML( invoice ) +https://github.com/LeeXhuan/Invoice + diff --git a/dsProject.iml b/dsProject.iml deleted file mode 100644 index 19888c17..00000000 --- a/dsProject.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/dsRes.iml b/dsRes.iml deleted file mode 100644 index 0c5c4d56..00000000 --- a/dsRes.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/dsRes/Dockerfile b/dsRes/Dockerfile index bddc1b32..abf4212c 100644 --- a/dsRes/Dockerfile +++ b/dsRes/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-hangzhou.aliyuncs.com/yltcharge/jdk:21 +FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:21 # WORKDIR指令用于设置容器内部的工作目录,即后续指令执行时的当前目录。当Docker容器启动并执行命令时,这些命令将在WORKDIR指定的目录中执行。 WORKDIR /root @@ -6,6 +6,10 @@ WORKDIR /root # ENV TZ这样的用法通常是用来设置时区环境变量,TZ代表Time Zone ENV TZ=Asia/Shanghai +# 让容器内部正常显示中文 +ENV LANG C.UTF-8 + + # 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下 COPY ./lib /root/lib COPY ./target /root/target diff --git a/dsBase/.idea/ds-base.iml b/dsRes/dsRes.iml similarity index 100% rename from dsBase/.idea/ds-base.iml rename to dsRes/dsRes.iml diff --git a/dsRes/pom.xml b/dsRes/pom.xml index ec7cf17e..0a129586 100644 --- a/dsRes/pom.xml +++ b/dsRes/pom.xml @@ -20,7 +20,7 @@ ali-maven - http://maven.aliyun.com/nexus/content/groups/public + https://maven.aliyun.com/nexus/content/groups/public true @@ -247,6 +247,11 @@ + + + src/main/resources + + org.apache.maven.plugins diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 43d98a13..c276af2a 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -1,8 +1,13 @@ package com.dsideal.resource.Base.Controller; import com.dsideal.resource.Base.Model.BaseModel; +import com.dsideal.resource.Interceptor.EmptyInterface; +import com.dsideal.resource.Interceptor.IsNumericInterface; import com.dsideal.resource.Util.RetKit; +import com.jfinal.aop.Before; import com.jfinal.core.Controller; +import com.jfinal.ext.interceptor.GET; +import com.jfinal.ext.interceptor.POST; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; @@ -14,13 +19,176 @@ public class BaseController extends Controller { /** * 功能:获取学段列表 */ + @Before({GET.class}) public void getStageList() { List list = bm.getStageList(); - Page page=new Page<>(); + Page page = new Page<>(); page.setList(list); page.setPageSize(20); page.setTotalRow(list.size()); page.setPageNumber(1); renderJson(RetKit.renderSuccess(page)); } + + /** + * 功能:增加科目 + */ + @Before({POST.class}) + @EmptyInterface({"subject_name", "subject_code"}) + @IsNumericInterface({"sort_id", "stage_id"}) + public void addSubject(String subject_name, String subject_code, int stage_id, int sort_id) { + //1、检查科目名称是不是已经在指定学段下存在,存在的不能继续添加 + if (bm.checkSubjectName(subject_name, stage_id)) { + renderJson(RetKit.renderFail("该科目名称已存在")); + return; + } + //2、检查科目代码是不是在指定学段下存在,存在的不能继续添加 + if (bm.checkSubjectCode(subject_code, stage_id)) { + renderJson(RetKit.renderFail("该科目代码已存在")); + return; + } + //3、可以正确添加 + bm.addSubject(subject_name, subject_code, stage_id, sort_id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + /** + * 功能:删除科目 + */ + @Before({POST.class}) + @IsNumericInterface({"subject_id"}) + public void delSubject(int subject_id) { + bm.delSubject(subject_id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + /** + * 功能:修改科目 + */ + @Before({POST.class}) + @EmptyInterface({"subject_name", "subject_code"}) + @IsNumericInterface({"sort_id", "stage_id", "subject_id"}) + public void updateSubject(int subject_id, String subject_name, String subject_code, int stage_id, int sort_id) { + //1、检查科目名称是不是已经在指定学段下存在,存在的不能继续添加 + if (bm.checkSubjectName(subject_id, subject_name, stage_id)) { + renderJson(RetKit.renderFail("该科目名称已存在")); + return; + } + //2、检查科目代码是不是在指定学段下存在,存在的不能继续添加 + if (bm.checkSubjectCode(subject_id, subject_code, stage_id)) { + renderJson(RetKit.renderFail("该科目代码已存在")); + return; + } + //3、可以正确修改 + bm.updateSubject(subject_id, subject_name, subject_code, stage_id, sort_id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + /** + * 功能:科目列表 + */ + @Before({GET.class}) + @IsNumericInterface({"pageNum", "pageSize"}) + public void listSubject(int stage_id, int pageNum, int pageSize) { + Page listPage = bm.listSubject(stage_id, pageNum, pageSize); + renderJson(RetKit.renderSuccess(listPage)); + } + + /** + * 功能:获取科目信息 + */ + @Before({GET.class}) + @IsNumericInterface({"subject_id"}) + public void getSubject(int subject_id) { + Record record = bm.getSubject(subject_id); + renderJson(RetKit.renderSuccess(record)); + } + + /** + * 功能:添加版本 + * scheme_name 版本名称 + * stage_id 学段 + * subject_id 科目 + * b_use 是否启用 + * owner_id 系统:0 其他:学校ID + * type_id1 章节目录结构 2:知识点结构 + * scheme_type_id 1:系统 2:云盘 + * sort_id 版本的排序号 + */ + @Before({POST.class}) + @EmptyInterface({"scheme_name", "owner_id"}) + @IsNumericInterface({"stage_id", "subject_id", "type_id", "scheme_type_id", "sort_id"}) + public void addScheme(String scheme_name, int stage_id, int subject_id, String owner_id, int type_id, int scheme_type_id, int sort_id) { + //1、检查此名称的版本是否已经存在,存在的不能继续添加 + if (bm.checkSchemeName(scheme_name, stage_id)) { + renderJson(RetKit.renderFail("该版本名称已存在")); + return; + } + //2、通过检查,可以添加 + bm.addScheme(scheme_name, stage_id, subject_id, 1, owner_id, type_id, scheme_type_id, sort_id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + /** + * 功能:删除版本 + * + * @param scheme_id + */ + @Before({POST.class}) + @IsNumericInterface({"scheme_id"}) + public void delScheme(int scheme_id) { + bm.delScheme(scheme_id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + /** + * 功能:修改版本 + * + * @param scheme_id + * @param scheme_name + * @param stage_id + * @param subject_id + * @param type_id + * @param scheme_type_id + * @param sort_id + */ + @Before({POST.class}) + @EmptyInterface({"scheme_name"}) + @IsNumericInterface({"scheme_id", "stage_id", "subject_id", "type_id", "scheme_type_id", "sort_id"}) + public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int scheme_type_id, int sort_id) { + //1、检查此名称的版本是否已经存在,存在的不能继续添加 + if (bm.checkSchemeName(scheme_id, scheme_name, stage_id)) { + renderJson(RetKit.renderFail("该版本名称已存在")); + return; + } + //2、检查通过,可以修改 + bm.updateScheme(scheme_id, scheme_name, stage_id, subject_id, type_id, scheme_type_id, sort_id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + /** + * 功能:版本列表 + * + * @param stage_id + * @param pageNum + * @param pageSize + */ + @Before({GET.class}) + @IsNumericInterface({"pageNum", "pageSize"}) + public void listScheme(int stage_id, int subject_id, int pageNum, int pageSize) { + Page listPage = bm.listScheme(stage_id, subject_id, pageNum, pageSize); + renderJson(RetKit.renderSuccess(listPage)); + } + + /** + * 功能:获取版本信息 + * + * @param scheme_id + */ + @Before({GET.class}) + @IsNumericInterface({"scheme_id"}) + public void getScheme(int scheme_id) { + Record record = bm.getScheme(scheme_id); + renderJson(RetKit.renderSuccess(record)); + } } diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java index 6e58c750..a7bf402c 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java @@ -1,16 +1,245 @@ package com.dsideal.resource.Base.Model; +import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; +import com.jfinal.plugin.activerecord.SqlPara; + +import java.util.HashMap; import java.util.List; +import java.util.Map; public class BaseModel { /** * 功能:获取学段列表 + * * @return */ - public List getStageList(){ - String sql="select * from t_dm_stage order by stage_id"; + public List getStageList() { + String sql = "select * from t_dm_stage order by stage_id"; return Db.find(sql); } + + public Map getStageMap() { + List list = getStageList(); + Map map = new HashMap<>(); + for (Record record : list) { + map.put(record.getInt("stage_id"), record.getStr("stage_name")); + } + return map; + } + + public Record getStage(int stage_id) { + String sql = "select * from t_dm_stage where stage_id=?"; + return Db.findFirst(sql, stage_id); + } + + /** + * 功能:检查学科名称是否重复 + * + * @param subject_name + * @param stage_id + * @return + */ + public boolean checkSubjectName(String subject_name, int stage_id) { + return checkSubjectName(-1, subject_name, stage_id); + } + + public boolean checkSubjectName(int subject_id, String subject_name, int stage_id) { + String sql = "select count(1) as c from t_dm_subject where subject_name=? and stage_id=? and subject_id<>?"; + int count = Db.findFirst(sql, subject_name, stage_id, subject_id).getInt("c"); + return count > 0; + } + + /** + * 功能:检查学科代码是否重复 + * + * @param subject_code + * @param stage_id + * @return + */ + public boolean checkSubjectCode(String subject_code, int stage_id) { + return checkSubjectCode(-1, subject_code, stage_id); + } + + public boolean checkSubjectCode(int subject_id, String subject_code, int stage_id) { + String sql = "select count(1) as c from t_dm_subject where subject_code=? and stage_id=? and subject_id<>?"; + int count = Db.findFirst(sql, subject_code, stage_id, subject_id).getInt("c"); + return count > 0; + } + + /** + * 功能:添加学科 + * + * @param subject_name + * @param subject_code + * @param stage_id + * @param sort_id + */ + public void addSubject(String subject_name, String subject_code, int stage_id, int sort_id) { + Record record = new Record(); + record.set("subject_name", subject_name); + record.set("subject_code", subject_code); + record.set("stage_id", stage_id); + record.set("sort_id", sort_id); + Db.save("t_dm_subject", record); + } + + /** + * 功能:删除学科 + * + * @param subject_id + */ + public void delSubject(int subject_id) { + String sql = "delete from t_dm_subject where subject_id=?"; + Db.update(sql, subject_id); + } + + /** + * 功能:修改学科 + * + * @param subject_id + * @param subject_name + * @param subject_code + * @param stage_id + * @param sort_id + */ + public void updateSubject(int subject_id, String subject_name, String subject_code, int stage_id, int sort_id) { + String sql = "update t_dm_subject set subject_name=?,subject_code=?,stage_id=?,sort_id=? where subject_id=?"; + Db.update(sql, subject_name, subject_code, stage_id, sort_id, subject_id); + } + + /** + * 功能:获取学科列表 + * + * @param stage_id + * @param pageNum + * @param pageSize + * @return + */ + public Page listSubject(int stage_id, int pageNum, int pageSize) { + String sql; + Page subjectPage; + if (stage_id == 0) { + sql = "from t_dm_subject order by sort_id"; + subjectPage = Db.paginate(pageNum, pageSize, "select *", sql); + } else { + sql = "from t_dm_subject where stage_id=? order by sort_id"; + subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id); + } + + Map map = getStageMap(); + for (Record record : subjectPage.getList()) { + record.set("stage_name", map.get(record.getInt("stage_id"))); + } + return subjectPage; + } + + /** + * 功能:获取学科信息 + * + * @param subject_id + * @return + */ + public Record getSubject(int subject_id) { + String sql = "select * from t_dm_subject where subject_id=?"; + return Db.findFirst(sql, subject_id); + } + + /** + * 功能:检查教学方案名称是否重复 + * + * @return + */ + public boolean checkSchemeName(String scheme_name, int stage_id) { + return checkSchemeName(-1, scheme_name, stage_id); + } + + public boolean checkSchemeName(int scheme_id, String scheme_name, int stage_id) { + String sql = "select count(1) as c from t_resource_scheme where scheme_name=? and stage_id=? and scheme_id<>?"; + return Db.findFirst(sql, scheme_name, stage_id, scheme_id).getInt("c") > 0; + } + + /** + * 功能:添加教学方案 + * + * @param scheme_name + * @param stage_id + * @param subject_id + * @param b_use + * @param owner_id + * @param type_id + * @param scheme_type_id + * @param sort_id + */ + public void addScheme(String scheme_name, int stage_id, int subject_id, int b_use, String owner_id, int type_id, int scheme_type_id, int sort_id) { + Record record = new Record(); + record.set("scheme_name", scheme_name); + record.set("stage_id", stage_id); + record.set("subject_id", subject_id); + record.set("b_use", b_use); + record.set("owner_id", owner_id); + record.set("type_id", type_id); + record.set("scheme_type_id", scheme_type_id); + record.set("sort_id", sort_id); + Db.save("t_resource_scheme", record); + } + + /** + * 功能:删除教学方案 + * + * @param scheme_id + */ + public void delScheme(int scheme_id) { + String sql = "update t_resource_scheme set b_use=0 where scheme_id=?"; + Db.update(sql, scheme_id); + } + + /** + * 功能:修改教学方案 + * + * @param scheme_id + * @param scheme_name + * @param stage_id + * @param subject_id + * @param type_id + * @param scheme_type_id + * @param sort_id + */ + public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int scheme_type_id, int sort_id) { + String sql = "update t_resource_scheme set scheme_name=?,stage_id=?,subject_id=?,type_id=?,scheme_type_id=?,sort_id=? where scheme_id=?"; + Db.update(sql, scheme_name, stage_id, subject_id, type_id, scheme_type_id, sort_id, scheme_id); + } + + /** + * 功能:获取教学方案列表 + * + * @param stage_id + * @param pageNum + * @param pageSize + * @return + */ + public Page listScheme(int stage_id, int subject_id, int pageNum, int pageSize) { + Kv kv = Kv.create(); + if (stage_id > 0) { + kv.set("stage_id", stage_id); + } + if (subject_id > 0) { + kv.set("subject_id", subject_id); + } + SqlPara sqlPara = Db.getSqlPara("Base.listScheme", kv); + return Db.paginate(pageNum, pageSize, sqlPara); + } + + /** + * 功能:获取教学方案信息 + * + * @param scheme_id + * @return + */ + public Record getScheme(int scheme_id) { + String sql = "select * from t_resource_scheme where scheme_id=?"; + return Db.findFirst(sql, scheme_id); + } } diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java deleted file mode 100644 index 2fb6b630..00000000 --- a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.dsideal.resource.Menu.Controller; - -import cn.hutool.json.JSONUtil; -import com.dsideal.resource.Menu.Model.MenuModel; -import com.dsideal.resource.Util.CommonUtil; -import com.dsideal.resource.Util.JwtUtil; -import com.dsideal.resource.Util.RetKit; -import com.jfinal.aop.Before; -import com.jfinal.core.Controller; -import com.jfinal.ext.interceptor.GET; -import io.jsonwebtoken.Claims; - -import java.util.List; - -public class MenuController extends Controller { - MenuModel mm = new MenuModel(); - - /** - * 功能:获取人员可以看到的菜单 - */ - @Before({GET.class}) - public void getPersonMenu() { - //当前登录的人员是谁? - String token = getRequest().getHeader("Authorization"); - if (token == null) { - renderJson(RetKit.renderFail("JWT token 为空,无法解析人员信息,请重新登录!")); - return; - } - Claims claims = JwtUtil.getClaims(token); - int identity_id = Integer.parseInt(claims.get("identity_id").toString()); - String person_id = claims.get("person_id").toString(); - - //所有菜单 - List menuList = mm.fetchMenu(160); - renderJson(RetKit.renderSuccess(JSONUtil.parseArray(menuList))); - - //后续需要根据人员角色菜单关系,去掉不可见菜单 - } -} diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java deleted file mode 100644 index 0403e503..00000000 --- a/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.dsideal.resource.Menu.Model; - -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; -import lombok.Getter; -import lombok.Setter; - -import java.util.ArrayList; -import java.util.List; - -public class MenuModel { - //子类1:菜单 - @Getter - @Setter - public static class Menu { - private String path; - private String component; - private Meta meta; - private List children = new ArrayList<>(); - } - - //子类2:LinkMeta - @Getter - @Setter - public static class Meta { - private String icon; - private String title; - private String isLink; - private boolean isHide; - private boolean isFull; - private boolean isAffix; - private String name; - private boolean isKeepAlive; - } - - /** - * 功能:递归获取菜单 - * - * @param parent_id 父节点ID - * @return 此父节点下所有的子菜单 - */ - public List fetchMenu(int parent_id) { - String sql = "select * from t_base_menu where parent_id = ? order by sort_id"; - List list = Db.find(sql, parent_id); - List res = new ArrayList<>(); - - for (Record rs : list) { - if (rs == null) return null; - Menu sMenu = new Menu(); - String url = rs.getStr("url"); - sMenu.setPath(url); - - sMenu.setComponent(url); - - Meta meta = new Meta(); - meta.setIcon(rs.getStr("icon")); - meta.setTitle(rs.getStr("menu_name")); - meta.setIsLink(""); - meta.setHide(false); - meta.setName(rs.getStr("menu_name")); - meta.setAffix(false); - if (rs.getStr("menu_name").equals("首页")) { - meta.setAffix(true); - } - if (rs.get("is_full") == null || rs.getInt("is_full") == 0) { - meta.setFull(false); - } else { - meta.setFull(true); - } - - meta.setKeepAlive(true); - sMenu.setMeta(meta); - // 递归查找子菜单 - List childMenu = fetchMenu(rs.getInt("menu_id")); - sMenu.setChildren(childMenu); - res.add(sMenu); - } - return res; - } -} diff --git a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java index f2ec1bdc..fa3944b5 100644 --- a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java +++ b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java @@ -3,7 +3,6 @@ package com.dsideal.resource; import com.dsideal.resource.Base.Controller.BaseController; import com.dsideal.resource.Index.IndexController; import com.dsideal.resource.Interceptor.*; -import com.dsideal.resource.Menu.Controller.MenuController; import com.dsideal.resource.Plugin.YamlProp; import com.dsideal.resource.Util.FileUtil; import com.dsideal.resource.Util.LogBackLogFactory; @@ -59,8 +58,6 @@ public class ResApplication extends JFinalConfig { public void configRoute(Routes me) { //默认页面 me.add("/", IndexController.class); - //菜单 - me.add("/menu", MenuController.class); //资源基础管理 me.add("/base", BaseController.class); } diff --git a/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java b/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java new file mode 100644 index 00000000..1e8cf7d6 --- /dev/null +++ b/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java @@ -0,0 +1,40 @@ +package com.dsideal.resource.Test; + +import com.dsideal.resource.Plugin.YamlProp; +import com.dsideal.resource.ResApplication; +import com.jfinal.kit.Prop; +import com.jfinal.plugin.activerecord.ActiveRecordPlugin; +import com.jfinal.plugin.activerecord.dialect.MysqlDialect; +import com.jfinal.plugin.hikaricp.HikariCpPlugin; + +import java.io.File; + +public class testDb { + public static void main(String[] args) { + //加载配置文件 + String configFile = "application_dev.yaml"; + Prop PropKit = new YamlProp(configFile); + HikariCpPlugin masterPlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"), + PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); + masterPlugin.start(); + + // 配置ActiveRecord插件 + ActiveRecordPlugin masterArp = new ActiveRecordPlugin("master", masterPlugin); + masterArp.setDialect(new MysqlDialect()); + + //遍历sql目录下所有的sql文件 + File sqlDir; + String basePath = ResApplication.class.getResource("/").getPath(); + sqlDir = new File(basePath + "/Sql"); + File[] sqlFiles = sqlDir.listFiles(); + for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) { + //只加载.sql文件 + if (sqlFile.getName().indexOf(".sql") > 0) { + masterArp.addSqlTemplate("/Sql/" + sqlFile.getName()); + } + } + masterArp.start(); + + + } +} diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java b/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java index 69fdf318..602d4531 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java +++ b/dsRes/src/main/java/com/dsideal/resource/Util/JwtUtil.java @@ -1,6 +1,5 @@ package com.dsideal.resource.Util; -import cn.hutool.core.date.DateTime; import com.dsideal.resource.ResApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java b/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java index 9e299d4a..9bc219ab 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java +++ b/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java @@ -18,9 +18,11 @@ public class RetKit { public static Map renderSuccess(List list) { return renderSuccess(null, list, null, 0, 0, 0); } + public static Map renderSuccess(String msg, List list) { return renderSuccess(msg, list, null, 0, 0, 0); } + public static Map renderSuccess(Page page) { return renderSuccess(null, page.getList(), "list", page.getPageNumber(), page.getPageSize(), page.getTotalRow()); } @@ -43,6 +45,23 @@ public class RetKit { return renderSuccess(null, jsonArray); } + public static Map renderSuccess(String msg) { + Map rMap = new HashMap<>(); + rMap.put("code", 200); + if (!StrKit.isBlank(msg)) { + rMap.put("msg", msg); + } + return rMap; + } + + public static Map renderSuccess(Record record) { + Map rMap = new HashMap<>(); + rMap.put("code", 200); + rMap.put("msg", "获取成功"); + rMap.put("data", record); + return rMap; + } + public static Map renderSuccess(String msg, cn.hutool.json.JSONArray jsonArray) { Map rMap = new HashMap<>(); rMap.put("code", 200); diff --git a/dsRes/src/main/resource/Sql/base.sql b/dsRes/src/main/resource/Sql/base.sql new file mode 100644 index 00000000..814fe069 --- /dev/null +++ b/dsRes/src/main/resource/Sql/base.sql @@ -0,0 +1,14 @@ +-- 菜单命名空间 +#namespace("Base") + + #sql("listScheme") + select * from t_resource_scheme where b_use=1 + #if(stage_id) + and stage_id=#para(stage_id) + #end + #if(subject_id) + and subject_id=#para(subject_id) + #end + order by stage_id,sort_id + #end +#end \ No newline at end of file diff --git a/dsRes/target/classes/SetMinioDownload.json b/dsRes/target/classes/SetMinioDownload.json deleted file mode 100644 index 5955e673..00000000 --- a/dsRes/target/classes/SetMinioDownload.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "AWS": ["*"] - }, - "Action": ["s3:GetBucketLocation", "s3:ListBucket"], - "Resource": ["arn:aws:s3:::dsideal"] - }, { - "Effect": "Allow", - "Principal": { - "AWS": ["*"] - }, - "Action": ["s3:GetObject"], - "Resource": ["arn:aws:s3:::dsideal/*"] - }] -} \ No newline at end of file diff --git a/dsRes/target/classes/Start.sh b/dsRes/target/classes/Start.sh deleted file mode 100644 index 25b5b05d..00000000 --- a/dsRes/target/classes/Start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# 容器名称 -CONTAINER_NAME=dsRes - -# 登录镜像仓库 -docker login --username=东师黄海 registry.cn-hangzhou.aliyuncs.com --password DsideaL4r5t6y7u -# 镜像名称 -IMAGE_NAME=registry.cn-hangzhou.aliyuncs.com/dsideal/ds_base:dev_20240924140624 - -# 删除容器 -docker rm -f ${CONTAINER_NAME} - -# 运行容器 -docker run -d --network=host --name "${CONTAINER_NAME}" \ ---privileged=true --env WORKING_ENV=dev -w /home -p 8002:8002 -v "$PWD/logs:/home/logs" --restart=always "${IMAGE_NAME}" - -# 查看日志 -docker logs -f --tail 500 "${CONTAINER_NAME}" diff --git a/dsRes/target/classes/application_ali.yaml b/dsRes/target/classes/application_ali.yaml deleted file mode 100644 index 0af87d49..00000000 --- a/dsRes/target/classes/application_ali.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: ylt - password: Ycharge666 - jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8 - - -redis: - ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com - port: 6379 - password: Ycharge666 - -# ============================================================== -jwt: - # 生成Token的密码 - CookieMd5SingPwd: DsideaL4r5t6y7u - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsRes/target/classes/application_dev.yaml b/dsRes/target/classes/application_dev.yaml deleted file mode 100644 index 7673bd7f..00000000 --- a/dsRes/target/classes/application_dev.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: c:/Windows/Temp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: root - password: DsideaL147258369 - jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - - -redis: - ip: 10.10.14.210 - port: 18890 - password: - -# ============================================================== - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsRes/target/classes/application_pro.yaml b/dsRes/target/classes/application_pro.yaml deleted file mode 100644 index c7378e3a..00000000 --- a/dsRes/target/classes/application_pro.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: root - password: DsideaL147258369 - jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - - -redis: - ip: 10.10.14.210 - port: 18890 - password: - -# ============================================================== - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsRes/target/classes/log4j.properties b/dsRes/target/classes/log4j.properties deleted file mode 100644 index 625cca1e..00000000 --- a/dsRes/target/classes/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=WARN, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n - -log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender -log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST -log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT -log4j.appender.mq.ProducerGroup=meiwei-producer-retry -log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877 -log4j.appender.mq.layout=org.apache.log4j.PatternLayout -log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) % \ No newline at end of file diff --git a/dsRes/target/classes/logback.xml b/dsRes/target/classes/logback.xml deleted file mode 100644 index 2c24fb65..00000000 --- a/dsRes/target/classes/logback.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) - - %msg%n - - - - - - ${LOG_HOME}/dsBase.log - - - ${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log - - 30 - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n - - - - 100MB - - - - - - - - - - \ No newline at end of file diff --git a/dsRes/target/classes/logo.txt b/dsRes/target/classes/logo.txt deleted file mode 100644 index b48587cd..00000000 --- a/dsRes/target/classes/logo.txt +++ /dev/null @@ -1,11 +0,0 @@ - - $$\ $$$$$$$\ - $$ | $$ __$$\ - $$$$$$$ | $$$$$$$\ $$ | $$ | $$$$$$\ $$$$$$$\ -$$ __$$ |$$ _____|$$$$$$$ |$$ __$$\ $$ _____| -$$ / $$ |\$$$$$$\ $$ __$$< $$$$$$$$ |\$$$$$$\ -$$ | $$ | \____$$\ $$ | $$ |$$ ____| \____$$\ -\$$$$$$$ |$$$$$$$ |$$ | $$ |\$$$$$$$\ $$$$$$$ | - \_______|\_______/ \__| \__| \_______|\_______/ - -power by http://patorjk.com/software/taag/ \ No newline at end of file diff --git a/dsRes/target/classes/undertow_dev.properties b/dsRes/target/classes/undertow_dev.properties deleted file mode 100644 index f3c54a2e..00000000 --- a/dsRes/target/classes/undertow_dev.properties +++ /dev/null @@ -1,34 +0,0 @@ -# true 值支持热加载 -undertow.devMode=true -undertow.port=8002 -undertow.host=0.0.0.0 - -# 目录名称 -undertow.contextPath=/dsRes - -# 设定I/O线程数. -server.undertow.io-threads=8 - -# 设定工作线程数 -server.undertow.worker-threads=60 - -# 查询当前某程序的线程或进程数 -# yum install psmisc -y -# ps -e | grep java | awk '{print $1} -# pstree -p 15453 | wc -l - -# gzip 压缩开关 -undertow.gzip.enable=true -# 配置压缩级别,默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度,9 拥有最高压缩率 -undertow.gzip.level=-1 -# 触发压缩的最小内容长度 -undertow.gzip.minLength=1024 - -# 开启access日志 -server.undertow.accesslog.enabled=true -server.undertow.accesslog.pattern=%t %a "%r" %s (%D ms) - -# ssl 开启时,是否开启 http2。检测该配置是否生效在 chrome 地址栏中输入: chrome://net-internals/#http2 -#undertow.http2.enable=true - -#http://www.jfinal.com/doc/1-4 diff --git a/dsRes/target/classes/undertow_pro.properties b/dsRes/target/classes/undertow_pro.properties deleted file mode 100644 index f3c54a2e..00000000 --- a/dsRes/target/classes/undertow_pro.properties +++ /dev/null @@ -1,34 +0,0 @@ -# true 值支持热加载 -undertow.devMode=true -undertow.port=8002 -undertow.host=0.0.0.0 - -# 目录名称 -undertow.contextPath=/dsRes - -# 设定I/O线程数. -server.undertow.io-threads=8 - -# 设定工作线程数 -server.undertow.worker-threads=60 - -# 查询当前某程序的线程或进程数 -# yum install psmisc -y -# ps -e | grep java | awk '{print $1} -# pstree -p 15453 | wc -l - -# gzip 压缩开关 -undertow.gzip.enable=true -# 配置压缩级别,默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度,9 拥有最高压缩率 -undertow.gzip.level=-1 -# 触发压缩的最小内容长度 -undertow.gzip.minLength=1024 - -# 开启access日志 -server.undertow.accesslog.enabled=true -server.undertow.accesslog.pattern=%t %a "%r" %s (%D ms) - -# ssl 开启时,是否开启 http2。检测该配置是否生效在 chrome 地址栏中输入: chrome://net-internals/#http2 -#undertow.http2.enable=true - -#http://www.jfinal.com/doc/1-4 diff --git a/dsRes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dsRes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index f297533d..00000000 --- a/dsRes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -com\dsideal\resource\ResApplication.class diff --git a/dsRes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dsRes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 550e843d..00000000 --- a/dsRes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\dsWork\dsProject\dsRes\src\main\java\com\dsideal\resource\ResApplication.java diff --git a/dsRes/生成依赖jar.bat b/dsRes/生成依赖jar.bat new file mode 100644 index 00000000..1ef4abc5 --- /dev/null +++ b/dsRes/生成依赖jar.bat @@ -0,0 +1,7 @@ +mkdir lib +cd lib +del *.jar /q +cd .. +mvn -f pom.xml dependency:copy-dependencies -DoutputDirectory=lib + +@echo 黄海完成了! diff --git a/pom.xml b/pom.xml index f567cb04..61ffe4cd 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ dsBase dsBuild dsRes + dsPay @@ -21,7 +22,7 @@ UTF-8 UTF-8 - 5.2.1 + 5.2.3 3.6 2022.2 diff --git a/操作文档/6、制作JDK21的Docker镜像.md b/操作文档/6、制作JDK21的Docker镜像.md index dfb17f67..7f24600a 100644 --- a/操作文档/6、制作JDK21的Docker镜像.md +++ b/操作文档/6、制作JDK21的Docker镜像.md @@ -40,138 +40,3 @@ OpenJDK 64-Bit Server VM (Alibaba Dragonwell Extended Edition)-21.0.4.0.4+7-GA ( ``` - -### 一、下载$JDK21$ - -> https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz - - - -### 二、利用阿里云的$ECS$制作私有镜像 - -```shell -在阿里云购买了一台ECS主机 - -8.147.134.252 -用户名: root -密 码:DsideaL4r5t6y7u!@# -``` - - - -### 三、安装$Docker$ - -```shell -yum install -y yum-utils -yum-config-manager --add-repo https://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo -yum install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y - -# 配置Docker加速器 -sudo mkdir -p /etc/docker - -sudo tee /etc/docker/daemon.json <<-'EOF' -{ - "registry-mirrors": ["https://95lqrpjl.mirror.aliyuncs.com"] -} -EOF - -systemctl daemon-reload -systemctl restart docker -``` - - - -### 四、生成$JDK$基础镜像 - -```shell -yum install lrzsz -y -rz -be -选择:D:\SetupSoftware\JDK21\jdk-21_linux-x64_bin.tar.gz - -``` - - - -```dockerfile -cat Dockerfile - - -# 使用 Debian 11 slim 作为基础镜像 -FROM debian:11-slim - -# 设置环境变量 -ENV jdk=jdk-21_linux-x64_bin.tar.gz -MAINTAINER bright "10402852@qq.com" - -# 配置镜像源 -RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list - -# 更新软件包索引并安装必要的工具和依赖 -RUN apt-get update && apt-get install -y \ - locales \ - tzdata \ - && rm -rf /var/lib/apt/lists/* - -# 如果您需要某个特定的 locale,例如 en_US.UTF-8,则生成它 -RUN locale-gen en_US.UTF-8 - - -# 安装设置时区 -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone - -# 添加 JDK 文件 - - -COPY $jdk /usr/local/ -RUN tar -zxvf /usr/local/$jdk -C /usr/local/ && rm /usr/local/$jdk - -# 设置环境变量 -ENV JAVA_HOME=/usr/local/jdk-21.0.1 -ENV PATH=$JAVA_HOME/bin:$PATH -``` - - - -```shell -docker build -t dsideal/jdk:21 . -``` - - - -### 五、查看$JDK$信息 - -```shell -#测试镜像 -docker run --rm -it --name test dsideal/jdk:21 -#进入临时镜像测试是否成功 -java -version -``` - - - -### 六、上传到黄海的个人私有仓库 - -```shell -# 登录黄海的个人镜像仓库 -docker login --username=东师黄海 registry.cn-hangzhou.aliyuncs.com --password DsideaL4r5t6y7u - -# 修改tag标签 -docker tag dsideal/jdk:21 registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21 - -# 上传镜像 -docker push registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21 - -# 测试拉取 -docker pull registry.cn-hangzhou.aliyuncs.com/dsideal/jdk:21 -``` - -![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409181457611.png) - -![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409181456836.png) - - - -```shell - -``` - diff --git a/操作文档/8、使用命令行创建K8S发布和服务.md b/操作文档/8、使用命令行创建K8S发布和服务.md new file mode 100644 index 00000000..2a7bb52d --- /dev/null +++ b/操作文档/8、使用命令行创建K8S发布和服务.md @@ -0,0 +1,36 @@ +## 使用命令行创建K8S发布和服务 + + + +### 一、创建注册仓库信息 + +```shell +kubectl create secret docker-registry regcred --docker-server=registry.cn-hangzhou.aliyuncs.com --docker-username=东师黄海 --docker-password=DsideaL4r5t6y7u --docker-email=10402852@qq.com +``` + +返回信息: + +```shell +secret/regcred created +``` + + + +### 二、创建发布和服务 + +```shell +kubectl apply -f ds-base-deployment.yaml +kubectl apply -f ds-base-service.yaml + +kubectl apply -f ds-base-web-deployment.yaml +kubectl apply -f ds-base-web-service.yaml +``` + +### 三、扩容为2个容器 + +编辑 $ds-base-deployment.yaml$,将 $spec.replicas$ 的值设置为 $2$,然后 + +```shell +kubectl apply -f ds-base-deployment.yaml +``` + diff --git a/操作文档/使用命令行创建K8S发布和服务/ds-base-deployment.yaml b/操作文档/使用命令行创建K8S发布和服务/ds-base-deployment.yaml new file mode 100644 index 00000000..4a894707 --- /dev/null +++ b/操作文档/使用命令行创建K8S发布和服务/ds-base-deployment.yaml @@ -0,0 +1,30 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ds-base +spec: + replicas: 1 + selector: + matchLabels: + app: ds-base + template: + metadata: + labels: + app: ds-base + spec: + containers: + - name: ds-base + image: registry.cn-hangzhou.aliyuncs.com/dsideal/ds_base:dev_20240925144053 + imagePullPolicy: Always + ports: + - containerPort: 8001 + resources: + requests: + memory: "2Gi" # 请求2Gi内存 + cpu: "500m" # 请求500 milliCPU(1 CPU = 1000 milliCPU) + limits: + memory: "4Gi" # 限制4Gi内存 + cpu: "1000m" # 限制500 milliCPU + imagePullSecrets: + - name: regcred + diff --git a/操作文档/使用命令行创建K8S发布和服务/ds-base-service.yaml b/操作文档/使用命令行创建K8S发布和服务/ds-base-service.yaml new file mode 100644 index 00000000..59fcc988 --- /dev/null +++ b/操作文档/使用命令行创建K8S发布和服务/ds-base-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: ds-base +spec: + selector: + app: ds-base + type: NodePort + ports: + - protocol: TCP + port: 8001 + targetPort: 8001 diff --git a/操作文档/使用命令行创建K8S发布和服务/ds-base-web-deployment.yaml b/操作文档/使用命令行创建K8S发布和服务/ds-base-web-deployment.yaml new file mode 100644 index 00000000..e586b380 --- /dev/null +++ b/操作文档/使用命令行创建K8S发布和服务/ds-base-web-deployment.yaml @@ -0,0 +1,29 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ds-base-web +spec: + replicas: 1 + selector: + matchLabels: + app: ds-base-web + template: + metadata: + labels: + app: ds-base-web + spec: + containers: + - name: ds-base-web + image: registry.cn-hangzhou.aliyuncs.com/dsideal/ds_base_web:20240925165112 + imagePullPolicy: Always + ports: + - containerPort: 80 + resources: + requests: + memory: "2Gi" # 请求2Gi内存 + cpu: "500m" # 请求500 milliCPU(1 CPU = 1000 milliCPU) + limits: + memory: "4Gi" # 限制4Gi内存 + cpu: "1000m" # 限制500 milliCPU + imagePullSecrets: + - name: regcred diff --git a/操作文档/使用命令行创建K8S发布和服务/ds-base-web-service.yaml b/操作文档/使用命令行创建K8S发布和服务/ds-base-web-service.yaml new file mode 100644 index 00000000..21223490 --- /dev/null +++ b/操作文档/使用命令行创建K8S发布和服务/ds-base-web-service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: ds-base-web +spec: + selector: + app: ds-base-web + type: NodePort + ports: + - protocol: TCP + port: 80 + targetPort: 80 + nodePort: 30000