diff --git a/.gitignore b/.gitignore index d52393f5..e0e4d0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ /dsRes/lib/ /dsGw/target/ /dsGw/lib/ +/.idea/ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c75beb56..0ec8e8a6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,6 +6,7 @@ + { - "customColor": "", - "associatedIndex": 4 -} + "customColor": "", + "associatedIndex": 4 + } - + + + + - + - @@ -124,7 +133,6 @@ 1727339918298 - 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/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index e9db6213..ad7e7c5b 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,6 +26,15 @@ 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"); + if (identity_id <= 0 || identity_id >= 4) { + renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问，您的账号不是管理员！")); + return; + } + String person_id = jo.getString("person_id"); + String bureau_id = jo.getString("bureau_id"); + String person_name = jo.getString("person_name"); if (forVue == 0) { renderJson(jo); } else { @@ -35,14 +44,7 @@ public class LoginPersonController extends Controller { renderJson(RetKit.renderFail(msg)); return; } - int identity_id = jo.getInteger("identity_id"); - if (identity_id <= 0 || identity_id >= 4) { - renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问，您的账号不是管理员！")); - return; - } - 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);