diff --git a/.gradle/6.4.1/executionHistory/executionHistory.bin b/.gradle/6.4.1/executionHistory/executionHistory.bin deleted file mode 100644 index bdfa978..0000000 Binary files a/.gradle/6.4.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/6.4.1/executionHistory/executionHistory.lock b/.gradle/6.4.1/executionHistory/executionHistory.lock deleted file mode 100644 index df7e154..0000000 Binary files a/.gradle/6.4.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/6.4.1/fileChanges/last-build.bin b/.gradle/6.4.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/6.4.1/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/6.4.1/fileContent/fileContent.lock b/.gradle/6.4.1/fileContent/fileContent.lock deleted file mode 100644 index c05ed79..0000000 Binary files a/.gradle/6.4.1/fileContent/fileContent.lock and /dev/null differ diff --git a/.gradle/6.4.1/fileHashes/fileHashes.bin b/.gradle/6.4.1/fileHashes/fileHashes.bin deleted file mode 100644 index fec4401..0000000 Binary files a/.gradle/6.4.1/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/6.4.1/fileHashes/fileHashes.lock b/.gradle/6.4.1/fileHashes/fileHashes.lock deleted file mode 100644 index b96f1a5..0000000 Binary files a/.gradle/6.4.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/6.4.1/fileHashes/resourceHashesCache.bin b/.gradle/6.4.1/fileHashes/resourceHashesCache.bin deleted file mode 100644 index e486dbc..0000000 Binary files a/.gradle/6.4.1/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/6.4.1/gc.properties b/.gradle/6.4.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/6.4.1/javaCompile/classAnalysis.bin b/.gradle/6.4.1/javaCompile/classAnalysis.bin deleted file mode 100644 index 875133e..0000000 Binary files a/.gradle/6.4.1/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/.gradle/6.4.1/javaCompile/jarAnalysis.bin b/.gradle/6.4.1/javaCompile/jarAnalysis.bin deleted file mode 100644 index c7e934c..0000000 Binary files a/.gradle/6.4.1/javaCompile/jarAnalysis.bin and /dev/null differ diff --git a/.gradle/6.4.1/javaCompile/javaCompile.lock b/.gradle/6.4.1/javaCompile/javaCompile.lock deleted file mode 100644 index e5a7d02..0000000 Binary files a/.gradle/6.4.1/javaCompile/javaCompile.lock and /dev/null differ diff --git a/.gradle/6.4.1/javaCompile/taskHistory.bin b/.gradle/6.4.1/javaCompile/taskHistory.bin deleted file mode 100644 index 10d4d24..0000000 Binary files a/.gradle/6.4.1/javaCompile/taskHistory.bin and /dev/null differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index f94f086..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 4c4b339..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sat Jul 11 23:56:44 CST 2020 -gradle.version=6.4.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index e0a2830..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock deleted file mode 100644 index bb544a1..0000000 Binary files a/.gradle/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin deleted file mode 100644 index bb4d081..0000000 Binary files a/.gradle/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin deleted file mode 100644 index 64f8e9c..0000000 Binary files a/.gradle/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 7f624ff..0000000 --- a/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id 'java' -} - -group 'org.example' -version '1.0-SNAPSHOT' - -repositories { - mavenCentral() -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - - -} - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} diff --git a/client/build.gradle b/client/build.gradle deleted file mode 100644 index 0fa380f..0000000 --- a/client/build.gradle +++ /dev/null @@ -1,55 +0,0 @@ -plugins { - id 'java' -} - -group 'org.epri.fx.client' -version '1.0-SNAPSHOT' - -repositories { - mavenCentral() -} - -dependencies { - implementation project(':server') -// implementation 'com.jfoenix:jfoenix:8.0.10' -// compile 'com.airhacks:afterburner.fx:1.7.0' - compile 'de.jensd:fontawesomefx:8.9' - compile 'org.apache.lucene:lucene-core:7.4.0' - compile 'org.apache.lucene:lucene-grouping:7.4.0' - compile 'org.apache.lucene:lucene-queryparser:7.4.0' - compile 'dom4j:dom4j:1.6.1' - - - compile 'org.controlsfx:controlsfx:8.40.17' - compile group: 'org.javassist', name: 'javassist', version: '3.18.1-GA' - compile group: 'com.guigarage', name: 'observable-toogles', version: '0.1' - compile group: 'javax.inject', name: 'javax.inject', version: '1' - compile files('libs/datafx-injection-8.0.2-SNAPSHOT.jar') - compile files('libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar') - compile files('libs/datafx-core-8.0.2-SNAPSHOT.jar') - compile files('libs/datafx-flow-8.0.2-SNAPSHOT.jar') - compile files('libs/jfoenix-8.0.10.jar') - compile files('libs/pinyin4j-2.5.0.jar') - compile files('libs/tilesfx-1.6.8.jar') - - - compile 'org.kordamp.ikonli:ikonli-javafx:2.4.0' - compile 'org.kordamp.ikonli:ikonli-fontawesome5-pack:2.4.0' - compile 'io.github.openfeign:feign-core:10.9' - compile 'io.github.openfeign:feign-okhttp:10.9' - compile 'io.github.openfeign:feign-jackson:10.9' - compile 'io.github.openfeign:feign-hystrix:10.9' - compile 'io.github.openfeign:feign-ribbon:10.9' - compile 'io.github.openfeign:feign-slf4j:10.9' - compile 'com.netflix.ribbon:ribbon-httpclient:2.2.0' - - - - testCompile group: 'junit', name: 'junit', version: '4.12' - implementation 'org.apache.commons:commons-lang3:3.4' - - -} -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} \ No newline at end of file diff --git a/client/libs/datafx-core-8.0.2-SNAPSHOT-javadoc.jar b/falsework-client/libs/datafx-core-8.0.2-SNAPSHOT-javadoc.jar similarity index 100% rename from client/libs/datafx-core-8.0.2-SNAPSHOT-javadoc.jar rename to falsework-client/libs/datafx-core-8.0.2-SNAPSHOT-javadoc.jar diff --git a/client/libs/datafx-core-8.0.2-SNAPSHOT-sources.jar b/falsework-client/libs/datafx-core-8.0.2-SNAPSHOT-sources.jar similarity index 100% rename from client/libs/datafx-core-8.0.2-SNAPSHOT-sources.jar rename to falsework-client/libs/datafx-core-8.0.2-SNAPSHOT-sources.jar diff --git a/client/libs/datafx-core-8.0.2-SNAPSHOT.jar b/falsework-client/libs/datafx-core-8.0.2-SNAPSHOT.jar similarity index 100% rename from client/libs/datafx-core-8.0.2-SNAPSHOT.jar rename to falsework-client/libs/datafx-core-8.0.2-SNAPSHOT.jar diff --git a/client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-javadoc.jar b/falsework-client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-javadoc.jar similarity index 100% rename from client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-javadoc.jar rename to falsework-client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-javadoc.jar diff --git a/client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-sources.jar b/falsework-client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-sources.jar similarity index 100% rename from client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-sources.jar rename to falsework-client/libs/datafx-eventsystem-8.0.2-SNAPSHOT-sources.jar diff --git a/client/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar b/falsework-client/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar similarity index 100% rename from client/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar rename to falsework-client/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar diff --git a/client/libs/datafx-featuretoggle-8.0.2-SNAPSHOT.jar b/falsework-client/libs/datafx-featuretoggle-8.0.2-SNAPSHOT.jar similarity index 100% rename from client/libs/datafx-featuretoggle-8.0.2-SNAPSHOT.jar rename to falsework-client/libs/datafx-featuretoggle-8.0.2-SNAPSHOT.jar diff --git a/client/libs/datafx-flow-8.0.2-SNAPSHOT-javadoc.jar b/falsework-client/libs/datafx-flow-8.0.2-SNAPSHOT-javadoc.jar similarity index 100% rename from client/libs/datafx-flow-8.0.2-SNAPSHOT-javadoc.jar rename to falsework-client/libs/datafx-flow-8.0.2-SNAPSHOT-javadoc.jar diff --git a/client/libs/datafx-flow-8.0.2-SNAPSHOT-sources.jar b/falsework-client/libs/datafx-flow-8.0.2-SNAPSHOT-sources.jar similarity index 100% rename from client/libs/datafx-flow-8.0.2-SNAPSHOT-sources.jar rename to falsework-client/libs/datafx-flow-8.0.2-SNAPSHOT-sources.jar diff --git a/client/libs/datafx-flow-8.0.2-SNAPSHOT.jar b/falsework-client/libs/datafx-flow-8.0.2-SNAPSHOT.jar similarity index 100% rename from client/libs/datafx-flow-8.0.2-SNAPSHOT.jar rename to falsework-client/libs/datafx-flow-8.0.2-SNAPSHOT.jar diff --git a/client/libs/datafx-injection-8.0.2-SNAPSHOT-javadoc.jar b/falsework-client/libs/datafx-injection-8.0.2-SNAPSHOT-javadoc.jar similarity index 100% rename from client/libs/datafx-injection-8.0.2-SNAPSHOT-javadoc.jar rename to falsework-client/libs/datafx-injection-8.0.2-SNAPSHOT-javadoc.jar diff --git a/client/libs/datafx-injection-8.0.2-SNAPSHOT-sources.jar b/falsework-client/libs/datafx-injection-8.0.2-SNAPSHOT-sources.jar similarity index 100% rename from client/libs/datafx-injection-8.0.2-SNAPSHOT-sources.jar rename to falsework-client/libs/datafx-injection-8.0.2-SNAPSHOT-sources.jar diff --git a/client/libs/datafx-injection-8.0.2-SNAPSHOT.jar b/falsework-client/libs/datafx-injection-8.0.2-SNAPSHOT.jar similarity index 100% rename from client/libs/datafx-injection-8.0.2-SNAPSHOT.jar rename to falsework-client/libs/datafx-injection-8.0.2-SNAPSHOT.jar diff --git a/client/libs/jfoenix-8.0.10.jar b/falsework-client/libs/jfoenix-8.0.10.jar similarity index 100% rename from client/libs/jfoenix-8.0.10.jar rename to falsework-client/libs/jfoenix-8.0.10.jar diff --git a/client/libs/pinyin4j-2.5.0.jar b/falsework-client/libs/pinyin4j-2.5.0.jar similarity index 100% rename from client/libs/pinyin4j-2.5.0.jar rename to falsework-client/libs/pinyin4j-2.5.0.jar diff --git a/client/libs/tilesfx-1.6.8.jar b/falsework-client/libs/tilesfx-1.6.8.jar similarity index 100% rename from client/libs/tilesfx-1.6.8.jar rename to falsework-client/libs/tilesfx-1.6.8.jar diff --git a/falsework-client/pom.xml b/falsework-client/pom.xml new file mode 100644 index 0000000..1db2b6a --- /dev/null +++ b/falsework-client/pom.xml @@ -0,0 +1,201 @@ + + + + fx-falsework + org.epri + 1.0-SNAPSHOT + + 4.0.0 + + falsework-client + + + 8 + 8 + 10.9 + 1.8 + + + + + + + + + com.epri + falsework-sever + 0.0.1-SNAPSHOT + + + + jfoenix + jfoenix + ${jfoenix.version} + system + ${basedir}/libs/jfoenix-8.0.10.jar + + + datafx-flow + datafx-flow + ${datafx.version} + system + ${basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar + + + tilesfx + tilesfx + 1.6.8 + system + ${basedir}/libs/tilesfx-1.6.8.jar + + + + datafx-injection + datafx-injection + ${datafx.version} + system + ${basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar + + + datafx-eventsystem + datafx-eventsystem + ${datafx.version} + system + ${basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar + + + datafx-core + datafx-core + ${datafx.version} + system + ${basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar + + + javax.inject + javax.inject + 1 + + + + junit + junit + 4.12 + + + + org.slf4j + slf4j-api + 1.7.21 + + + ch.qos.logback + logback-core + 1.1.7 + + + ch.qos.logback + logback-classic + 1.1.7 + + + + io.github.openfeign + feign-core + ${feign.version} + + + io.github.openfeign + feign-okhttp + ${feign.version} + + + io.github.openfeign + feign-jackson + ${feign.version} + + + io.github.openfeign + feign-hystrix + ${feign.version} + + + io.github.openfeign + feign-ribbon + ${feign.version} + + + io.github.openfeign + feign-slf4j + ${feign.version} + + + com.netflix.ribbon + ribbon-httpclient + 2.2.0 + + + + de.jensd + fontawesomefx + 8.9 + + + org.kordamp.ikonli + ikonli-javafx + 2.4.0 + + + org.kordamp.ikonli + ikonli-fontawesome5-pack + 2.4.0 + + + org.javassist + javassist + 3.18.1-GA + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + + + + aliyun + https://maven.aliyun.com/repository/public + + true + + + false + + + + + + aliyun-plugin + https://maven.aliyun.com/repository/public + + true + + + false + + + + + \ No newline at end of file diff --git a/client/src/main/java/META-INF/MANIFEST.MF b/falsework-client/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from client/src/main/java/META-INF/MANIFEST.MF rename to falsework-client/src/main/java/META-INF/MANIFEST.MF diff --git a/client/src/main/java/com/epri/fx/client/AppStartup.java b/falsework-client/src/main/java/com/epri/fx/client/AppStartup.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/AppStartup.java rename to falsework-client/src/main/java/com/epri/fx/client/AppStartup.java diff --git a/client/src/main/java/com/epri/fx/client/bean/CountryPath.java b/falsework-client/src/main/java/com/epri/fx/client/bean/CountryPath.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/bean/CountryPath.java rename to falsework-client/src/main/java/com/epri/fx/client/bean/CountryPath.java diff --git a/client/src/main/java/com/epri/fx/client/bean/MenuVoCell.java b/falsework-client/src/main/java/com/epri/fx/client/bean/MenuVoCell.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/bean/MenuVoCell.java rename to falsework-client/src/main/java/com/epri/fx/client/bean/MenuVoCell.java diff --git a/client/src/main/java/com/epri/fx/client/exception/AppRunException.java b/falsework-client/src/main/java/com/epri/fx/client/exception/AppRunException.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/exception/AppRunException.java rename to falsework-client/src/main/java/com/epri/fx/client/exception/AppRunException.java diff --git a/client/src/main/java/com/epri/fx/client/gui/feature/DisabledByFeature.java b/falsework-client/src/main/java/com/epri/fx/client/gui/feature/DisabledByFeature.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/feature/DisabledByFeature.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/feature/DisabledByFeature.java diff --git a/client/src/main/java/com/epri/fx/client/gui/feature/FeatureHandler.java b/falsework-client/src/main/java/com/epri/fx/client/gui/feature/FeatureHandler.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/feature/FeatureHandler.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/feature/FeatureHandler.java diff --git a/client/src/main/java/com/epri/fx/client/gui/feature/FeatureResourceConsumer.java b/falsework-client/src/main/java/com/epri/fx/client/gui/feature/FeatureResourceConsumer.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/feature/FeatureResourceConsumer.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/feature/FeatureResourceConsumer.java diff --git a/client/src/main/java/com/epri/fx/client/gui/feature/HideByFeature.java b/falsework-client/src/main/java/com/epri/fx/client/gui/feature/HideByFeature.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/feature/HideByFeature.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/feature/HideByFeature.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/GroupManagementController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/components/GroupDetailController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/components/GroupDetailController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/components/GroupDetailController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/group/components/GroupDetailController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/grouptype/GroupTypeManagementController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/log/LogManagementController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/log/LogManagementController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/log/LogManagementController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/log/LogManagementController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/menu/MenuManagementController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/UserManagementController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserAddController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserAddController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserAddController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserAddController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserEditController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserEditController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserEditController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/admin/user/components/UserEditController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/BasicDataSetController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/BasicDataSetController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/BasicDataSetController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/BasicDataSetController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CoalPriceDiffController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CoalPriceDiffController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CoalPriceDiffController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CoalPriceDiffController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CurrentFreightController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CurrentFreightController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CurrentFreightController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/CurrentFreightController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/MainConclusionController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/MainConclusionController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/MainConclusionController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/MainConclusionController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/RailwayCostController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/RailwayCostController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/RailwayCostController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/basicInfo/RailwayCostController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/container/TabPaneFlowContainer.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/container/TabPaneFlowContainer.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/container/TabPaneFlowContainer.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/container/TabPaneFlowContainer.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableCheckBoxTreeItem.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableCheckBoxTreeItem.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableCheckBoxTreeItem.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableCheckBoxTreeItem.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableTreeItem.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableTreeItem.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableTreeItem.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/FilterableTreeItem.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/control/LFXDecorator.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/LFXDecorator.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/control/LFXDecorator.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/LFXDecorator.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/control/TreeItemPredicate.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/TreeItemPredicate.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/control/TreeItemPredicate.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/control/TreeItemPredicate.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoadingController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoadingController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoadingController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoadingController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoginController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoginController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoginController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoginController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/SkinInfoController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/SkinInfoController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/SkinInfoController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/SkinInfoController.java diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/UserInfoController.java b/falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/UserInfoController.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/UserInfoController.java rename to falsework-client/src/main/java/com/epri/fx/client/gui/uicomponents/main/components/UserInfoController.java diff --git a/client/src/main/java/com/epri/fx/client/model/GroupDataModel.java b/falsework-client/src/main/java/com/epri/fx/client/model/GroupDataModel.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/model/GroupDataModel.java rename to falsework-client/src/main/java/com/epri/fx/client/model/GroupDataModel.java diff --git a/client/src/main/java/com/epri/fx/client/model/GroupTypeDataModel.java b/falsework-client/src/main/java/com/epri/fx/client/model/GroupTypeDataModel.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/model/GroupTypeDataModel.java rename to falsework-client/src/main/java/com/epri/fx/client/model/GroupTypeDataModel.java diff --git a/client/src/main/java/com/epri/fx/client/model/LogDataModel.java b/falsework-client/src/main/java/com/epri/fx/client/model/LogDataModel.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/model/LogDataModel.java rename to falsework-client/src/main/java/com/epri/fx/client/model/LogDataModel.java diff --git a/client/src/main/java/com/epri/fx/client/model/MenuDataModel.java b/falsework-client/src/main/java/com/epri/fx/client/model/MenuDataModel.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/model/MenuDataModel.java rename to falsework-client/src/main/java/com/epri/fx/client/model/MenuDataModel.java diff --git a/client/src/main/java/com/epri/fx/client/model/UserDataModel.java b/falsework-client/src/main/java/com/epri/fx/client/model/UserDataModel.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/model/UserDataModel.java rename to falsework-client/src/main/java/com/epri/fx/client/model/UserDataModel.java diff --git a/client/src/main/java/com/epri/fx/client/request/Request.java b/falsework-client/src/main/java/com/epri/fx/client/request/Request.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/Request.java rename to falsework-client/src/main/java/com/epri/fx/client/request/Request.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/AppRequestErrorDecoder.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/AppRequestErrorDecoder.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/AppRequestErrorDecoder.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/AppRequestErrorDecoder.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/AppRequestInterceptor.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/AppRequestInterceptor.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/AppRequestInterceptor.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/AppRequestInterceptor.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/FeignAPI.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/FeignAPI.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/FeignAPI.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/FeignAPI.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/admin/ElementFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/ElementFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/admin/ElementFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/ElementFeign.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/admin/GroupFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/GroupFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/admin/GroupFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/GroupFeign.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/admin/GroupTypeFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/GroupTypeFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/admin/GroupTypeFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/GroupTypeFeign.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/admin/LogFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/LogFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/admin/LogFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/LogFeign.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/admin/MenuFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/MenuFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/admin/MenuFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/MenuFeign.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/admin/UserFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/UserFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/admin/UserFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/admin/UserFeign.java diff --git a/client/src/main/java/com/epri/fx/client/request/feign/login/LoginFeign.java b/falsework-client/src/main/java/com/epri/fx/client/request/feign/login/LoginFeign.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/request/feign/login/LoginFeign.java rename to falsework-client/src/main/java/com/epri/fx/client/request/feign/login/LoginFeign.java diff --git a/client/src/main/java/com/epri/fx/client/store/ApplicatonStore.java b/falsework-client/src/main/java/com/epri/fx/client/store/ApplicatonStore.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/store/ApplicatonStore.java rename to falsework-client/src/main/java/com/epri/fx/client/store/ApplicatonStore.java diff --git a/client/src/main/java/com/epri/fx/client/utils/AlertUtil.java b/falsework-client/src/main/java/com/epri/fx/client/utils/AlertUtil.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/utils/AlertUtil.java rename to falsework-client/src/main/java/com/epri/fx/client/utils/AlertUtil.java diff --git a/client/src/main/java/com/epri/fx/client/utils/Helper.java b/falsework-client/src/main/java/com/epri/fx/client/utils/Helper.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/utils/Helper.java rename to falsework-client/src/main/java/com/epri/fx/client/utils/Helper.java diff --git a/client/src/main/java/com/epri/fx/client/utils/Pinyin4jUtil.java b/falsework-client/src/main/java/com/epri/fx/client/utils/Pinyin4jUtil.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/utils/Pinyin4jUtil.java rename to falsework-client/src/main/java/com/epri/fx/client/utils/Pinyin4jUtil.java diff --git a/client/src/main/java/com/epri/fx/client/websocket/Session.java b/falsework-client/src/main/java/com/epri/fx/client/websocket/Session.java similarity index 100% rename from client/src/main/java/com/epri/fx/client/websocket/Session.java rename to falsework-client/src/main/java/com/epri/fx/client/websocket/Session.java diff --git a/client/src/main/resources/META-INF/datafx.xml b/falsework-client/src/main/resources/META-INF/datafx.xml similarity index 100% rename from client/src/main/resources/META-INF/datafx.xml rename to falsework-client/src/main/resources/META-INF/datafx.xml diff --git a/client/src/main/resources/country/中国.svg b/falsework-client/src/main/resources/country/中国.svg similarity index 100% rename from client/src/main/resources/country/中国.svg rename to falsework-client/src/main/resources/country/中国.svg diff --git a/client/src/main/resources/css/app-dark.css b/falsework-client/src/main/resources/css/app-dark.css similarity index 100% rename from client/src/main/resources/css/app-dark.css rename to falsework-client/src/main/resources/css/app-dark.css diff --git a/client/src/main/resources/css/app-fonts.css b/falsework-client/src/main/resources/css/app-fonts.css similarity index 100% rename from client/src/main/resources/css/app-fonts.css rename to falsework-client/src/main/resources/css/app-fonts.css diff --git a/client/src/main/resources/css/app-light.css b/falsework-client/src/main/resources/css/app-light.css similarity index 100% rename from client/src/main/resources/css/app-light.css rename to falsework-client/src/main/resources/css/app-light.css diff --git a/client/src/main/resources/css/login.css b/falsework-client/src/main/resources/css/login.css similarity index 100% rename from client/src/main/resources/css/login.css rename to falsework-client/src/main/resources/css/login.css diff --git a/client/src/main/resources/css/test.css b/falsework-client/src/main/resources/css/test.css similarity index 100% rename from client/src/main/resources/css/test.css rename to falsework-client/src/main/resources/css/test.css diff --git a/client/src/main/resources/css/页面-1.svg b/falsework-client/src/main/resources/css/页面-1.svg similarity index 100% rename from client/src/main/resources/css/页面-1.svg rename to falsework-client/src/main/resources/css/页面-1.svg diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo.css b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo.css similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo.css rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo.css diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo_index.html b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo_index.html similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo_index.html rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/demo_index.html diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.css b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.css similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.css rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.css diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.eot b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.eot similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.eot rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.eot diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.js b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.js similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.js rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.js diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.json b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.json similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.json rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.json diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.svg b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.svg similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.svg rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.svg diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.ttf b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.ttf similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.ttf rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.ttf diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff diff --git a/client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff2 b/falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff2 similarity index 100% rename from client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff2 rename to falsework-client/src/main/resources/fonts/icon_font/font_2077973_470ixam2xkt/iconfont.woff2 diff --git a/client/src/main/resources/fonts/icon_font/iconfont.svg b/falsework-client/src/main/resources/fonts/icon_font/iconfont.svg similarity index 100% rename from client/src/main/resources/fonts/icon_font/iconfont.svg rename to falsework-client/src/main/resources/fonts/icon_font/iconfont.svg diff --git a/client/src/main/resources/fonts/msyh.ttf b/falsework-client/src/main/resources/fonts/msyh.ttf similarity index 100% rename from client/src/main/resources/fonts/msyh.ttf rename to falsework-client/src/main/resources/fonts/msyh.ttf diff --git a/client/src/main/resources/fonts/msyhbd.ttf b/falsework-client/src/main/resources/fonts/msyhbd.ttf similarity index 100% rename from client/src/main/resources/fonts/msyhbd.ttf rename to falsework-client/src/main/resources/fonts/msyhbd.ttf diff --git a/client/src/main/resources/fonts/msyhl.ttf b/falsework-client/src/main/resources/fonts/msyhl.ttf similarity index 100% rename from client/src/main/resources/fonts/msyhl.ttf rename to falsework-client/src/main/resources/fonts/msyhl.ttf diff --git a/client/src/main/resources/fxml/admin/group/components/group_detail.fxml b/falsework-client/src/main/resources/fxml/admin/group/components/group_detail.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/group/components/group_detail.fxml rename to falsework-client/src/main/resources/fxml/admin/group/components/group_detail.fxml diff --git a/client/src/main/resources/fxml/admin/group/components/group_user.fxml b/falsework-client/src/main/resources/fxml/admin/group/components/group_user.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/group/components/group_user.fxml rename to falsework-client/src/main/resources/fxml/admin/group/components/group_user.fxml diff --git a/client/src/main/resources/fxml/admin/group/group_management.fxml b/falsework-client/src/main/resources/fxml/admin/group/group_management.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/group/group_management.fxml rename to falsework-client/src/main/resources/fxml/admin/group/group_management.fxml diff --git a/client/src/main/resources/fxml/admin/groupType/components/group_type_detailed.fxml b/falsework-client/src/main/resources/fxml/admin/groupType/components/group_type_detailed.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/groupType/components/group_type_detailed.fxml rename to falsework-client/src/main/resources/fxml/admin/groupType/components/group_type_detailed.fxml diff --git a/client/src/main/resources/fxml/admin/groupType/group_type_management.fxml b/falsework-client/src/main/resources/fxml/admin/groupType/group_type_management.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/groupType/group_type_management.fxml rename to falsework-client/src/main/resources/fxml/admin/groupType/group_type_management.fxml diff --git a/client/src/main/resources/fxml/admin/log/log_management.fxml b/falsework-client/src/main/resources/fxml/admin/log/log_management.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/log/log_management.fxml rename to falsework-client/src/main/resources/fxml/admin/log/log_management.fxml diff --git a/client/src/main/resources/fxml/admin/menu/components/menu_detailed.fxml b/falsework-client/src/main/resources/fxml/admin/menu/components/menu_detailed.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/menu/components/menu_detailed.fxml rename to falsework-client/src/main/resources/fxml/admin/menu/components/menu_detailed.fxml diff --git a/client/src/main/resources/fxml/admin/menu/menu_management.fxml b/falsework-client/src/main/resources/fxml/admin/menu/menu_management.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/menu/menu_management.fxml rename to falsework-client/src/main/resources/fxml/admin/menu/menu_management.fxml diff --git a/falsework-client/src/main/resources/fxml/admin/quartz/job.fxml b/falsework-client/src/main/resources/fxml/admin/quartz/job.fxml new file mode 100644 index 0000000..e65ac94 --- /dev/null +++ b/falsework-client/src/main/resources/fxml/admin/quartz/job.fxml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/falsework-client/src/main/resources/fxml/admin/quartz/job_log.fxml b/falsework-client/src/main/resources/fxml/admin/quartz/job_log.fxml new file mode 100644 index 0000000..9ed3796 --- /dev/null +++ b/falsework-client/src/main/resources/fxml/admin/quartz/job_log.fxml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/src/main/resources/fxml/admin/user/user_detailed.fxml b/falsework-client/src/main/resources/fxml/admin/user/user_detailed.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/user/user_detailed.fxml rename to falsework-client/src/main/resources/fxml/admin/user/user_detailed.fxml diff --git a/client/src/main/resources/fxml/admin/user/user_management.fxml b/falsework-client/src/main/resources/fxml/admin/user/user_management.fxml similarity index 100% rename from client/src/main/resources/fxml/admin/user/user_management.fxml rename to falsework-client/src/main/resources/fxml/admin/user/user_management.fxml diff --git a/client/src/main/resources/fxml/basicInfo/basic_data_set.fxml b/falsework-client/src/main/resources/fxml/basicInfo/basic_data_set.fxml similarity index 100% rename from client/src/main/resources/fxml/basicInfo/basic_data_set.fxml rename to falsework-client/src/main/resources/fxml/basicInfo/basic_data_set.fxml diff --git a/client/src/main/resources/fxml/basicInfo/coal_price_difference.fxml b/falsework-client/src/main/resources/fxml/basicInfo/coal_price_difference.fxml similarity index 100% rename from client/src/main/resources/fxml/basicInfo/coal_price_difference.fxml rename to falsework-client/src/main/resources/fxml/basicInfo/coal_price_difference.fxml diff --git a/client/src/main/resources/fxml/basicInfo/current_freight.fxml b/falsework-client/src/main/resources/fxml/basicInfo/current_freight.fxml similarity index 100% rename from client/src/main/resources/fxml/basicInfo/current_freight.fxml rename to falsework-client/src/main/resources/fxml/basicInfo/current_freight.fxml diff --git a/client/src/main/resources/fxml/basicInfo/main_conclusion.fxml b/falsework-client/src/main/resources/fxml/basicInfo/main_conclusion.fxml similarity index 100% rename from client/src/main/resources/fxml/basicInfo/main_conclusion.fxml rename to falsework-client/src/main/resources/fxml/basicInfo/main_conclusion.fxml diff --git a/client/src/main/resources/fxml/basicInfo/railway_cost.fxml b/falsework-client/src/main/resources/fxml/basicInfo/railway_cost.fxml similarity index 100% rename from client/src/main/resources/fxml/basicInfo/railway_cost.fxml rename to falsework-client/src/main/resources/fxml/basicInfo/railway_cost.fxml diff --git a/client/src/main/resources/fxml/components/LFXDecorator.fxml b/falsework-client/src/main/resources/fxml/components/LFXDecorator.fxml similarity index 100% rename from client/src/main/resources/fxml/components/LFXDecorator.fxml rename to falsework-client/src/main/resources/fxml/components/LFXDecorator.fxml diff --git a/client/src/main/resources/fxml/featureView.fxml b/falsework-client/src/main/resources/fxml/featureView.fxml similarity index 100% rename from client/src/main/resources/fxml/featureView.fxml rename to falsework-client/src/main/resources/fxml/featureView.fxml diff --git a/client/src/main/resources/fxml/home/home.fxml b/falsework-client/src/main/resources/fxml/home/home.fxml similarity index 100% rename from client/src/main/resources/fxml/home/home.fxml rename to falsework-client/src/main/resources/fxml/home/home.fxml diff --git a/client/src/main/resources/fxml/login/loading.fxml b/falsework-client/src/main/resources/fxml/login/loading.fxml similarity index 100% rename from client/src/main/resources/fxml/login/loading.fxml rename to falsework-client/src/main/resources/fxml/login/loading.fxml diff --git a/client/src/main/resources/fxml/login/login.fxml b/falsework-client/src/main/resources/fxml/login/login.fxml similarity index 100% rename from client/src/main/resources/fxml/login/login.fxml rename to falsework-client/src/main/resources/fxml/login/login.fxml diff --git a/client/src/main/resources/fxml/main/components/skin_info.fxml b/falsework-client/src/main/resources/fxml/main/components/skin_info.fxml similarity index 100% rename from client/src/main/resources/fxml/main/components/skin_info.fxml rename to falsework-client/src/main/resources/fxml/main/components/skin_info.fxml diff --git a/client/src/main/resources/fxml/main/components/user_info.fxml b/falsework-client/src/main/resources/fxml/main/components/user_info.fxml similarity index 100% rename from client/src/main/resources/fxml/main/components/user_info.fxml rename to falsework-client/src/main/resources/fxml/main/components/user_info.fxml diff --git a/client/src/main/resources/fxml/main/main.fxml b/falsework-client/src/main/resources/fxml/main/main.fxml similarity index 100% rename from client/src/main/resources/fxml/main/main.fxml rename to falsework-client/src/main/resources/fxml/main/main.fxml diff --git a/client/src/main/resources/fxml/power.fxml b/falsework-client/src/main/resources/fxml/power.fxml similarity index 100% rename from client/src/main/resources/fxml/power.fxml rename to falsework-client/src/main/resources/fxml/power.fxml diff --git a/client/src/main/resources/fxml/unitPlan/unit_plan.fxml b/falsework-client/src/main/resources/fxml/unitPlan/unit_plan.fxml similarity index 100% rename from client/src/main/resources/fxml/unitPlan/unit_plan.fxml rename to falsework-client/src/main/resources/fxml/unitPlan/unit_plan.fxml diff --git a/client/src/main/resources/images/app.png b/falsework-client/src/main/resources/images/app.png similarity index 100% rename from client/src/main/resources/images/app.png rename to falsework-client/src/main/resources/images/app.png diff --git a/client/src/main/resources/images/login.jpg b/falsework-client/src/main/resources/images/login.jpg similarity index 100% rename from client/src/main/resources/images/login.jpg rename to falsework-client/src/main/resources/images/login.jpg diff --git a/client/src/main/resources/images/login/Abstract 1.jpg b/falsework-client/src/main/resources/images/login/Abstract 1.jpg similarity index 100% rename from client/src/main/resources/images/login/Abstract 1.jpg rename to falsework-client/src/main/resources/images/login/Abstract 1.jpg diff --git a/client/src/main/resources/images/login/Abstract Shapes 2.jpg b/falsework-client/src/main/resources/images/login/Abstract Shapes 2.jpg similarity index 100% rename from client/src/main/resources/images/login/Abstract Shapes 2.jpg rename to falsework-client/src/main/resources/images/login/Abstract Shapes 2.jpg diff --git a/client/src/main/resources/images/login/Beach.jpg b/falsework-client/src/main/resources/images/login/Beach.jpg similarity index 100% rename from client/src/main/resources/images/login/Beach.jpg rename to falsework-client/src/main/resources/images/login/Beach.jpg diff --git a/client/src/main/resources/images/login/Bristle Grass.jpg b/falsework-client/src/main/resources/images/login/Bristle Grass.jpg similarity index 100% rename from client/src/main/resources/images/login/Bristle Grass.jpg rename to falsework-client/src/main/resources/images/login/Bristle Grass.jpg diff --git a/client/src/main/resources/images/login/Brushes.jpg b/falsework-client/src/main/resources/images/login/Brushes.jpg similarity index 100% rename from client/src/main/resources/images/login/Brushes.jpg rename to falsework-client/src/main/resources/images/login/Brushes.jpg diff --git a/client/src/main/resources/images/login/Sky.jpg b/falsework-client/src/main/resources/images/login/Sky.jpg similarity index 100% rename from client/src/main/resources/images/login/Sky.jpg rename to falsework-client/src/main/resources/images/login/Sky.jpg diff --git a/client/src/main/resources/images/popover-empty.png b/falsework-client/src/main/resources/images/popover-empty.png similarity index 100% rename from client/src/main/resources/images/popover-empty.png rename to falsework-client/src/main/resources/images/popover-empty.png diff --git a/client/src/main/resources/logback.xml b/falsework-client/src/main/resources/logback.xml similarity index 100% rename from client/src/main/resources/logback.xml rename to falsework-client/src/main/resources/logback.xml diff --git a/client/src/main/resources/sample-client.properties b/falsework-client/src/main/resources/sample-client.properties similarity index 100% rename from client/src/main/resources/sample-client.properties rename to falsework-client/src/main/resources/sample-client.properties diff --git a/client/src/test/java/DynamicEnumUtil.java b/falsework-client/src/test/java/DynamicEnumUtil.java similarity index 100% rename from client/src/test/java/DynamicEnumUtil.java rename to falsework-client/src/test/java/DynamicEnumUtil.java diff --git a/client/src/test/java/LineChartSample.java b/falsework-client/src/test/java/LineChartSample.java similarity index 100% rename from client/src/test/java/LineChartSample.java rename to falsework-client/src/test/java/LineChartSample.java diff --git a/client/src/test/java/MyStackedAreaChart.java b/falsework-client/src/test/java/MyStackedAreaChart.java similarity index 100% rename from client/src/test/java/MyStackedAreaChart.java rename to falsework-client/src/test/java/MyStackedAreaChart.java diff --git a/client/src/test/java/StackedAreaChartApp.java b/falsework-client/src/test/java/StackedAreaChartApp.java similarity index 100% rename from client/src/test/java/StackedAreaChartApp.java rename to falsework-client/src/test/java/StackedAreaChartApp.java diff --git a/client/src/test/java/TableViewSample.java b/falsework-client/src/test/java/TableViewSample.java similarity index 100% rename from client/src/test/java/TableViewSample.java rename to falsework-client/src/test/java/TableViewSample.java diff --git a/client/src/test/java/Test.java b/falsework-client/src/test/java/Test.java similarity index 100% rename from client/src/test/java/Test.java rename to falsework-client/src/test/java/Test.java diff --git a/client/src/test/java/TestFx.java b/falsework-client/src/test/java/TestFx.java similarity index 100% rename from client/src/test/java/TestFx.java rename to falsework-client/src/test/java/TestFx.java diff --git a/client/src/test/java/TimelineEvents.java b/falsework-client/src/test/java/TimelineEvents.java similarity index 97% rename from client/src/test/java/TimelineEvents.java rename to falsework-client/src/test/java/TimelineEvents.java index e505bf0..2ed288e 100644 --- a/client/src/test/java/TimelineEvents.java +++ b/falsework-client/src/test/java/TimelineEvents.java @@ -72,7 +72,7 @@ public class TimelineEvents extends Application { //当抵达关键帧时可以指定一个特定的动作 EventHandler onFinished = new EventHandler() { public void handle(ActionEvent t) { - stack.setTranslateX(java.lang.Math.random()*200-100); + stack.setTranslateX(Math.random()*200-100); //复位计数器  i = 0; } diff --git a/client/src/test/java/YesNoEnum.java b/falsework-client/src/test/java/YesNoEnum.java similarity index 100% rename from client/src/test/java/YesNoEnum.java rename to falsework-client/src/test/java/YesNoEnum.java diff --git a/client/src/test/java/ZTest.java b/falsework-client/src/test/java/ZTest.java similarity index 100% rename from client/src/test/java/ZTest.java rename to falsework-client/src/test/java/ZTest.java diff --git a/client/src/test/resources/test.css b/falsework-client/src/test/resources/test.css similarity index 100% rename from client/src/test/resources/test.css rename to falsework-client/src/test/resources/test.css diff --git a/client/src/test/resources/test.fxml b/falsework-client/src/test/resources/test.fxml similarity index 100% rename from client/src/test/resources/test.fxml rename to falsework-client/src/test/resources/test.fxml diff --git a/falsework-sever/.mvn/wrapper/MavenWrapperDownloader.java b/falsework-sever/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..a45eb6b --- /dev/null +++ b/falsework-sever/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/falsework-sever/.mvn/wrapper/maven-wrapper.jar b/falsework-sever/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/falsework-sever/.mvn/wrapper/maven-wrapper.jar differ diff --git a/falsework-sever/.mvn/wrapper/maven-wrapper.properties b/falsework-sever/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/falsework-sever/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/server/libs/DmJdbcDriver-1.0.0.jar b/falsework-sever/libs/DmJdbcDriver-1.0.0.jar similarity index 100% rename from server/libs/DmJdbcDriver-1.0.0.jar rename to falsework-sever/libs/DmJdbcDriver-1.0.0.jar diff --git a/falsework-sever/libs/pinyin4j-2.5.0.jar b/falsework-sever/libs/pinyin4j-2.5.0.jar new file mode 100644 index 0000000..e8ede13 Binary files /dev/null and b/falsework-sever/libs/pinyin4j-2.5.0.jar differ diff --git a/falsework-sever/pom.xml b/falsework-sever/pom.xml new file mode 100644 index 0000000..73fc7e8 --- /dev/null +++ b/falsework-sever/pom.xml @@ -0,0 +1,164 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.4.1 + + + com.epri + falsework-sever + 0.0.1-SNAPSHOT + falsework-sever + Demo project for Spring Boot + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-quartz + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.4 + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-cache + + + com.alibaba + druid-spring-boot-starter + 1.1.14 + + + io.jsonwebtoken + jjwt + 0.7.0 + + + joda-time + joda-time + 2.10.1 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.5 + + + org.apache.commons + commons-lang3 + 3.4 + + + mysql + mysql-connector-java + 8.0.20 + + + + DmJdbcDriver + DmJdbcDriver + 1.0.0 + system + ${basedir}/libs/DmJdbcDriver-1.0.0.jar + + + commons-codec + commons-codec + 1.14 + + + pinyin4j + pinyin4j + 2.5.0 + system + ${basedir}/libs/pinyin4j-2.5.0.jar + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + + + aliyun + https://maven.aliyun.com/repository/public + + true + + + false + + + + + + aliyun-plugin + https://maven.aliyun.com/repository/public + + true + + + false + + + + diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_auth_client_service.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_auth_client_service.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_auth_client_service.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_auth_client_service.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_element.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_element.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_element.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_element.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_group.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_group.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_group_leader.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group_leader.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_group_leader.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group_leader.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_group_member.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group_member.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_group_member.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group_member.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_group_type.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group_type.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_group_type.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_group_type.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_menu.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_menu.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_menu.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_menu.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_resource_authority.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_resource_authority.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_resource_authority.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_resource_authority.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_base_user.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_user.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_base_user.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_base_user.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_gate_log.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_gate_log.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_gate_log.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_gate_log.sql diff --git a/server/sql/dm/EMSHIS_IPSM_DBA_rsa_key.sql b/falsework-sever/sql/dm/EMSHIS_IPSM_DBA_rsa_key.sql similarity index 100% rename from server/sql/dm/EMSHIS_IPSM_DBA_rsa_key.sql rename to falsework-sever/sql/dm/EMSHIS_IPSM_DBA_rsa_key.sql diff --git a/server/sql/mysql/ipsm_dba.sql b/falsework-sever/sql/mysql/ipsm_dba.sql similarity index 100% rename from server/sql/mysql/ipsm_dba.sql rename to falsework-sever/sql/mysql/ipsm_dba.sql diff --git a/server/src/main/java/com/epri/fx/server/ServerApplication.java b/falsework-sever/src/main/java/com/epri/fx/server/ServerApplication.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/ServerApplication.java rename to falsework-sever/src/main/java/com/epri/fx/server/ServerApplication.java diff --git a/server/src/main/java/com/epri/fx/server/config/FilterConfig.java b/falsework-sever/src/main/java/com/epri/fx/server/config/FilterConfig.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/config/FilterConfig.java rename to falsework-sever/src/main/java/com/epri/fx/server/config/FilterConfig.java diff --git a/server/src/main/java/com/epri/fx/server/config/KeyConfiguration.java b/falsework-sever/src/main/java/com/epri/fx/server/config/KeyConfiguration.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/config/KeyConfiguration.java rename to falsework-sever/src/main/java/com/epri/fx/server/config/KeyConfiguration.java diff --git a/server/src/main/java/com/epri/fx/server/config/UserAuthConfig.java b/falsework-sever/src/main/java/com/epri/fx/server/config/UserAuthConfig.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/config/UserAuthConfig.java rename to falsework-sever/src/main/java/com/epri/fx/server/config/UserAuthConfig.java diff --git a/server/src/main/java/com/epri/fx/server/config/UserConfiguration.java b/falsework-sever/src/main/java/com/epri/fx/server/config/UserConfiguration.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/config/UserConfiguration.java rename to falsework-sever/src/main/java/com/epri/fx/server/config/UserConfiguration.java diff --git a/server/src/main/java/com/epri/fx/server/config/WebConfiguration.java b/falsework-sever/src/main/java/com/epri/fx/server/config/WebConfiguration.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/config/WebConfiguration.java rename to falsework-sever/src/main/java/com/epri/fx/server/config/WebConfiguration.java diff --git a/server/src/main/java/com/epri/fx/server/config/WebSecurityConfig.java b/falsework-sever/src/main/java/com/epri/fx/server/config/WebSecurityConfig.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/config/WebSecurityConfig.java rename to falsework-sever/src/main/java/com/epri/fx/server/config/WebSecurityConfig.java diff --git a/server/src/main/java/com/epri/fx/server/constant/AdminCommonConstant.java b/falsework-sever/src/main/java/com/epri/fx/server/constant/AdminCommonConstant.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/constant/AdminCommonConstant.java rename to falsework-sever/src/main/java/com/epri/fx/server/constant/AdminCommonConstant.java diff --git a/server/src/main/java/com/epri/fx/server/constant/CommonConstants.java b/falsework-sever/src/main/java/com/epri/fx/server/constant/CommonConstants.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/constant/CommonConstants.java rename to falsework-sever/src/main/java/com/epri/fx/server/constant/CommonConstants.java diff --git a/server/src/main/java/com/epri/fx/server/constant/RestCodeConstants.java b/falsework-sever/src/main/java/com/epri/fx/server/constant/RestCodeConstants.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/constant/RestCodeConstants.java rename to falsework-sever/src/main/java/com/epri/fx/server/constant/RestCodeConstants.java diff --git a/server/src/main/java/com/epri/fx/server/constant/UserConstant.java b/falsework-sever/src/main/java/com/epri/fx/server/constant/UserConstant.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/constant/UserConstant.java rename to falsework-sever/src/main/java/com/epri/fx/server/constant/UserConstant.java diff --git a/server/src/main/java/com/epri/fx/server/context/BaseContextHandler.java b/falsework-sever/src/main/java/com/epri/fx/server/context/BaseContextHandler.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/context/BaseContextHandler.java rename to falsework-sever/src/main/java/com/epri/fx/server/context/BaseContextHandler.java diff --git a/server/src/main/java/com/epri/fx/server/entity/Element.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/Element.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/Element.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/Element.java diff --git a/server/src/main/java/com/epri/fx/server/entity/Group.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/Group.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/Group.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/Group.java diff --git a/server/src/main/java/com/epri/fx/server/entity/GroupType.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/GroupType.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/GroupType.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/GroupType.java diff --git a/server/src/main/java/com/epri/fx/server/entity/Menu.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/Menu.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/Menu.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/Menu.java diff --git a/server/src/main/java/com/epri/fx/server/entity/ResourceAuthority.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/ResourceAuthority.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/ResourceAuthority.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/ResourceAuthority.java diff --git a/server/src/main/java/com/epri/fx/server/entity/RsaKey.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/RsaKey.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/RsaKey.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/RsaKey.java diff --git a/server/src/main/java/com/epri/fx/server/entity/User.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/User.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/User.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/User.java diff --git a/server/src/main/java/com/epri/fx/server/entity/UserInfo.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/UserInfo.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/UserInfo.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/UserInfo.java diff --git a/server/src/main/java/com/epri/fx/server/entity/log/GateLog.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/log/GateLog.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/log/GateLog.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/log/GateLog.java diff --git a/server/src/main/java/com/epri/fx/server/entity/log/LogInfo.java b/falsework-sever/src/main/java/com/epri/fx/server/entity/log/LogInfo.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/entity/log/LogInfo.java rename to falsework-sever/src/main/java/com/epri/fx/server/entity/log/LogInfo.java diff --git a/server/src/main/java/com/epri/fx/server/exception/BaseException.java b/falsework-sever/src/main/java/com/epri/fx/server/exception/BaseException.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/exception/BaseException.java rename to falsework-sever/src/main/java/com/epri/fx/server/exception/BaseException.java diff --git a/server/src/main/java/com/epri/fx/server/exception/auth/ClientForbiddenException.java b/falsework-sever/src/main/java/com/epri/fx/server/exception/auth/ClientForbiddenException.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/exception/auth/ClientForbiddenException.java rename to falsework-sever/src/main/java/com/epri/fx/server/exception/auth/ClientForbiddenException.java diff --git a/server/src/main/java/com/epri/fx/server/exception/auth/ClientInvalidException.java b/falsework-sever/src/main/java/com/epri/fx/server/exception/auth/ClientInvalidException.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/exception/auth/ClientInvalidException.java rename to falsework-sever/src/main/java/com/epri/fx/server/exception/auth/ClientInvalidException.java diff --git a/server/src/main/java/com/epri/fx/server/exception/auth/ClientTokenException.java b/falsework-sever/src/main/java/com/epri/fx/server/exception/auth/ClientTokenException.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/exception/auth/ClientTokenException.java rename to falsework-sever/src/main/java/com/epri/fx/server/exception/auth/ClientTokenException.java diff --git a/server/src/main/java/com/epri/fx/server/exception/auth/UserInvalidException.java b/falsework-sever/src/main/java/com/epri/fx/server/exception/auth/UserInvalidException.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/exception/auth/UserInvalidException.java rename to falsework-sever/src/main/java/com/epri/fx/server/exception/auth/UserInvalidException.java diff --git a/server/src/main/java/com/epri/fx/server/exception/auth/UserTokenException.java b/falsework-sever/src/main/java/com/epri/fx/server/exception/auth/UserTokenException.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/exception/auth/UserTokenException.java rename to falsework-sever/src/main/java/com/epri/fx/server/exception/auth/UserTokenException.java diff --git a/server/src/main/java/com/epri/fx/server/filter/ReplaceStreamFilter.java b/falsework-sever/src/main/java/com/epri/fx/server/filter/ReplaceStreamFilter.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/filter/ReplaceStreamFilter.java rename to falsework-sever/src/main/java/com/epri/fx/server/filter/ReplaceStreamFilter.java diff --git a/server/src/main/java/com/epri/fx/server/filter/RequestWrapper.java b/falsework-sever/src/main/java/com/epri/fx/server/filter/RequestWrapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/filter/RequestWrapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/filter/RequestWrapper.java diff --git a/server/src/main/java/com/epri/fx/server/handler/GlobalExceptionHandler.java b/falsework-sever/src/main/java/com/epri/fx/server/handler/GlobalExceptionHandler.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/handler/GlobalExceptionHandler.java rename to falsework-sever/src/main/java/com/epri/fx/server/handler/GlobalExceptionHandler.java diff --git a/server/src/main/java/com/epri/fx/server/interceptor/LogInterceptor.java b/falsework-sever/src/main/java/com/epri/fx/server/interceptor/LogInterceptor.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/interceptor/LogInterceptor.java rename to falsework-sever/src/main/java/com/epri/fx/server/interceptor/LogInterceptor.java diff --git a/server/src/main/java/com/epri/fx/server/interceptor/UserAuthRestInterceptor.java b/falsework-sever/src/main/java/com/epri/fx/server/interceptor/UserAuthRestInterceptor.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/interceptor/UserAuthRestInterceptor.java rename to falsework-sever/src/main/java/com/epri/fx/server/interceptor/UserAuthRestInterceptor.java diff --git a/server/src/main/java/com/epri/fx/server/jwt/IJWTInfo.java b/falsework-sever/src/main/java/com/epri/fx/server/jwt/IJWTInfo.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/jwt/IJWTInfo.java rename to falsework-sever/src/main/java/com/epri/fx/server/jwt/IJWTInfo.java diff --git a/server/src/main/java/com/epri/fx/server/jwt/JWTHelper.java b/falsework-sever/src/main/java/com/epri/fx/server/jwt/JWTHelper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/jwt/JWTHelper.java rename to falsework-sever/src/main/java/com/epri/fx/server/jwt/JWTHelper.java diff --git a/server/src/main/java/com/epri/fx/server/jwt/JWTInfo.java b/falsework-sever/src/main/java/com/epri/fx/server/jwt/JWTInfo.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/jwt/JWTInfo.java rename to falsework-sever/src/main/java/com/epri/fx/server/jwt/JWTInfo.java diff --git a/server/src/main/java/com/epri/fx/server/jwt/RsaKeyHelper.java b/falsework-sever/src/main/java/com/epri/fx/server/jwt/RsaKeyHelper.java similarity index 97% rename from server/src/main/java/com/epri/fx/server/jwt/RsaKeyHelper.java rename to falsework-sever/src/main/java/com/epri/fx/server/jwt/RsaKeyHelper.java index 583eaf1..211fb7e 100644 --- a/server/src/main/java/com/epri/fx/server/jwt/RsaKeyHelper.java +++ b/falsework-sever/src/main/java/com/epri/fx/server/jwt/RsaKeyHelper.java @@ -1,7 +1,9 @@ package com.epri.fx.server.jwt; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; + + + +import org.apache.commons.codec.binary.Base64; import java.io.DataInputStream; import java.io.FileOutputStream; @@ -153,11 +155,11 @@ public class RsaKeyHelper { } public static String toHexString(byte[] b) { - return (new BASE64Encoder()).encodeBuffer(b); + return Base64.encodeBase64String(b); } public static final byte[] toBytes(String s) throws IOException { - return (new BASE64Decoder()).decodeBuffer(s); + return Base64.decodeBase64(s); } public static void main(String[] args) throws NoSuchAlgorithmException { diff --git a/server/src/main/java/com/epri/fx/server/jwt/UserAuthUtil.java b/falsework-sever/src/main/java/com/epri/fx/server/jwt/UserAuthUtil.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/jwt/UserAuthUtil.java rename to falsework-sever/src/main/java/com/epri/fx/server/jwt/UserAuthUtil.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/ElementMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/ElementMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/ElementMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/ElementMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/GateLogMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/GateLogMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/GateLogMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/GateLogMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/GroupMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/GroupMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/GroupMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/GroupMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/GroupTypeMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/GroupTypeMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/GroupTypeMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/GroupTypeMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/MenuMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/MenuMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/MenuMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/MenuMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/ResourceAuthorityMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/ResourceAuthorityMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/ResourceAuthorityMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/ResourceAuthorityMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/RsaKeyMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/RsaKeyMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/RsaKeyMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/RsaKeyMapper.java diff --git a/server/src/main/java/com/epri/fx/server/mapper/UserMapper.java b/falsework-sever/src/main/java/com/epri/fx/server/mapper/UserMapper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/mapper/UserMapper.java rename to falsework-sever/src/main/java/com/epri/fx/server/mapper/UserMapper.java diff --git a/server/src/main/java/com/epri/fx/server/msg/BaseResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/msg/BaseResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/msg/BaseResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/msg/BaseResponse.java diff --git a/server/src/main/java/com/epri/fx/server/msg/ListRestResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/msg/ListRestResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/msg/ListRestResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/msg/ListRestResponse.java diff --git a/server/src/main/java/com/epri/fx/server/msg/ObjectRestResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/msg/ObjectRestResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/msg/ObjectRestResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/msg/ObjectRestResponse.java diff --git a/server/src/main/java/com/epri/fx/server/msg/TableResultResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/msg/TableResultResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/msg/TableResultResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/msg/TableResultResponse.java diff --git a/server/src/main/java/com/epri/fx/server/msg/auth/TokenErrorResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/msg/auth/TokenErrorResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/msg/auth/TokenErrorResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/msg/auth/TokenErrorResponse.java diff --git a/server/src/main/java/com/epri/fx/server/msg/auth/TokenForbiddenResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/msg/auth/TokenForbiddenResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/msg/auth/TokenForbiddenResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/msg/auth/TokenForbiddenResponse.java diff --git a/server/src/main/java/com/epri/fx/server/rest/AuthController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/AuthController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/AuthController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/AuthController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/ElementController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/ElementController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/ElementController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/ElementController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/GroupController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/GroupController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/GroupController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/GroupController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/GroupTypeController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/GroupTypeController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/GroupTypeController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/GroupTypeController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/HelloController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/HelloController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/HelloController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/HelloController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/LogController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/LogController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/LogController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/LogController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/LoginController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/LoginController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/LoginController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/LoginController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/MenuController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/MenuController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/MenuController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/MenuController.java diff --git a/server/src/main/java/com/epri/fx/server/rest/UserController.java b/falsework-sever/src/main/java/com/epri/fx/server/rest/UserController.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/rest/UserController.java rename to falsework-sever/src/main/java/com/epri/fx/server/rest/UserController.java diff --git a/server/src/main/java/com/epri/fx/server/runner/AuthServerRunner.java b/falsework-sever/src/main/java/com/epri/fx/server/runner/AuthServerRunner.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/runner/AuthServerRunner.java rename to falsework-sever/src/main/java/com/epri/fx/server/runner/AuthServerRunner.java diff --git a/server/src/main/java/com/epri/fx/server/service/ElementService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/ElementService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/ElementService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/ElementService.java diff --git a/server/src/main/java/com/epri/fx/server/service/GroupService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/GroupService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/GroupService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/GroupService.java diff --git a/server/src/main/java/com/epri/fx/server/service/GroupTypeService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/GroupTypeService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/GroupTypeService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/GroupTypeService.java diff --git a/server/src/main/java/com/epri/fx/server/service/MenuService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/MenuService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/MenuService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/MenuService.java diff --git a/server/src/main/java/com/epri/fx/server/service/PermissionService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/PermissionService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/PermissionService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/PermissionService.java diff --git a/server/src/main/java/com/epri/fx/server/service/RsaKeyService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/RsaKeyService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/RsaKeyService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/RsaKeyService.java diff --git a/server/src/main/java/com/epri/fx/server/service/UserService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/UserService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/UserService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/UserService.java diff --git a/server/src/main/java/com/epri/fx/server/service/log/GateLogService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/log/GateLogService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/log/GateLogService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/log/GateLogService.java diff --git a/server/src/main/java/com/epri/fx/server/service/security/auth/AuthService.java b/falsework-sever/src/main/java/com/epri/fx/server/service/security/auth/AuthService.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/security/auth/AuthService.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/security/auth/AuthService.java diff --git a/server/src/main/java/com/epri/fx/server/service/security/auth/impl/AuthServiceImpl.java b/falsework-sever/src/main/java/com/epri/fx/server/service/security/auth/impl/AuthServiceImpl.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/service/security/auth/impl/AuthServiceImpl.java rename to falsework-sever/src/main/java/com/epri/fx/server/service/security/auth/impl/AuthServiceImpl.java diff --git a/server/src/main/java/com/epri/fx/server/util/ClientUtil.java b/falsework-sever/src/main/java/com/epri/fx/server/util/ClientUtil.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/ClientUtil.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/ClientUtil.java diff --git a/server/src/main/java/com/epri/fx/server/util/DBLog.java b/falsework-sever/src/main/java/com/epri/fx/server/util/DBLog.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/DBLog.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/DBLog.java diff --git a/server/src/main/java/com/epri/fx/server/util/DateUtils.java b/falsework-sever/src/main/java/com/epri/fx/server/util/DateUtils.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/DateUtils.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/DateUtils.java diff --git a/server/src/main/java/com/epri/fx/server/util/EncryptUtil.java b/falsework-sever/src/main/java/com/epri/fx/server/util/EncryptUtil.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/EncryptUtil.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/EncryptUtil.java diff --git a/server/src/main/java/com/epri/fx/server/util/EntityUtils.java b/falsework-sever/src/main/java/com/epri/fx/server/util/EntityUtils.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/EntityUtils.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/EntityUtils.java diff --git a/server/src/main/java/com/epri/fx/server/util/Query.java b/falsework-sever/src/main/java/com/epri/fx/server/util/Query.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/Query.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/Query.java diff --git a/server/src/main/java/com/epri/fx/server/util/ReflectionUtils.java b/falsework-sever/src/main/java/com/epri/fx/server/util/ReflectionUtils.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/ReflectionUtils.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/ReflectionUtils.java diff --git a/server/src/main/java/com/epri/fx/server/util/StringHelper.java b/falsework-sever/src/main/java/com/epri/fx/server/util/StringHelper.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/StringHelper.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/StringHelper.java diff --git a/server/src/main/java/com/epri/fx/server/util/TreeUtil.java b/falsework-sever/src/main/java/com/epri/fx/server/util/TreeUtil.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/TreeUtil.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/TreeUtil.java diff --git a/server/src/main/java/com/epri/fx/server/util/UUIDUtils.java b/falsework-sever/src/main/java/com/epri/fx/server/util/UUIDUtils.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/UUIDUtils.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/UUIDUtils.java diff --git a/server/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationRequest.java b/falsework-sever/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationRequest.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationRequest.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationRequest.java diff --git a/server/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationResponse.java b/falsework-sever/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationResponse.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationResponse.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/user/JwtAuthenticationResponse.java diff --git a/server/src/main/java/com/epri/fx/server/util/user/JwtTokenUtil.java b/falsework-sever/src/main/java/com/epri/fx/server/util/user/JwtTokenUtil.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/util/user/JwtTokenUtil.java rename to falsework-sever/src/main/java/com/epri/fx/server/util/user/JwtTokenUtil.java diff --git a/server/src/main/java/com/epri/fx/server/vo/ElementVO.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/ElementVO.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/ElementVO.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/ElementVO.java diff --git a/server/src/main/java/com/epri/fx/server/vo/FrontUser.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/FrontUser.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/FrontUser.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/FrontUser.java diff --git a/server/src/main/java/com/epri/fx/server/vo/GroupTree.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/GroupTree.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/GroupTree.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/GroupTree.java diff --git a/server/src/main/java/com/epri/fx/server/vo/GroupTypeVO.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/GroupTypeVO.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/GroupTypeVO.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/GroupTypeVO.java diff --git a/server/src/main/java/com/epri/fx/server/vo/GroupUsers.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/GroupUsers.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/GroupUsers.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/GroupUsers.java diff --git a/server/src/main/java/com/epri/fx/server/vo/GroupVO.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/GroupVO.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/GroupVO.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/GroupVO.java diff --git a/server/src/main/java/com/epri/fx/server/vo/MenuVO.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/MenuVO.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/MenuVO.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/MenuVO.java diff --git a/server/src/main/java/com/epri/fx/server/vo/PermissionInfo.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/PermissionInfo.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/PermissionInfo.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/PermissionInfo.java diff --git a/server/src/main/java/com/epri/fx/server/vo/TreeNode.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/TreeNode.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/TreeNode.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/TreeNode.java diff --git a/server/src/main/java/com/epri/fx/server/vo/UserVO.java b/falsework-sever/src/main/java/com/epri/fx/server/vo/UserVO.java similarity index 100% rename from server/src/main/java/com/epri/fx/server/vo/UserVO.java rename to falsework-sever/src/main/java/com/epri/fx/server/vo/UserVO.java diff --git a/server/src/main/resources/application-dm.yml b/falsework-sever/src/main/resources/application-dm.yml similarity index 100% rename from server/src/main/resources/application-dm.yml rename to falsework-sever/src/main/resources/application-dm.yml diff --git a/server/src/main/resources/application-mysql.yml b/falsework-sever/src/main/resources/application-mysql.yml similarity index 100% rename from server/src/main/resources/application-mysql.yml rename to falsework-sever/src/main/resources/application-mysql.yml diff --git a/falsework-sever/src/main/resources/application.properties b/falsework-sever/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/falsework-sever/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/server/src/main/resources/application.yml b/falsework-sever/src/main/resources/application.yml similarity index 100% rename from server/src/main/resources/application.yml rename to falsework-sever/src/main/resources/application.yml diff --git a/server/src/main/resources/mapper/ElementMapper.xml b/falsework-sever/src/main/resources/mapper/ElementMapper.xml similarity index 100% rename from server/src/main/resources/mapper/ElementMapper.xml rename to falsework-sever/src/main/resources/mapper/ElementMapper.xml diff --git a/server/src/main/resources/mapper/GateLogMapper.xml b/falsework-sever/src/main/resources/mapper/GateLogMapper.xml similarity index 100% rename from server/src/main/resources/mapper/GateLogMapper.xml rename to falsework-sever/src/main/resources/mapper/GateLogMapper.xml diff --git a/server/src/main/resources/mapper/GroupMapper.xml b/falsework-sever/src/main/resources/mapper/GroupMapper.xml similarity index 100% rename from server/src/main/resources/mapper/GroupMapper.xml rename to falsework-sever/src/main/resources/mapper/GroupMapper.xml diff --git a/server/src/main/resources/mapper/GroupTypeMapper.xml b/falsework-sever/src/main/resources/mapper/GroupTypeMapper.xml similarity index 100% rename from server/src/main/resources/mapper/GroupTypeMapper.xml rename to falsework-sever/src/main/resources/mapper/GroupTypeMapper.xml diff --git a/server/src/main/resources/mapper/MenuMapper.xml b/falsework-sever/src/main/resources/mapper/MenuMapper.xml similarity index 100% rename from server/src/main/resources/mapper/MenuMapper.xml rename to falsework-sever/src/main/resources/mapper/MenuMapper.xml diff --git a/server/src/main/resources/mapper/ResourceAuthorityMapper.xml b/falsework-sever/src/main/resources/mapper/ResourceAuthorityMapper.xml similarity index 100% rename from server/src/main/resources/mapper/ResourceAuthorityMapper.xml rename to falsework-sever/src/main/resources/mapper/ResourceAuthorityMapper.xml diff --git a/server/src/main/resources/mapper/RsaKeyMapper.xml b/falsework-sever/src/main/resources/mapper/RsaKeyMapper.xml similarity index 100% rename from server/src/main/resources/mapper/RsaKeyMapper.xml rename to falsework-sever/src/main/resources/mapper/RsaKeyMapper.xml diff --git a/server/src/main/resources/mapper/UserMapper.xml b/falsework-sever/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from server/src/main/resources/mapper/UserMapper.xml rename to falsework-sever/src/main/resources/mapper/UserMapper.xml diff --git a/falsework-sever/src/test/java/com/epri/falseworksever/FalseworkSeverApplicationTests.java b/falsework-sever/src/test/java/com/epri/falseworksever/FalseworkSeverApplicationTests.java new file mode 100644 index 0000000..45fd19e --- /dev/null +++ b/falsework-sever/src/test/java/com/epri/falseworksever/FalseworkSeverApplicationTests.java @@ -0,0 +1,13 @@ +package com.epri.falseworksever; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class FalseworkSeverApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 3d3a0d8..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Jul 08 09:40:38 CST 2020 -distributionUrl=https://services.gradle.org/distributions/gradle-6.4.1-all.zip -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew deleted file mode 100755 index 2fe81a7..0000000 --- a/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 9618d8d..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..65b39cf --- /dev/null +++ b/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + org.epri + fx-falsework + pom + 1.0-SNAPSHOT + + + + falseworik-client + falsework-client + + + 1.8 + + + + + junit + junit + 4.12 + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + + diff --git a/readme/login.png b/readme/login.png index 4b954db..4366957 100644 Binary files a/readme/login.png and b/readme/login.png differ diff --git a/readme/registered.png b/readme/registered.png index 4cf8cbf..2d7df61 100644 Binary files a/readme/registered.png and b/readme/registered.png differ diff --git a/server/build.gradle b/server/build.gradle deleted file mode 100644 index 31e6973..0000000 --- a/server/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -plugins { - id 'org.springframework.boot' version '2.3.1.RELEASE' - id 'io.spring.dependency-management' version '1.0.9.RELEASE' - id 'java' -} - -group = 'com.epri.fx.server' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' - -configurations { - compileOnly { - extendsFrom annotationProcessor - } -} - -repositories { - mavenCentral() -} - -dependencies { - developmentOnly 'org.springframework.boot:spring-boot-devtools' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation 'io.projectreactor:reactor-test' - implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation files('libs/DmJdbcDriver-1.0.0.jar') - implementation 'com.alibaba:druid-spring-boot-starter:1.1.14' - implementation 'io.jsonwebtoken:jjwt:0.7.0' - compile 'joda-time:joda-time:2.10.1' - implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3' - implementation 'com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5' - implementation 'mysql:mysql-connector-java:8.0.20' - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testImplementation('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } - testImplementation 'org.springframework.security:spring-security-test' - implementation 'org.apache.commons:commons-lang3:3.4' - - -} - -test { - useJUnitPlatform() -} -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} \ No newline at end of file diff --git a/server/src/main/java/com/epri/fx/server/util/DynamicEnumUtils.java b/server/src/main/java/com/epri/fx/server/util/DynamicEnumUtils.java deleted file mode 100644 index 1f953aa..0000000 --- a/server/src/main/java/com/epri/fx/server/util/DynamicEnumUtils.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.epri.fx.server.util; - -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import sun.reflect.ConstructorAccessor; -import sun.reflect.FieldAccessor; -import sun.reflect.ReflectionFactory; - -public class DynamicEnumUtils { - - private static ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory(); - - private static void setFailsafeFieldValue(Field field, Object target, Object value) throws NoSuchFieldException, - IllegalAccessException { - - // let's make the field accessible - field.setAccessible(true); - - // next we change the modifier in the Field instance to - // not be final anymore, thus tricking reflection into - // letting us modify the static final field - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - int modifiers = modifiersField.getInt(field); - - // blank out the final bit in the modifiers int - modifiers &= ~Modifier.FINAL; - modifiersField.setInt(field, modifiers); - - FieldAccessor fa = reflectionFactory.newFieldAccessor(field, false); - fa.set(target, value); - } - - private static void blankField(Class enumClass, String fieldName) throws NoSuchFieldException, - IllegalAccessException { - for (Field field : Class.class.getDeclaredFields()) { - if (field.getName().contains(fieldName)) { - AccessibleObject.setAccessible(new Field[]{field}, true); - setFailsafeFieldValue(field, enumClass, null); - break; - } - } - } - - private static void cleanEnumCache(Class enumClass) throws NoSuchFieldException, IllegalAccessException { - blankField(enumClass, "enumConstantDirectory"); // Sun (Oracle?!?) JDK 1.5/6 - blankField(enumClass, "enumConstants"); // IBM JDK - } - - private static ConstructorAccessor getConstructorAccessor(Class enumClass, Class[] additionalParameterTypes) - throws NoSuchMethodException { - Class[] parameterTypes = new Class[additionalParameterTypes.length + 2]; - parameterTypes[0] = String.class; - parameterTypes[1] = int.class; - System.arraycopy(additionalParameterTypes, 0, parameterTypes, 2, additionalParameterTypes.length); - return reflectionFactory.newConstructorAccessor(enumClass.getDeclaredConstructor(parameterTypes)); - } - - private static Object makeEnum(Class enumClass, String value, int ordinal, Class[] additionalTypes, - Object[] additionalValues) throws Exception { - Object[] parms = new Object[additionalValues.length + 2]; - parms[0] = value; - parms[1] = Integer.valueOf(ordinal); - System.arraycopy(additionalValues, 0, parms, 2, additionalValues.length); - return enumClass.cast(getConstructorAccessor(enumClass, additionalTypes).newInstance(parms)); - } - - /** - * Add an enum instance to the enum class given as argument - * - * @param the type of the enum (implicit) - * @param enumType the class of the enum to be modified - * @param enumName the name of the new enum instance to be added to the class. - */ - @SuppressWarnings("unchecked") - public static > void addEnum(Class enumType, String enumName, Class[] additionalTypes, Object[] additionalValues) { - - // 0. Sanity checks - if (!Enum.class.isAssignableFrom(enumType)) { - throw new RuntimeException("class " + enumType + " is not an instance of Enum"); - } - - // 1. Lookup "$VALUES" holder in enum class and get previous enum instances - Field valuesField = null; - Field[] fields = enumType.getDeclaredFields(); - for (Field field : fields) { - if (field.getName().contains("$VALUES")) { - valuesField = field; - break; - } - } - AccessibleObject.setAccessible(new Field[]{valuesField}, true); - - try { - - // 2. Copy it - T[] previousValues = (T[]) valuesField.get(enumType); - List values = new ArrayList(Arrays.asList(previousValues)); - - // 3. build new enum - T newValue = (T) makeEnum(enumType, enumName, values.size(), additionalTypes, additionalValues); - - // 4. add new value - values.add(newValue); - - // 5. Set new values field - setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0))); - - // 6. Clean enum cache - cleanEnumCache(enumType); - - } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); - } - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index a230dd2..0000000 --- a/settings.gradle +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = 'fx-falsework' -include 'client' -include 'server' - -